From 931952ec3d4aa1247ce9010b8da1c7a6f4542faa Mon Sep 17 00:00:00 2001
From: Heemin Seog <hseog@google.com>
Date: Thu, 29 Apr 2021 17:51:54 -0700
Subject: [PATCH] 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
---
 packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml | 2 +-
 packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml     | 2 +-
 .../SystemUI/res/layout/quick_status_bar_expanded_header.xml    | 2 +-
 packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java | 2 +-
 .../SystemUI/src/com/android/keyguard/KeyguardPatternView.java  | 2 +-
 .../src/com/android/systemui/qs/QuickStatusBarHeader.java       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
index 1a38585ea78de..ce63082868bba 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml
@@ -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"
diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
index 50ffbc802a7d0..c64afd307f238 100644
--- a/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
+++ b/packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml
@@ -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"
diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
index 5bf691928300e..bb540990ccb7e 100644
--- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
@@ -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"
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
index b7a2c64dd1071..2325b554d5075 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java
@@ -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);
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
index d4513384c569d..98e7fb48b7a68 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
@@ -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
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index e3f00f42d2ca1..3d001f7d37563 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -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);