diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-14 15:13:00 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-12-15 08:05:09 -0800 |
| commit | f5440cbd6c0525769d24b890e16313a728831e04 (patch) | |
| tree | 5af627139853df45b24c890fb91bef558ebe2aa1 /res/drawable | |
| parent | e96798e885e3ac97b6de0a1c598eb09cf62349af (diff) | |
| download | android_packages_apps_Trebuchet-f5440cbd6c0525769d24b890e16313a728831e04.tar.gz android_packages_apps_Trebuchet-f5440cbd6c0525769d24b890e16313a728831e04.tar.bz2 android_packages_apps_Trebuchet-f5440cbd6c0525769d24b890e16313a728831e04.zip | |
Removing FeatureFlag.LAUNCHER3_LEGACY_WORKSPACE_DND and corresponding logic
Change-Id: Ie10c087b4f72ee27be5bf12e2c81be5b7a3a6176
Diffstat (limited to 'res/drawable')
| -rw-r--r-- | res/drawable/bg_celllayout.xml | 20 | ||||
| -rw-r--r-- | res/drawable/bg_screenpanel.xml | 27 |
2 files changed, 9 insertions, 38 deletions
diff --git a/res/drawable/bg_celllayout.xml b/res/drawable/bg_celllayout.xml index d2219b36c..b81b37f06 100644 --- a/res/drawable/bg_celllayout.xml +++ b/res/drawable/bg_celllayout.xml @@ -18,20 +18,18 @@ */ --> -<transition xmlns:android="http://schemas.android.com/apk/res/android" > - - <item> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" > +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_active="true" > + <shape android:shape="rectangle" > + <stroke + android:width="@dimen/spring_loaded_panel_border" + android:color="@color/spring_loaded_highlighted_panel_border_color" /> <solid android:color="@color/spring_loaded_panel_color" /> </shape> </item> <item> - <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" > - <stroke - android:width="@dimen/spring_loaded_panel_border" - android:color="@color/spring_loaded_highlighted_panel_border_color" /> - <solid android:color="@android:color/transparent" /> + <shape android:shape="rectangle" > + <solid android:color="@color/spring_loaded_panel_color" /> </shape> </item> - -</transition>
\ No newline at end of file +</selector> diff --git a/res/drawable/bg_screenpanel.xml b/res/drawable/bg_screenpanel.xml deleted file mode 100644 index 346fca013..000000000 --- a/res/drawable/bg_screenpanel.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 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. -*/ ---> - -<!-- TODO(twickham): Remove this file and the screenpanel drawables --> -<transition xmlns:android="http://schemas.android.com/apk/res/android" > - - <item android:drawable="@drawable/screenpanel"/> - <item android:drawable="@drawable/screenpanel_hover"/> - -</transition>
\ No newline at end of file |