Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change generic container ids to be more specific

Browse Source 
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
This commit is contained in:
Heemin Seog
2021-04-29 17:51:54 -07:00
parent e6d38dbfa6
commit 931952ec3d
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
View File

@@ -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"

2
packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
View File

@@ -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"

2
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
View File

@@ -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"

2
packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
View File

@@ -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);

2
packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
View File

@@ -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

2
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -111,7 +111,7 @@ public class QuickStatusBarHeader extends FrameLayout {
mDatePrivacyView = findViewById(R.id.quick_status_bar_date_privacy);
mClockIconsView = findViewById(R.id.quick_qs_status_icons);
mQSCarriers = findViewById(R.id.carrier_group);
mContainer = findViewById(R.id.container);
mContainer = findViewById(R.id.qs_container);
mIconContainer = findViewById(R.id.statusIcons);
mClockView = findViewById(R.id.clock);