Skip to content

Commit e0115b4

Browse files
author
davidgraeff
committed
Prevent android animation between activity changes
1 parent 8edee90 commit e0115b4

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/oly/netpowerctrl/main/NetpowerctrlActivity.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ protected void onResume() {
150150
LocalBroadcastManager.getInstance(this).registerReceiver(onDeviceDiscovered, itf);
151151

152152
Intent it = new Intent(this, NetpowerctrlService.class);
153+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
153154
startService(it);
154155

155156
DeviceQuery.sendBroadcastQuery(this);
@@ -203,11 +204,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
203204
SaveConfiguredDevices(); // we need to know the device on return from config activity
204205
Intent it = new Intent(this, DevicePreferencesActivity.class);
205206
it.putExtra("prefname", di.getPrefname());
207+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
206208
startActivity(it);
207209
return true;
208210
} else if (th.getCurrentTabTag().equals("groups")) {
209211
Intent it = new Intent(this, ShortcutCreatorActivity.class);
210212
it.putExtra("groups", true);
213+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
211214
startActivityForResult(it, ACTIVITY_REQUEST_ADDGROUP);
212215
return true;
213216
}
@@ -235,6 +238,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
235238

236239
case R.id.menu_preferences: {
237240
Intent it = new Intent(this, PreferencesActivity.class);
241+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
238242
startActivity(it);
239243
return true;
240244
}
@@ -273,13 +277,15 @@ public boolean onMenuItemClick(MenuItem item) {
273277
SaveConfiguredDevices();
274278
Intent it = new Intent(this, DevicePreferencesActivity.class);
275279
it.putExtra("prefname", current_device.getPrefname());
280+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
276281
startActivity(it);
277282
return true;
278283
}
279284

280285
case R.id.menu_configure_device: {
281286
Intent it = new Intent(this, DevicePreferencesActivity.class);
282287
it.putExtra("prefname", current_device.getPrefname());
288+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
283289
startActivity(it);
284290
return true;
285291
}
@@ -326,6 +332,7 @@ public void onItemClick(AdapterView<?> av, View v, int position, long id) {
326332
if (di.isConfigured()) {
327333
Intent it = new Intent(this, DeviceControlActivity.class);
328334
it.putExtra("device", di);
335+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
329336
startActivity(it);
330337
} else {
331338
onConfigureDevice(v, position);

src/oly/netpowerctrl/preferences/DevicePreferencesActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
9898
public boolean onPreferenceClick(Preference preference) {
9999
Intent it = new Intent(self, OutletConfig.class);
100100
it.putExtra("prefname", f_prefname);
101+
it.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
101102
startActivity(it);
102103
return true;
103104
}

0 commit comments

Comments
 (0)