diff options
Diffstat (limited to 'res')
29 files changed, 9 insertions, 89 deletions
diff --git a/res/drawable-hdpi/page_hover_left.9.png b/res/drawable-hdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index 3f11d0b33..000000000 --- a/res/drawable-hdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_left_active.9.png b/res/drawable-hdpi/page_hover_left_active.9.png Binary files differdeleted file mode 100644 index abe4c31a9..000000000 --- a/res/drawable-hdpi/page_hover_left_active.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_right.9.png b/res/drawable-hdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index 3bcf19195..000000000 --- a/res/drawable-hdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_right_active.9.png b/res/drawable-hdpi/page_hover_right_active.9.png Binary files differdeleted file mode 100644 index 101e4dc0f..000000000 --- a/res/drawable-hdpi/page_hover_right_active.9.png +++ /dev/null diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png Binary files differdeleted file mode 100644 index 5bccd3356..000000000 --- a/res/drawable-hdpi/screenpanel.9.png +++ /dev/null diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png Binary files differdeleted file mode 100644 index f6b8c62ff..000000000 --- a/res/drawable-hdpi/screenpanel_hover.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_left.9.png b/res/drawable-mdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index 2b6094cf6..000000000 --- a/res/drawable-mdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_left_active.9.png b/res/drawable-mdpi/page_hover_left_active.9.png Binary files differdeleted file mode 100644 index 9eb00a282..000000000 --- a/res/drawable-mdpi/page_hover_left_active.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_right.9.png b/res/drawable-mdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index c2e598351..000000000 --- a/res/drawable-mdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_right_active.9.png b/res/drawable-mdpi/page_hover_right_active.9.png Binary files differdeleted file mode 100644 index d2771a1a5..000000000 --- a/res/drawable-mdpi/page_hover_right_active.9.png +++ /dev/null diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png Binary files differdeleted file mode 100644 index 9603c122a..000000000 --- a/res/drawable-mdpi/screenpanel.9.png +++ /dev/null diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png Binary files differdeleted file mode 100644 index 7f28ce0e0..000000000 --- a/res/drawable-mdpi/screenpanel_hover.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/page_hover_left.9.png b/res/drawable-xhdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index dbcc0abd2..000000000 --- a/res/drawable-xhdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/page_hover_left_active.9.png b/res/drawable-xhdpi/page_hover_left_active.9.png Binary files differdeleted file mode 100644 index 3233efe28..000000000 --- a/res/drawable-xhdpi/page_hover_left_active.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/page_hover_right.9.png b/res/drawable-xhdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index d82f809bf..000000000 --- a/res/drawable-xhdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/page_hover_right_active.9.png b/res/drawable-xhdpi/page_hover_right_active.9.png Binary files differdeleted file mode 100644 index 819ea195c..000000000 --- a/res/drawable-xhdpi/page_hover_right_active.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png Binary files differdeleted file mode 100644 index 75343f78d..000000000 --- a/res/drawable-xhdpi/screenpanel.9.png +++ /dev/null diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png Binary files differdeleted file mode 100644 index 55b4d6ed2..000000000 --- a/res/drawable-xhdpi/screenpanel_hover.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/page_hover_left.9.png b/res/drawable-xxhdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index c81f86c02..000000000 --- a/res/drawable-xxhdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/page_hover_left_active.9.png b/res/drawable-xxhdpi/page_hover_left_active.9.png Binary files differdeleted file mode 100644 index 858a3b2ab..000000000 --- a/res/drawable-xxhdpi/page_hover_left_active.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/page_hover_right.9.png b/res/drawable-xxhdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index c5297703e..000000000 --- a/res/drawable-xxhdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/page_hover_right_active.9.png b/res/drawable-xxhdpi/page_hover_right_active.9.png Binary files differdeleted file mode 100644 index 99005536b..000000000 --- a/res/drawable-xxhdpi/page_hover_right_active.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/screenpanel.9.png b/res/drawable-xxhdpi/screenpanel.9.png Binary files differdeleted file mode 100644 index b221b378f..000000000 --- a/res/drawable-xxhdpi/screenpanel.9.png +++ /dev/null diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png Binary files differdeleted file mode 100644 index 418cf0a62..000000000 --- a/res/drawable-xxhdpi/screenpanel_hover.9.png +++ /dev/null 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 diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml deleted file mode 100644 index 514980fe0..000000000 --- a/res/values-sw720dp-land/dimens.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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> - <!-- the area at the edge of the screen that makes the workspace go left - or right while you're dragging. --> - <dimen name="scroll_zone">100dip</dimen> -</resources> diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml deleted file mode 100644 index 6f594d518..000000000 --- a/res/values-sw720dp-port/dimens.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 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> -<!-- Workspace --> - <!-- the area at the edge of the screen that makes the workspace go left - or right while you're dragging. --> - <dimen name="scroll_zone">40dp</dimen> -</resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 188f98fa6..a8a25af3e 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -109,14 +109,6 @@ <!-- the distance an icon must be dragged before button drop targets accept it --> <dimen name="drag_distanceThreshold">30dp</dimen> - <!-- the area at the edge of the screen that makes the workspace go left - or right while you're dragging. --> - <dimen name="scroll_zone">20dp</dimen> - - <!-- When dragging an item, how much bigger (fixed dps) the dragged view - should be. If 0, it will not be scaled at all. --> - <dimen name="dragViewScale">12dp</dimen> - <!-- Elevation for the drag view. It should be larger than elevation of all other drag sources and drop targets like all-apps and folders --> <dimen name="drag_elevation">30dp</dimen> |
