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

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

Snap for 11220357 from 80d344a4 to 24Q1-release 

Change-Id: I281817666954e546f96da668b0ea050c00aa18bb
parents 091bb293 80d344a4

res/layout/keyboard_layout_picker.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,13 @@ 
    android:id="@+id/keyboard_layout_picker_container"

    android:id="@+id/keyboard_layout_picker_container"

    android:orientation="vertical">

    android:orientation="vertical">





    <ImageView

        android:id="@+id/keyboard_layout_preview"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:adjustViewBounds="true"

        android:scaleType="fitCenter"/>



    <FrameLayout

    <FrameLayout

        android:id="@+id/keyboard_layout_title"

        android:id="@+id/keyboard_layout_title"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

res/xml/audio_stream_details_fragment.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -25,10 +25,12 @@ 
        android:layout="@layout/settings_entity_header"

        android:layout="@layout/settings_entity_header"

        android:selectable="false"

        android:selectable="false"

        settings:allowDividerBelow="true"

        settings:allowDividerBelow="true"

        settings:searchable="false" />

        settings:searchable="false"

        settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamHeaderController" />





    <com.android.settingslib.widget.ActionButtonsPreference

    <com.android.settingslib.widget.ActionButtonsPreference

        android:key="audio_stream_button"

        android:key="audio_stream_button"

        settings:allowDividerBelow="true" />

        settings:allowDividerBelow="true"

        settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamButtonController" />





</PreferenceScreen>
 
</PreferenceScreen>

res/xml/development_settings.xml

+4 −5
Original line number Original line Diff line number Diff line
@@ -727,11 +727,10 @@ 
            android:title="@string/enable_non_resizable_multi_window"

            android:title="@string/enable_non_resizable_multi_window"

            android:summary="@string/enable_non_resizable_multi_window_summary" />

            android:summary="@string/enable_non_resizable_multi_window_summary" />





        // TODO(b/315859328): Temporally removed since causing search indexing failure.

        <SwitchPreferenceCompat

<!--        <SwitchPreferenceCompat-->

            android:key="back_navigation_animation"

<!--            android:key="back_navigation_animation"-->

            android:title="@string/back_navigation_animation"

<!--            android:title="@string/back_navigation_animation"-->

            android:summary="@string/back_navigation_animation_summary" />

<!--            android:summary="@string/back_navigation_animation_summary" />-->





        <Preference

        <Preference

            android:key="reset_shortcut_manager_throttling"

            android:key="reset_shortcut_manager_throttling"

src/com/android/settings/SettingsPreferenceFragment.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -479,7 +479,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF 
                mDialogFragment.dismiss();

                mDialogFragment.dismiss();

                mDialogFragment = null;

                mDialogFragment = null;

            }

            }

            getListView().clearOnScrollListeners();

            RecyclerView view = getListView();

            if (view != null) {

                view.clearOnScrollListeners();

            }

        }

        }

        super.onDetach();

        super.onDetach();

    }

    }

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

+11 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,17 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
        }

        }

    }

    }





    @Override

    protected Intent getFingerprintEnrollingIntent() {

        final Intent ret = super.getFingerprintEnrollingIntent();

        if (Flags.udfpsEnrollCalibration()) {

            if (mCalibrator != null) {

                ret.putExtras(mCalibrator.getExtrasForNextIntent(true));

            }

        }

        return ret;

    }



    @Override

    @Override

    public void onBackPressed() {

    public void onBackPressed() {

        stopLookingForFingerprint();

        stopLookingForFingerprint();