diff options
author | Hongguang Chen <hgchen@google.com> | 2020-02-14 09:16:20 -0800 |
---|---|---|
committer | Hongguang Chen <hgchen@google.com> | 2020-03-06 17:08:38 +0000 |
commit | 19e61d87730d6e1e00766f8526605dd90034746d (patch) | |
tree | 20fe0491cde6e216e066462bc34c4724d449c202 /overlay | |
parent | 0123ffb8bfa9b5c3000e4a79ab2c7302f1615662 (diff) | |
download | atv-19e61d87730d6e1e00766f8526605dd90034746d.tar.gz |
Remove SystemUI customization.
ag/10483280 moved the TV customization to code because the current
SystemUI cannot customize the volume bar location. Remove this overlay to avoid confusing.
This reverts commit 1c9d5c18299452c3f9c47f6d249bd874ac421de2.
Bug: 146436981
Test: make SystemUI and check the volume bar.
Change-Id: I71d7c6d1c8a33a4a5a87bd54219e1f71c47017d7
Diffstat (limited to 'overlay')
3 files changed, 0 insertions, 194 deletions
diff --git a/overlay/frameworks/base/packages/SystemUI/res/layout/volume_dialog.xml b/overlay/frameworks/base/packages/SystemUI/res/layout/volume_dialog.xml deleted file mode 100644 index eb110b1..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/layout/volume_dialog.xml +++ /dev/null @@ -1,104 +0,0 @@ -<!-- - Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@android:color/transparent" - android:theme="@style/qs_theme"> - <LinearLayout - android:id="@+id/volume_dialog" - android:minWidth="@dimen/volume_dialog_row_width" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_gravity="center_horizontal|bottom" - android:background="@android:color/transparent" - android:paddingLeft="@dimen/volume_dialog_panel_transparent_padding" - android:paddingRight="@dimen/volume_dialog_panel_transparent_padding" - android:orientation="horizontal" - android:clipToPadding="false" > - - <FrameLayout - android:id="@+id/ringer" - android:layout_width="@dimen/volume_dialog_ringer_size" - android:layout_height="@dimen/volume_dialog_ringer_size" - android:layout_marginBottom="@dimen/volume_dialog_spacer" - android:translationZ="@dimen/volume_dialog_elevation" - android:layout_gravity="right" - android:clipToPadding="false" - android:visibility="gone" - android:background="@drawable/rounded_bg_full"> - <com.android.keyguard.AlphaOptimizedImageButton - android:id="@+id/ringer_icon" - style="@style/VolumeButtons" - android:background="@drawable/rounded_ripple" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:tint="@color/accent_tint_color_selector" - android:layout_gravity="center" - android:visibility="gone" - android:soundEffectsEnabled="false" /> - - <include layout="@layout/volume_dnd_icon" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginRight="@dimen/volume_dialog_stream_padding" - android:visibility="gone" - android:layout_marginTop="6dp"/> - </FrameLayout> - - <LinearLayout - android:id="@+id/main" - android:layout_height="wrap_content" - android:minWidth="@dimen/volume_dialog_row_width" - android:layout_width="wrap_content" - android:orientation="horizontal" - android:translationZ="@dimen/volume_dialog_elevation" - android:clipToPadding="false" - android:alpha="0.5" - android:background="@drawable/rounded_bg_full" > - <LinearLayout - android:id="@+id/volume_dialog_rows" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:orientation="vertical" - android:paddingRight="@dimen/volume_dialog_stream_padding" - android:paddingLeft="@dimen/volume_dialog_stream_padding"> - <!-- volume rows added and removed here! :-) --> - </LinearLayout> - <FrameLayout - android:id="@+id/settings_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone" - android:background="@drawable/rounded_bg_bottom_background"> - <com.android.keyguard.AlphaOptimizedImageButton - android:id="@+id/settings" - android:src="@drawable/ic_settings_16dp" - android:layout_width="@dimen/volume_dialog_tap_target_size" - android:layout_height="@dimen/volume_dialog_tap_target_size" - android:layout_gravity="center" - android:contentDescription="@string/accessibility_volume_settings" - android:background="@drawable/ripple_drawable_20dp" - android:tint="?android:attr/textColorSecondary" - android:soundEffectsEnabled="false" - android:visibility="gone" /> - </FrameLayout> - </LinearLayout> - - </LinearLayout> -</FrameLayout> diff --git a/overlay/frameworks/base/packages/SystemUI/res/layout/volume_dialog_row.xml b/overlay/frameworks/base/packages/SystemUI/res/layout/volume_dialog_row.xml deleted file mode 100644 index 08209ab..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/layout/volume_dialog_row.xml +++ /dev/null @@ -1,69 +0,0 @@ -<!-- - Copyright (C) 2015 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:tag="row" - android:layout_width="@dimen/volume_dialog_row_width" - android:layout_height="wrap_content" - android:background="@android:color/transparent" - android:clipChildren="false" - android:clipToPadding="false" - android:theme="@style/qs_theme"> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:background="@android:color/transparent" - android:gravity="center" - android:layout_gravity="center" - android:orientation="horizontal" > - <com.android.keyguard.AlphaOptimizedImageButton - android:id="@+id/volume_row_icon" - style="@style/VolumeButtons" - android:layout_width="@dimen/volume_dialog_tap_target_size" - android:layout_height="@dimen/volume_dialog_tap_target_size" - android:background="@drawable/ripple_drawable_20dp" - android:tint="@color/accent_tint_color_selector" - android:soundEffectsEnabled="false" /> - <TextView - android:id="@+id/volume_row_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLength="10" - android:maxLines="1" - android:visibility="gone" - android:textColor="?android:attr/colorControlNormal" - android:textAppearance="@style/TextAppearance.Volume.Header" /> - <FrameLayout - android:id="@+id/volume_row_slider_frame" - android:layout_height="match_parent" - android:layoutDirection="ltr" - android:layout_width="@dimen/volume_dialog_row_width"> - <SeekBar - android:id="@+id/volume_row_slider" - android:clickable="false" - android:layout_width="@dimen/volume_dialog_row_width" - android:layout_height="match_parent" - android:layoutDirection="ltr" - android:layout_gravity="center" - android:rotation="0" /> - </FrameLayout> - </LinearLayout> - - <include layout="@layout/volume_dnd_icon"/> - -</FrameLayout> diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml deleted file mode 100644 index 499341c..0000000 --- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2019 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <!-- Width of volume bar --> - <dimen name="volume_dialog_row_width">252dp</dimen> - <dimen name="volume_dialog_tap_target_size">36dp</dimen> -</resources> |