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

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

Snap for 10776546 from 54f96175 to udc-qpr1-release

Change-Id: I4b3fa452c0a0d34a8d133507a02385c6ed569613
parents 69107bc4 54f96175
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -30,6 +30,4 @@ public class FeatureFlags {
    public static final String CONTEXTUAL_HOME = "settings_contextual_home";
    public static final String SETTINGS_SEARCH_ALWAYS_EXPAND =
            "settings_search_always_expand";
    public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH =
            "settings_press_hold_nav_handle_to_search";
}
+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ public class SettingsUIDeviceConfig {
     */
    public static final String BT_LE_AUDIO_DEVICE_DETAIL_ENABLED =
            "bt_le_audio_device_detail_enabled";
    /**
     * {@code true} if press and hold nav handle to search is enabled.
     */
    public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH =
            "press_hold_nav_handle_to_search";
    /**
     * {@code true} if long press home button to search is enabled.
     */
+1 −3
Original line number Diff line number Diff line
@@ -121,9 +121,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo

    @Override
    public void launchChooseLock(Bundle chooseLockFingerprintExtras) {
        final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
        Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class)
                : new Intent(this, ChooseLockGeneric.class);
        Intent intent = new Intent(this, SetupChooseLockGeneric.class);
        intent.setAction(mNewPasswordAction);
        intent.putExtras(chooseLockFingerprintExtras);
        if (mCallerAppName != null) {
+6 −0
Original line number Diff line number Diff line
@@ -256,6 +256,12 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
            return InternalSetupChooseLockGenericFragment.class;
        }

        @Override
        protected boolean isToolbarEnabled() {
            // Hide the action bar from this page.
            return false;
        }

        public static class InternalSetupChooseLockGenericFragment
                extends ChooseLockGenericFragment {
            @Override