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

Fix Tuner icon positioning and size in new layout

Browse Source 
Test: manual enabling TunerActivity
Fixes: 184351235
Change-Id: Iae7b95a53baf4687606266ed65d02ee47d9fd686
This commit is contained in:
Fabian Kozynski
2021-04-02 13:00:13 -04:00
parent e314376395
commit 511768f9f5
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/res/layout/qs_footer_impl_two_lines.xml
View File

@@ -129,10 +129,10 @@
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/tuner_icon"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="36dp"
android:paddingEnd="4dp"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="@dimen/qs_footer_icon_padding"
android:src="@drawable/tuner"
android:tint="?android:attr/textColorTertiary"
android:visibility="invisible" />

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -420,6 +420,8 @@
<!-- Padding on each QS Footer Icon to make the icons 20dpx20dp -->
<dimen name="qs_footer_icon_padding">14dp</dimen>
<!-- 3/4 of icon width 20dpx20dp -->
<dimen name="qs_footer_tuner_icon_translation">15dp</dimen>
<!-- The padding between the notifications and the quick settings container -->
<dimen name="qs_notification_padding">@dimen/notification_side_paddings</dimen>

9
packages/SystemUI/src/com/android/systemui/qs/QSFooterView.java
View File

@@ -75,6 +75,8 @@ public class QSFooterView extends FrameLayout {
private TouchAnimator mSettingsCogAnimator;
private View mActionsContainer;
private View mTunerIcon;
private int mTunerIconTranslation;
private OnClickListener mExpandClickListener;
@@ -107,6 +109,7 @@ public class QSFooterView extends FrameLayout {
mActionsContainer = requireViewById(R.id.qs_footer_actions_container);
mEditContainer = findViewById(R.id.qs_footer_actions_edit_container);
mBuildText = findViewById(R.id.build);
mTunerIcon = requireViewById(R.id.tuner_icon);
// RenderThread is doing more harm than good when touching the header (to expand quick
// settings), so disable it for this view
@@ -166,6 +169,9 @@ public class QSFooterView extends FrameLayout {
private void updateResources() {
updateFooterAnimator();
mTunerIconTranslation = mContext.getResources()
.getDimensionPixelOffset(R.dimen.qs_footer_tuner_icon_translation);
mTunerIcon.setTranslationX(isLayoutRtl() ? -mTunerIconTranslation : mTunerIconTranslation);
}
private void updateFooterAnimator() {
@@ -274,8 +280,7 @@ public class QSFooterView extends FrameLayout {
private void updateVisibilities(boolean isTunerEnabled) {
mSettingsContainer.setVisibility(mQsDisabled ? View.GONE : View.VISIBLE);
mSettingsContainer.findViewById(R.id.tuner_icon).setVisibility(
isTunerEnabled ? View.VISIBLE : View.INVISIBLE);
mTunerIcon.setVisibility(isTunerEnabled ? View.VISIBLE : View.INVISIBLE);
final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);
mMultiUserSwitch.setVisibility(showUserSwitcher() ? View.VISIBLE : View.GONE);
if (mEditContainer != null) {