diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/apps_customize_application.xml | 29 | ||||
-rw-r--r-- | res/layout/apps_customize_application.xml (renamed from res/layout-port/apps_customize_application.xml) | 5 | ||||
-rw-r--r-- | res/layout/folder_icon.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 8 |
4 files changed, 6 insertions, 40 deletions
diff --git a/res/layout-land/apps_customize_application.xml b/res/layout-land/apps_customize_application.xml deleted file mode 100644 index bf0022d76..000000000 --- a/res/layout-land/apps_customize_application.xml +++ /dev/null @@ -1,29 +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. ---> - -<com.android.launcher3.PagedViewIcon - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - - style="@style/WorkspaceIcon.Landscape.AppsCustomize" - - android:id="@+id/application_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_horizontal" - - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout-port/apps_customize_application.xml b/res/layout/apps_customize_application.xml index 0b7bab6c5..3b0fa6f4e 100644 --- a/res/layout-port/apps_customize_application.xml +++ b/res/layout/apps_customize_application.xml @@ -18,12 +18,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - style="@style/WorkspaceIcon.Portrait.AppsCustomize" + style="@style/WorkspaceIcon.AppsCustomize" android:id="@+id/application_icon" android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center_horizontal" - + android:focusable="true" android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml index 5a9a83415..9c5c46bd8 100644 --- a/res/layout/folder_icon.xml +++ b/res/layout/folder_icon.xml @@ -28,6 +28,6 @@ android:layout_height="wrap_content" android:src="@drawable/portal_ring_inner_holo"/> <com.android.launcher3.BubbleTextView - android:id="@+id/folder_icon_name" - style="@style/WorkspaceIcon"/> + style="@style/WorkspaceIcon" + android:id="@+id/folder_icon_name" /> </com.android.launcher3.FolderIcon> diff --git a/res/values/styles.xml b/res/values/styles.xml index cf77b51d9..48b9dbc9f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -82,15 +82,11 @@ <style name="WorkspaceIcon.Landscape"> </style> - <style name="WorkspaceIcon.Portrait.AppsCustomize"> - <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> - <item name="android:background">@null</item> - <item name="android:textColor">@color/apps_customize_icon_text_color</item> - </style> - <style name="WorkspaceIcon.Landscape.AppsCustomize"> + <style name="WorkspaceIcon.AppsCustomize"> <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> <item name="android:background">@null</item> <item name="android:textColor">@color/apps_customize_icon_text_color</item> + <item name="android:drawablePadding">4dp</item> </style> <style name="QSBBar"> |