diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-20 17:52:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-20 17:52:56 +0000 |
| commit | 2873ecd1ab2433f6124d8c9c27e2c3b37520a3a5 (patch) | |
| tree | 16001c25fde223f0c404fe059303dfc367bf50fb /res/layout | |
| parent | d7dc681290d52a00cf8dd6664a8105cb1374a681 (diff) | |
| parent | cdef04403695872db8be6342b8dacd437ee02d52 (diff) | |
| download | android_packages_apps_Trebuchet-2873ecd1ab2433f6124d8c9c27e2c3b37520a3a5.tar.gz android_packages_apps_Trebuchet-2873ecd1ab2433f6124d8c9c27e2c3b37520a3a5.tar.bz2 android_packages_apps_Trebuchet-2873ecd1ab2433f6124d8c9c27e2c3b37520a3a5.zip | |
Merge "Fixing some grid spacing issues. (Bug 10754537, 10754538)" into jb-ub-now-indigo-rose
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/apps_customize_application.xml | 28 | ||||
| -rw-r--r-- | res/layout/folder_icon.xml | 4 |
2 files changed, 30 insertions, 2 deletions
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml new file mode 100644 index 000000000..3b0fa6f4e --- /dev/null +++ b/res/layout/apps_customize_application.xml @@ -0,0 +1,28 @@ +<?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.AppsCustomize" + + android:id="@+id/application_icon" + android:layout_width="match_parent" + android:layout_height="match_parent" + + 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> |