OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de

Android-x86
Fork
Spenden

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

packages-apps-Taskbar: Commit

packages/apps/Taskbar


Commit MetaInfo

Revision9dc3017dc492e31912565c716ccf30e0c2f535de (tree)
Zeit2020-02-18 16:46:00
AutorBraden Farmer <farmerbb@gmai...>
CommiterBraden Farmer

Log Message

Little more progress on backup / restore

Ändern Zusammenfassung

Diff

--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
@@ -54,7 +54,7 @@ import com.farmerbb.taskbar.activity.dark.NavigationBarButtonsActivityDark;
5454 import com.farmerbb.taskbar.util.DependencyUtils;
5555 import com.farmerbb.taskbar.util.U;
5656
57-public class AdvancedFragment extends SettingsFragment {
57+public class AdvancedFragment extends SettingsFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
5858
5959 boolean secondScreenPrefEnabled = false;
6060
@@ -84,19 +84,13 @@ public class AdvancedFragment extends SettingsFragment {
8484 boolean isAndroidx86 = getActivity().getPackageName().equals(BuildConfig.ANDROIDX86_APPLICATION_ID);
8585
8686 if(isLibrary) {
87- findPreference("clear_pinned_apps").setOnPreferenceClickListener(this);
88-
8987 getPreferenceScreen().removePreference(findPreference("launcher"));
9088 getPreferenceScreen().removePreference(findPreference("keyboard_shortcut"));
9189 getPreferenceScreen().removePreference(findPreference("navigation_bar_buttons"));
92- getPreferenceScreen().removePreference(findPreference("manage_app_data"));
9390 } else {
9491 findPreference("launcher").setOnPreferenceClickListener(this);
9592 findPreference("keyboard_shortcut").setOnPreferenceClickListener(this);
9693 findPreference("navigation_bar_buttons").setOnPreferenceClickListener(this);
97- findPreference("manage_app_data").setOnPreferenceClickListener(this);
98-
99- getPreferenceScreen().removePreference(findPreference("clear_pinned_apps"));
10094 }
10195
10296 if(!isAndroidx86 && !isLibrary && U.isPlayStoreInstalled(getActivity()) && U.isPlayStoreRelease(getActivity())) {
@@ -125,6 +119,14 @@ public class AdvancedFragment extends SettingsFragment {
125119 }
126120 }
127121
122+ if(U.isExternalAccessDisabled(getActivity())) {
123+ addPreferencesFromResource(R.xml.tb_pref_advanced_extra_1);
124+ findPreference("clear_pinned_apps").setOnPreferenceClickListener(this);
125+ } else {
126+ addPreferencesFromResource(R.xml.tb_pref_advanced_extra_2);
127+ findPreference("manage_app_data").setOnPreferenceClickListener(this);
128+ }
129+
128130 finishedLoadingPrefs = true;
129131 }
130132
@@ -348,4 +350,21 @@ public class AdvancedFragment extends SettingsFragment {
348350
349351 if(restartTaskbar) U.restartTaskbar(getActivity());
350352 }
353+
354+ @Override
355+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
356+ if(!U.isLibrary(getActivity()) && key.equals("tasker_enabled")) {
357+ boolean enabled = sharedPreferences.getBoolean(key, true);
358+
359+ if(enabled) {
360+ getPreferenceScreen().removePreference(findPreference("clear_pinned_apps"));
361+ addPreferencesFromResource(R.xml.tb_pref_advanced_extra_2);
362+ findPreference("manage_app_data").setOnPreferenceClickListener(this);
363+ } else {
364+ getPreferenceScreen().removePreference(findPreference("manage_app_data"));
365+ addPreferencesFromResource(R.xml.tb_pref_advanced_extra_1);
366+ findPreference("clear_pinned_apps").setOnPreferenceClickListener(this);
367+ }
368+ }
369+ }
351370 }
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/ManageAppDataFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/ManageAppDataFragment.java
@@ -19,10 +19,13 @@ import android.annotation.TargetApi;
1919 import android.os.Build;
2020 import android.os.Bundle;
2121 import android.preference.Preference;
22+import android.widget.Toast;
23+
2224 import androidx.appcompat.app.ActionBar;
2325 import androidx.appcompat.app.AppCompatActivity;
2426
2527 import com.farmerbb.taskbar.R;
28+import com.farmerbb.taskbar.util.U;
2629
2730 public class ManageAppDataFragment extends SettingsFragment {
2831
@@ -60,7 +63,7 @@ public class ManageAppDataFragment extends SettingsFragment {
6063 switch(p.getKey()) {
6164 case "backup_settings":
6265 case "restore_settings":
63- // TODO
66+ U.showToast(getActivity(), "Not yet implemented", Toast.LENGTH_SHORT);
6467 break;
6568 }
6669
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -1583,6 +1583,8 @@ public class U {
15831583 }
15841584
15851585 public static boolean isExternalAccessDisabled(Context context) {
1586+ if(isLibrary(context)) return true;
1587+
15861588 SharedPreferences pref = getSharedPreferences(context);
15871589 return !pref.getBoolean("tasker_enabled", true);
15881590 }
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -391,7 +391,7 @@
391391
392392 <string name="tb_manage_app_data">Manage app data</string>
393393 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
394- <string name="tb_backup_settings">Backup settings</string>
395- <string name="tb_restore_settings">Restore settings</string>
394+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
395+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
396396
397397 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -391,7 +391,7 @@
391391
392392 <string name="tb_manage_app_data">Manage app data</string>
393393 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
394- <string name="tb_backup_settings">Backup settings</string>
395- <string name="tb_restore_settings">Restore settings</string>
394+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
395+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
396396
397397 </resources>
\ No newline at end of file
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -391,7 +391,7 @@
391391
392392 <string name="tb_manage_app_data">Manage app data</string>
393393 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
394- <string name="tb_backup_settings">Backup settings</string>
395- <string name="tb_restore_settings">Restore settings</string>
394+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
395+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
396396
397397 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -408,7 +408,7 @@ W takim przypadku może być konieczne flashowanie niestandardowego ROM-u w celu
408408
409409 <string name="tb_manage_app_data">Manage app data</string>
410410 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
411- <string name="tb_backup_settings">Backup settings</string>
412- <string name="tb_restore_settings">Restore settings</string>
411+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
412+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
413413
414414 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -391,7 +391,7 @@
391391
392392 <string name="tb_manage_app_data">Manage app data</string>
393393 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
394- <string name="tb_backup_settings">Backup settings</string>
395- <string name="tb_restore_settings">Restore settings</string>
394+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
395+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
396396
397397 </resources>
\ No newline at end of file
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -383,7 +383,7 @@ Bu durumda, bu cihazdaki serbest biçimli modu kullanmak için özel bir ROM fla
383383
384384 <string name="tb_manage_app_data">Manage app data</string>
385385 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
386- <string name="tb_backup_settings">Backup settings</string>
387- <string name="tb_restore_settings">Restore settings</string>
386+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
387+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
388388
389389 </resources>
\ No newline at end of file
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -391,7 +391,7 @@
391391
392392 <string name="tb_manage_app_data">Manage app data</string>
393393 <string name="tb_manage_app_data_description">@string/tb_clear_pinned_apps</string>
394- <string name="tb_backup_settings">Backup settings</string>
395- <string name="tb_restore_settings">Restore settings</string>
394+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
395+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
396396
397397 </resources>
\ No newline at end of file
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -391,7 +391,7 @@
391391
392392 <string name="tb_manage_app_data">Manage app data</string>
393393 <string name="tb_manage_app_data_description">Backup and restore settings, or reset per-app preferences</string>
394- <string name="tb_backup_settings">Backup settings</string>
395- <string name="tb_restore_settings">Restore settings</string>
394+ <string name="tb_backup_settings">Backup settings to file&#8230;</string>
395+ <string name="tb_restore_settings">Restore settings from file&#8230;</string>
396396
397397 </resources>
--- a/app/src/main/res/xml/tb_pref_advanced.xml
+++ b/app/src/main/res/xml/tb_pref_advanced.xml
@@ -53,15 +53,6 @@
5353 android:summary="@string/tb_pref_secondscreen_description"
5454 android:widgetLayout="@layout/tb_secondscreen_pref_widget"/>
5555
56- <Preference
57- android:key="clear_pinned_apps"
58- android:title="@string/tb_clear_pinned_apps"/>
59-
60- <Preference
61- android:key="manage_app_data"
62- android:title="@string/tb_manage_app_data"
63- android:summary="@string/tb_manage_app_data_description"/>
64-
65- <PreferenceCategory android:key="dummy" android:title="\n\n" />
56+ <!-- tb_pref_advanced_extra_1.xml or tb_pref_advanced_extra_2.xml gets added here -->
6657
6758 </PreferenceScreen>
--- /dev/null
+++ b/app/src/main/res/xml/tb_pref_advanced_extra_1.xml
@@ -0,0 +1,25 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<!-- Copyright 2020 Braden Farmer
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+
17+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
18+
19+ <Preference
20+ android:key="clear_pinned_apps"
21+ android:title="@string/tb_clear_pinned_apps"/>
22+
23+ <PreferenceCategory android:key="dummy" android:title="\n\n" />
24+
25+</PreferenceScreen>
--- /dev/null
+++ b/app/src/main/res/xml/tb_pref_advanced_extra_2.xml
@@ -0,0 +1,26 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<!-- Copyright 2020 Braden Farmer
3+
4+ Licensed under the Apache License, Version 2.0 (the "License");
5+ you may not use this file except in compliance with the License.
6+ You may obtain a copy of the License at
7+
8+ http://www.apache.org/licenses/LICENSE-2.0
9+
10+ Unless required by applicable law or agreed to in writing, software
11+ distributed under the License is distributed on an "AS IS" BASIS,
12+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ See the License for the specific language governing permissions and
14+ limitations under the License.
15+-->
16+
17+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
18+
19+ <Preference
20+ android:key="manage_app_data"
21+ android:title="@string/tb_manage_app_data"
22+ android:summary="@string/tb_manage_app_data_description"/>
23+
24+ <PreferenceCategory android:key="dummy" android:title="\n\n" />
25+
26+</PreferenceScreen>
Show on old repository browser