diff options
| author | Yabin Huang <yabinh@google.com> | 2020-07-30 19:17:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-30 19:17:03 +0000 |
| commit | 906bc03cfb1399cde58dcefd71febccd84249c9c (patch) | |
| tree | 5222bb667588dfc94ac11cec5ca16cb6767fb530 /RotaryPlayground/res | |
| parent | 4ff8206148b5282a291fa10a79d4da5230fe7260 (diff) | |
| parent | c86babb1c3b56384c407e5b65c619285ce3f3abf (diff) | |
| download | tests-906bc03cfb1399cde58dcefd71febccd84249c9c.tar.gz | |
Merge "Remove focus highlight" into rvc-qpr-dev
Diffstat (limited to 'RotaryPlayground/res')
3 files changed, 3 insertions, 26 deletions
diff --git a/RotaryPlayground/res/drawable/seek_bar_background.xml b/RotaryPlayground/res/drawable/seek_bar_background.xml deleted file mode 100644 index 8d66a3b..0000000 --- a/RotaryPlayground/res/drawable/seek_bar_background.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2020 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. - --> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/car_ui_rotary_focus_color" - android:radius="16dp" /> diff --git a/RotaryPlayground/res/layout/rotary_direct_manipulation.xml b/RotaryPlayground/res/layout/rotary_direct_manipulation.xml index 6f6990e..a38cbe0 100644 --- a/RotaryPlayground/res/layout/rotary_direct_manipulation.xml +++ b/RotaryPlayground/res/layout/rotary_direct_manipulation.xml @@ -63,8 +63,7 @@ <SeekBar android:id="@+id/seek_bar" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/seek_bar_background"> + android:layout_height="wrap_content"> </SeekBar> <RadialTimePickerView android:id="@+id/radial_time_picker" diff --git a/RotaryPlayground/res/layout/rotary_sys_ui_direct_manipulation.xml b/RotaryPlayground/res/layout/rotary_sys_ui_direct_manipulation.xml index 9e30a1d..37782f9 100644 --- a/RotaryPlayground/res/layout/rotary_sys_ui_direct_manipulation.xml +++ b/RotaryPlayground/res/layout/rotary_sys_ui_direct_manipulation.xml @@ -46,8 +46,7 @@ RotaryController#TREAT_APP_WINDOW_AS_SYSTEM_WINDOW constant to true. <SeekBar android:id="@+id/direct_manipulation_supported_seek_bar" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/seek_bar_background"> + android:layout_height="wrap_content"> </SeekBar> <RadialTimePickerView android:id="@+id/direct_manipulation_supported_radial_time_picker" @@ -72,8 +71,7 @@ RotaryController#TREAT_APP_WINDOW_AS_SYSTEM_WINDOW constant to true. <SeekBar android:id="@+id/direct_manipulation_unsupported_seek_bar" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/seek_bar_background"> + android:layout_height="wrap_content"> </SeekBar> <RadialTimePickerView android:id="@+id/direct_manipulation_unsupported_radial_time_picker" |