packages/apps/Taskbar
Révision | b8d09176c44ff8a8a9bd302eb2c7b70b696a9264 (tree) |
---|---|
l'heure | 2018-11-04 03:13:08 |
Auteur | Braden Farmer <farmerbb@gmai...> |
Commiter | Braden Farmer |
Taskbar 4.0.1 (release 3)
* Fix context menu bug
@@ -20,7 +20,7 @@ android { | ||
20 | 20 | targetSdkVersion SDK_VERSION |
21 | 21 | |
22 | 22 | // TODO keep versionName and versionCode in sync with Android-x86 manifest |
23 | - versionCode 191 | |
23 | + versionCode 192 | |
24 | 24 | versionName "4.0.1" |
25 | 25 | |
26 | 26 | resConfigs "en", "ja", "ru", "de", "zh-rCN", "tr", "nl" |
@@ -19,7 +19,7 @@ | ||
19 | 19 | * HomeActivity is enabled by default |
20 | 20 | * Certain activities and receivers are not exposed |
21 | 21 | --> |
22 | -<manifest android:versionCode="191" | |
22 | +<manifest android:versionCode="192" | |
23 | 23 | android:versionName="4.0.1" |
24 | 24 | xmlns:android="http://schemas.android.com/apk/res/android" |
25 | 25 | package="com.farmerbb.taskbar" > |
@@ -227,15 +227,19 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc | ||
227 | 227 | |
228 | 228 | @SuppressWarnings("deprecation") |
229 | 229 | private void generateMenu() { |
230 | + SharedPreferences pref = U.getSharedPreferences(this); | |
231 | + | |
230 | 232 | if(isStartButton) { |
231 | 233 | addPreferencesFromResource(R.xml.pref_context_menu_open_settings); |
232 | 234 | findPreference("open_taskbar_settings").setOnPreferenceClickListener(this); |
233 | 235 | findPreference("start_menu_apps").setOnPreferenceClickListener(this); |
234 | 236 | |
235 | - if((U.launcherIsDefault(this) | |
237 | + if(pref.getBoolean("freeform_hack", false) | |
238 | + && ((U.launcherIsDefault(this) | |
239 | + && !U.isOverridingFreeformHack(this) | |
236 | 240 | && FreeformHackHelper.getInstance().isInFreeformWorkspace()) |
237 | 241 | || (U.isOverridingFreeformHack(this) |
238 | - && LauncherHelper.getInstance().isOnHomeScreen())) { | |
242 | + && LauncherHelper.getInstance().isOnHomeScreen()))) { | |
239 | 243 | addPreferencesFromResource(R.xml.pref_context_menu_change_wallpaper); |
240 | 244 | findPreference("change_wallpaper").setOnPreferenceClickListener(this); |
241 | 245 | } |
@@ -277,7 +281,6 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc | ||
277 | 281 | findPreference("header").setTitle(appName); |
278 | 282 | } |
279 | 283 | |
280 | - SharedPreferences pref = U.getSharedPreferences(this); | |
281 | 284 | if(U.hasFreeformSupport(this) |
282 | 285 | && pref.getBoolean("freeform_hack", false) |
283 | 286 | && !U.isGame(this, packageName)) { |
@@ -159,9 +159,6 @@ public class InvisibleActivityFreeform extends Activity { | ||
159 | 159 | protected void onResume() { |
160 | 160 | super.onResume(); |
161 | 161 | |
162 | - if(!proceedWithOnCreate) | |
163 | - return; | |
164 | - | |
165 | 162 | // Show the taskbar when activity is resumed (no other freeform windows are active) |
166 | 163 | if(showTaskbar) |
167 | 164 | LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR")); |
@@ -190,9 +187,6 @@ public class InvisibleActivityFreeform extends Activity { | ||
190 | 187 | protected void onStart() { |
191 | 188 | super.onStart(); |
192 | 189 | |
193 | - if(!proceedWithOnCreate) | |
194 | - return; | |
195 | - | |
196 | 190 | FreeformHackHelper.getInstance().setInFreeformWorkspace(true); |
197 | 191 | |
198 | 192 | if(U.launcherIsDefault(this) && !U.isChromeOs(this)) { |
@@ -237,9 +231,6 @@ public class InvisibleActivityFreeform extends Activity { | ||
237 | 231 | protected void onPause() { |
238 | 232 | super.onPause(); |
239 | 233 | |
240 | - if(!proceedWithOnCreate) | |
241 | - return; | |
242 | - | |
243 | 234 | possiblyHideTaskbar(); |
244 | 235 | } |
245 | 236 |
@@ -247,9 +238,6 @@ public class InvisibleActivityFreeform extends Activity { | ||
247 | 238 | protected void onStop() { |
248 | 239 | super.onStop(); |
249 | 240 | |
250 | - if(!proceedWithOnCreate) | |
251 | - return; | |
252 | - | |
253 | 241 | if(!finish) |
254 | 242 | FreeformHackHelper.getInstance().setInFreeformWorkspace(false); |
255 | 243 |