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

Commit 52e8e6c9 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents a8deb9e8 741dcffe

packages/SystemUI/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ 
        <activity android:name=".tuner.TunerActivity"

                  android:enabled="false"

                  android:icon="@drawable/tuner"

                  android:theme="@style/TunerSettings"

                  android:theme="@style/Theme.SubSettingsBase"

                  android:label="@string/system_ui_tuner"

                  android:process=":tuner"

                  android:exported="true">
@@ -449,7 +449,7 @@ 
        <activity-alias android:name=".DemoMode"

                  android:targetActivity=".tuner.TunerActivity"

                  android:icon="@drawable/tuner"

                  android:theme="@style/TunerSettings"

                  android:theme="@style/Theme.SubSettingsBase"

                  android:label="@string/demo_mode"

                  android:process=":tuner"

                  android:exported="true">

packages/SystemUI/LineageManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
            android:name=".tuner.StatusBarTuner"

            android:targetActivity=".tuner.TunerActivity"

            android:icon="@drawable/tuner"

            android:theme="@style/TunerSettings"

            android:label="@string/status_bar"

            android:theme="@style/Theme.SubSettingsBase"

            android:label="@string/status_bar_icons_title"

            android:process=":tuner"

            android:exported="true">

            <intent-filter>

packages/SystemUI/res/layout/tuner_activity.xml

+0 −7
Original line number Diff line number Diff line
@@ -20,13 +20,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    <Toolbar

        android:id="@+id/action_bar"

        style="?android:attr/actionBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:theme="?android:attr/actionBarTheme"

        android:navigationContentDescription="@*android:string/action_bar_up_description" />

    <FrameLayout

        android:id="@+id/content_frame"

        android:layout_width="match_parent"

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
 */

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Status bar - icons -->

    <string name="status_bar_icons_title">Status bar icons</string>



    <!-- Name of the clock in status bar [CHAR LIMIT=30] -->

    <string name="clock">Clock</string>

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+13 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
    private boolean mScramblePin;



    private List<Integer> mNumbers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 0);

    private final List<Integer> mDefaultNumbers = List.of(mNumbers.toArray(new Integer[0]));



    public KeyguardPINView(Context context) {

        this(context, null);
@@ -178,11 +179,19 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
                new View[]{

                        null, mEcaView, null

                }};

        updatePinScrambling();

    }



        mScramblePin = LineageSettings.System.getInt(getContext().getContentResolver(),

    private void updatePinScrambling() {

        final boolean scramblePin = LineageSettings.System.getInt(getContext().getContentResolver(),

                LineageSettings.System.LOCKSCREEN_PIN_SCRAMBLE_LAYOUT, 0) == 1;

        if (mScramblePin) {

        if (scramblePin || scramblePin != mScramblePin) {

            mScramblePin = scramblePin;

            if (scramblePin) {

                Collections.shuffle(mNumbers);

            } else {

                mNumbers = new ArrayList<>(mDefaultNumbers);

            }

            // get all children who are NumPadKeys

            List<NumPadKey> views = new ArrayList<>();
@@ -212,6 +221,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 


    @Override

    public void startAppearAnimation() {

        updatePinScrambling();

        setAlpha(1f);

        setTranslationY(0);

        if (mAppearAnimator.isRunning()) {