aboutsummaryrefslogtreecommitdiff
path: root/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java
diff options
context:
space:
mode:
authorTai Kuo <taikuo@google.com>2020-06-19 16:56:04 +0800
committerTai Kuo <taikuo@google.com>2020-06-20 09:36:27 +0800
commit53e09534845b39a0810279eb8df8b1d89fc31666 (patch)
treed5b0de5e400088d4e378c410d31797152932ca5d /android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java
parent085d6d10f95b24a4e609131743f49f0656696e9e (diff)
downloadwalt-53e09534845b39a0810279eb8df8b1d89fc31666.tar.gz
walt: app: migrate to AndroidX, AppCompat and new API
Migrate since api deprecated at sdk 29. Bug: 149721303 Test: ./gradlew build --stacktrace --warning-mode all Change-Id: Ic4ffacd87ad74db5322e600c4ae60de235a79626 Signed-off-by: Tai Kuo <taikuo@google.com>
Diffstat (limited to 'android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java')
-rw-r--r--android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java29
1 files changed, 16 insertions, 13 deletions
diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java
index 4f74fc4..ace30cc 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/SettingsFragment.java
@@ -18,19 +18,21 @@ package org.chromium.latency.walt;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.widget.Toolbar;
import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
-public class SettingsFragment extends PreferenceFragmentCompat implements PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
+
+public class SettingsFragment extends PreferenceFragmentCompat implements
+ PreferenceFragmentCompat.OnPreferenceStartScreenCallback {
private Toolbar toolbar;
@@ -70,8 +72,8 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Prefer
DialogFragment fragment = NumberPickerPreference.
NumberPickerPreferenceDialogFragmentCompat.newInstance(preference.getKey());
fragment.setTargetFragment(this, 0);
- fragment.show(getFragmentManager(),
- "android.support.v7.preference.PreferenceFragment.DIALOG");
+ fragment.show(getParentFragmentManager(),
+ "androidx.preference.PreferenceFragment.DIALOG");
} else {
super.onDisplayPreferenceDialog(preference);
}
@@ -90,7 +92,8 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Prefer
args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, preferenceScreen.getKey());
fragment.setArguments(args);
- FragmentTransaction ft = preferenceFragmentCompat.getFragmentManager().beginTransaction();
+ FragmentTransaction ft = preferenceFragmentCompat.
+ getParentFragmentManager().beginTransaction();
ft.add(R.id.fragment_container, fragment, preferenceScreen.getKey());
ft.addToBackStack(preferenceScreen.getTitle().toString());
ft.commit();