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

Merge "Change generic container ids to be more specific" into sc-dev am: ca5c208082

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14370816

Change-Id: I57325550bd8be4c2153b7357dfe88e81fc6f3cc2
This commit is contained in:
Heemin Seog
2021-05-04 19:02:27 +00:00
committed by Automerger Merge Worker
parent 611f4422ae ca5c208082
commit d31dd05220
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"> android:clipToPadding="false">
<LinearLayout <LinearLayout
android:id="@+id/container" android:id="@+id/pattern_container"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:orientation="vertical" android:orientation="vertical"

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

@@ -27,7 +27,7 @@
android:orientation="vertical" android:orientation="vertical"
> >
<LinearLayout <LinearLayout
android:id="@+id/container" android:id="@+id/pin_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:orientation="vertical" 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"/> <include layout="@layout/quick_status_bar_header_date_privacy"/>
<RelativeLayout <RelativeLayout
android:id="@+id/container" android:id="@+id/qs_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" 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() { protected void onFinishInflate() {
super.onFinishInflate(); super.onFinishInflate();
mContainer = findViewById(R.id.container); mContainer = findViewById(R.id.pin_container);
mRow0 = findViewById(R.id.row0); mRow0 = findViewById(R.id.row0);
mRow1 = findViewById(R.id.row1); mRow1 = findViewById(R.id.row1);
mRow2 = findViewById(R.id.row2); 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); mLockPatternView = findViewById(R.id.lockPatternView);
mEcaView = findViewById(R.id.keyguard_selector_fade_container); mEcaView = findViewById(R.id.keyguard_selector_fade_container);
mContainer = findViewById(R.id.container); mContainer = findViewById(R.id.pattern_container);
} }
@Override @Override

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

@@ -114,7 +114,7 @@ public class QuickStatusBarHeader extends FrameLayout {
mDatePrivacyView = findViewById(R.id.quick_status_bar_date_privacy); mDatePrivacyView = findViewById(R.id.quick_status_bar_date_privacy);
mClockIconsView = findViewById(R.id.quick_qs_status_icons); mClockIconsView = findViewById(R.id.quick_qs_status_icons);
mQSCarriers = findViewById(R.id.carrier_group); mQSCarriers = findViewById(R.id.carrier_group);
mContainer = findViewById(R.id.container); mContainer = findViewById(R.id.qs_container);
mIconContainer = findViewById(R.id.statusIcons); mIconContainer = findViewById(R.id.statusIcons);
mPrivacyChip = findViewById(R.id.privacy_chip); mPrivacyChip = findViewById(R.id.privacy_chip);
mDateView = findViewById(R.id.date); mDateView = findViewById(R.id.date);