| Révision | f0f4b08ef96f4597d897a2c4e9e151f4b3820afa (tree) |
|---|---|
| l'heure | 2020-02-18 16:57:43 |
| Auteur | Braden Farmer <farmerbb@gmai...> |
| Commiter | Braden Farmer |
Fixes
app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java (diff) app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java (diff)| @@ -381,10 +381,6 @@ public class MainActivity extends AppCompatActivity { | ||
| 381 | 381 | if(oldFragment instanceof ManageAppDataFragment) { |
| 382 | 382 | newFragment = new AdvancedFragment(); |
| 383 | 383 | tag = "AdvancedFragment"; |
| 384 | - | |
| 385 | - Bundle bundle = new Bundle(); | |
| 386 | - bundle.putBoolean("from_manage_app_data", true); | |
| 387 | - newFragment.setArguments(bundle); | |
| 388 | 384 | } else { |
| 389 | 385 | newFragment = new AboutFragment(); |
| 390 | 386 | tag = "AboutFragment"; |
| @@ -37,11 +37,12 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; | ||
| 37 | 37 | import androidx.appcompat.app.ActionBar; |
| 38 | 38 | import androidx.appcompat.app.AlertDialog; |
| 39 | 39 | import androidx.appcompat.app.AppCompatActivity; |
| 40 | + | |
| 41 | +import android.preference.PreferenceManager; | |
| 40 | 42 | import android.view.View; |
| 41 | 43 | import android.view.inputmethod.InputMethodManager; |
| 42 | 44 | import android.widget.EditText; |
| 43 | 45 | import android.widget.LinearLayout; |
| 44 | -import android.widget.ListView; | |
| 45 | 46 | |
| 46 | 47 | import com.farmerbb.taskbar.BuildConfig; |
| 47 | 48 | import com.farmerbb.taskbar.R; |
| @@ -111,14 +112,6 @@ public class AdvancedFragment extends SettingsFragment implements SharedPreferen | ||
| 111 | 112 | if(!isLibrary) |
| 112 | 113 | findPreference("launcher").setEnabled(!lockHomeToggle); |
| 113 | 114 | |
| 114 | - if(getArguments() != null && getArguments().getBoolean("from_manage_app_data", false)) { | |
| 115 | - View rootView = getView(); | |
| 116 | - if(rootView != null) { | |
| 117 | - ListView list = rootView.findViewById(android.R.id.list); | |
| 118 | - if(list != null) list.scrollTo(0, Integer.MAX_VALUE); | |
| 119 | - } | |
| 120 | - } | |
| 121 | - | |
| 122 | 115 | if(U.isExternalAccessDisabled(getActivity())) { |
| 123 | 116 | addPreferencesFromResource(R.xml.tb_pref_advanced_extra_1); |
| 124 | 117 | findPreference("clear_pinned_apps").setOnPreferenceClickListener(this); |
| @@ -352,8 +345,28 @@ public class AdvancedFragment extends SettingsFragment implements SharedPreferen | ||
| 352 | 345 | } |
| 353 | 346 | |
| 354 | 347 | @Override |
| 348 | + public void onStart() { | |
| 349 | + super.onStart(); | |
| 350 | + | |
| 351 | + // Register listener to check for changed preferences | |
| 352 | + if(!U.isLibrary(getActivity())) | |
| 353 | + PreferenceManager.getDefaultSharedPreferences(getActivity()).registerOnSharedPreferenceChangeListener(this); | |
| 354 | + } | |
| 355 | + | |
| 356 | + @Override | |
| 357 | + public void onStop() { | |
| 358 | + super.onStop(); | |
| 359 | + | |
| 360 | + // Unregister listener | |
| 361 | + if(!U.isLibrary(getActivity())) | |
| 362 | + PreferenceManager.getDefaultSharedPreferences(getActivity()).unregisterOnSharedPreferenceChangeListener(this); | |
| 363 | + } | |
| 364 | + | |
| 365 | + @Override | |
| 355 | 366 | public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { |
| 356 | - if(!U.isLibrary(getActivity()) && key.equals("tasker_enabled")) { | |
| 367 | + if(key.equals("tasker_enabled")) { | |
| 368 | + getPreferenceScreen().removePreference(findPreference("dummy")); | |
| 369 | + | |
| 357 | 370 | boolean enabled = sharedPreferences.getBoolean(key, true); |
| 358 | 371 | |
| 359 | 372 | if(enabled) { |
Android-x86
Fork