Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27c84de3 authored by tmfang's avatar tmfang Committed by Fan Zhang
Browse files

Settings Fragment Migration (Build pass app) 

This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
parent 99cc23d0

proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
-keepattributes Exceptions



# Keep all Fragments in this package, which are used by reflection.

-keep public class com.android.settings.** extends android.app.Fragment

-keep public class com.android.settings.** extends androidx.fragment.app.Fragment



# Keep all preference controllers needed by slice and DashboardFragment.

-keep class * extends com.android.settings.core.BasePreferenceController {

res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -239,8 +239,8 @@ 


        <item name="preferenceBackgroundColor">@drawable/preference_background</item>



        <!-- For all Alert Dialogs -->

        <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>

        <!-- For all androidx version of AlertDialogs -->

        <item name="alertDialogTheme">@style/Theme.AppCompat.Light.Dialog.Alert</item>



        <item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>

src/com/android/settings/BugreportPreference.java

+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings;



import android.app.ActivityManager;

import android.app.AlertDialog.Builder;

import android.content.Context;

import android.content.DialogInterface;

import android.os.RemoteException;
@@ -29,9 +28,11 @@ import android.widget.TextView; 


import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.CustomDialogPreference;

import com.android.settingslib.CustomDialogPreferenceCompat;



public class BugreportPreference extends CustomDialogPreference {

import androidx.appcompat.app.AlertDialog.Builder;



public class BugreportPreference extends CustomDialogPreferenceCompat {



    private static final String TAG = "BugreportPreference";

src/com/android/settings/CredentialStorage.java

+4 −3
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.settings.vpn2.VpnUtils; 
import java.io.ByteArrayInputStream;

import java.io.IOException;



import androidx.fragment.app.FragmentActivity;

import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;
@@ -88,7 +89,7 @@ import sun.security.x509.AlgorithmId; 
 * Action:   normal unlock/install

 * Notes:    this is the common case

 */

public final class CredentialStorage extends Activity {

public final class CredentialStorage extends FragmentActivity {



    private static final String TAG = "CredentialStorage";
@@ -160,7 +161,7 @@ public final class CredentialStorage extends Activity { 
            case UNLOCKED: {

                if (isActivePasswordQualityInsufficient()) {

                    final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();

                    dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);

                    dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);

                    return;

                }

                installIfAvailable();
@@ -180,7 +181,7 @@ public final class CredentialStorage extends Activity { 
        if (isActivePasswordQualityInsufficient()) {

            // key guard not setup, doing so will initialize keystore

            final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();

            dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);

            dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);

            // will return to onResume after Activity

            return;

        }

src/com/android/settings/CustomListPreference.java

+9 −5
Original line number Diff line number Diff line
@@ -28,9 +28,11 @@ import android.util.AttributeSet; 
import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;



import androidx.appcompat.app.AlertDialog.Builder;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentTransaction;

import androidx.preference.ListPreference;

import androidx.preference.ListPreferenceDialogFragmentCompat;



public class CustomListPreference extends ListPreference {
@@ -43,7 +45,7 @@ public class CustomListPreference extends ListPreference { 
        super(context, attrs, defStyleAttr, defStyleRes);

    }



    protected void onPrepareDialogBuilder(AlertDialog.Builder builder,

    protected void onPrepareDialogBuilder(Builder builder,

            DialogInterface.OnClickListener listener) {

    }
@@ -72,15 +74,17 @@ public class CustomListPreference extends ListPreference { 
    protected void onDialogStateRestored(Dialog dialog, Bundle savedInstanceState) {

    }



    public static class CustomListPreferenceDialogFragment extends ListPreferenceDialogFragment {

    public static class CustomListPreferenceDialogFragment extends

            ListPreferenceDialogFragmentCompat {



        private static final java.lang.String KEY_CLICKED_ENTRY_INDEX

                = "settings.CustomListPrefDialog.KEY_CLICKED_ENTRY_INDEX";



        private int mClickedDialogEntryIndex;



        public static ListPreferenceDialogFragment newInstance(String key) {

            final ListPreferenceDialogFragment fragment = new CustomListPreferenceDialogFragment();

        public static ListPreferenceDialogFragmentCompat newInstance(String key) {

            final ListPreferenceDialogFragmentCompat fragment =

                    new CustomListPreferenceDialogFragment();

            final Bundle b = new Bundle(1);

            b.putString(ARG_KEY, key);

            fragment.setArguments(b);
@@ -92,7 +96,7 @@ public class CustomListPreference extends ListPreference { 
        }



        @Override

        protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {

        protected void onPrepareDialogBuilder(Builder builder) {

            super.onPrepareDialogBuilder(builder);

            mClickedDialogEntryIndex = getCustomizablePreference()

                    .findIndexOfValue(getCustomizablePreference().getValue());