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

Commit 1c226763 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9014491 from 73e47429 to tm-qpr1-release 

Change-Id: Ia6a11ef7a7a954447f7596b3c7e9d3487169c3c5
parents a2910ec1 73e47429

res/values/strings.xml

+10 −2
Original line number Diff line number Diff line
@@ -6803,9 +6803,17 @@ 
    <!-- [CHAR_LIMIT=NONE] Battery usage item for background usage time -->

    <string name="battery_usage_for_background_time">Background: <xliff:g id="time">%s</xliff:g></string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer content -->

    <string name="battery_usage_screen_footer">Battery usage data is approximate and doesn\'t measure usage when phone is charging</string>

    <string name="battery_usage_screen_footer" product="default">Battery usage data is approximate and doesn\'t measure usage when phone is charging</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer content -->

    <string name="battery_usage_screen_footer" product="tablet">Battery usage data is approximate and doesn\'t measure usage when tablet is charging</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer content -->

    <string name="battery_usage_screen_footer" product="device">Battery usage data is approximate and doesn\'t measure usage when device is charging</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer for empty content -->

    <string name="battery_usage_screen_footer_empty" product="default">Battery usage data will be available after you use your phone for a few hours</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer for empty content -->

    <string name="battery_usage_screen_footer_empty" product="tablet">Battery usage data will be available after you use your tablet for a few hours</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer for empty content -->

    <string name="battery_usage_screen_footer_empty">Battery usage data will be available after you use your phone for a few hours</string>

    <string name="battery_usage_screen_footer_empty" product="device">Battery usage data will be available after you use your device for a few hours</string>

    <!-- [CHAR_LIMIT=NONE] Accessibility content description for battery chart view. -->

    <string name="battery_usage_chart">Battery usage chart</string>

    <!-- [CHAR_LIMIT=NONE] Accessibility content description for daily battery chart view. -->

src/com/android/settings/accounts/AccountDetailDashboardFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 


    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        getPreferenceManager().setPreferenceComparisonCallback(null);

        // Initialize the parameters since displayTile() will be called in super.onCreate().

        Bundle args = getArguments();

        final Activity activity = getActivity();

        mUserHandle = Utils.getSecureTargetUser(activity.getActivityToken(),
@@ -82,6 +81,9 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 
                mAccountType = args.getString(KEY_ACCOUNT_TYPE);

            }

        }



        super.onCreate(icicle);

        getPreferenceManager().setPreferenceComparisonCallback(null);

        mAccountSynController.init(mAccount, mUserHandle);

        mRemoveAccountController.init(mAccount, mUserHandle);

    }

src/com/android/settings/biometrics/combination/CombinedBiometricStatusPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.settingslib.RestrictedPreference; 
 */

public class CombinedBiometricStatusPreferenceController extends

        BiometricStatusPreferenceController implements LifecycleObserver {

    private static final String KEY_BIOMETRIC_SETTINGS = "biometric_settings";

    public static final String KEY_BIOMETRIC_SETTINGS = "biometric_settings";



    @VisibleForTesting

    RestrictedPreference mPreference;
@@ -122,4 +122,8 @@ public class CombinedBiometricStatusPreferenceController extends 
    protected String getSettingsClassName() {

        return mCombinedBiometricStatusUtils.getSettingsClassName();

    }



    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {

        mPreferenceScreen = preferenceScreen;

    }

}

src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon 
    public static final String KEY_FACE_SETTINGS = "face_settings";



    protected final FaceManager mFaceManager;



    @VisibleForTesting

    RestrictedPreference mPreference;

    private PreferenceScreen mPreferenceScreen;
@@ -111,4 +112,8 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon 
    protected String getSettingsClassName() {

        return mFaceStatusUtils.getSettingsClassName();

    }



    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {

        mPreferenceScreen = preferenceScreen;

    }

}

src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.settingslib.RestrictedPreference; 
public class FingerprintStatusPreferenceController extends BiometricStatusPreferenceController

        implements LifecycleObserver {



    private static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings";

    public static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings";



    protected final FingerprintManager mFingerprintManager;

    @VisibleForTesting
@@ -112,4 +112,8 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer 
            mPreference.setDisabledByAdmin(enforcedAdmin);

        }

    }



    public void setPreferenceScreen(PreferenceScreen preferenceScreen) {

        mPreferenceScreen = preferenceScreen;

    }

}