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

Commit 931952ec authored by Heemin Seog's avatar Heemin Seog
Browse files

Change generic container ids to be more specific 

CarSystemUI has an overlayable.xml for OEMs to overlay. However there
are name collisions for R.id.container for some library we depend on.

Bug: 186786197
Test: manual
Change-Id: Ibb7c2d36e37a039baa7bcddc68b4633ba05bf013
parent e6d38dbf

packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
        android:clipToPadding="false">



        <LinearLayout

            android:id="@+id/container"

            android:id="@+id/pattern_container"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:orientation="vertical"

packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:orientation="vertical"

        >

    <LinearLayout

            android:id="@+id/container"

            android:id="@+id/pin_container"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:orientation="vertical"

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
    <include layout="@layout/quick_status_bar_header_date_privacy"/>



    <RelativeLayout

        android:id="@+id/container"

        android:id="@+id/qs_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top"

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

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
    protected void onFinishInflate() {

        super.onFinishInflate();



        mContainer = findViewById(R.id.container);

        mContainer = findViewById(R.id.pin_container);

        mRow0 = findViewById(R.id.row0);

        mRow1 = findViewById(R.id.row1);

        mRow2 = findViewById(R.id.row2);

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

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class KeyguardPatternView extends KeyguardInputView 
        mLockPatternView = findViewById(R.id.lockPatternView);



        mEcaView = findViewById(R.id.keyguard_selector_fade_container);

        mContainer = findViewById(R.id.container);

        mContainer = findViewById(R.id.pattern_container);

    }



    @Override