diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-11 16:30:44 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-05-11 16:48:05 -0700 |
commit | dfaccf64bd59343de483b12eee6db61c960aedce (patch) | |
tree | 91cf70c144aae25cdf0d63c4780532ddd4256dcd /res/layout | |
parent | 1d7a55668e0a36a7ab150db2df4007dd5810bde8 (diff) | |
download | android_packages_apps_Trebuchet-dfaccf64bd59343de483b12eee6db61c960aedce.tar.gz android_packages_apps_Trebuchet-dfaccf64bd59343de483b12eee6db61c960aedce.tar.bz2 android_packages_apps_Trebuchet-dfaccf64bd59343de483b12eee6db61c960aedce.zip |
Various icon size changes
1) Setting different icon and text size for workspace and all apps
2) Setting padding during BubbleTextView inflation
Change-Id: I59da6986b0d98e8e2aa6065743bb799a6bf06a37
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/apps_customize_application.xml | 21 | ||||
-rw-r--r-- | res/layout/apps_grid_row_icon_view.xml | 3 | ||||
-rw-r--r-- | res/layout/apps_list_row_icon_view.xml | 29 | ||||
-rw-r--r-- | res/layout/apps_list_row_view.xml | 33 |
4 files changed, 2 insertions, 84 deletions
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml deleted file mode 100644 index c56cdf3d2..000000000 --- a/res/layout/apps_customize_application.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. ---> - -<com.android.launcher3.BubbleTextView - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon.AppsCustomize" - android:id="@+id/application_icon" - android:focusable="true" /> diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_row_icon_view.xml index 81e74b985..286deb454 100644 --- a/res/layout/apps_grid_row_icon_view.xml +++ b/res/layout/apps_grid_row_icon_view.xml @@ -25,5 +25,6 @@ android:paddingBottom="8dp" android:focusable="true" android:background="@drawable/focusable_view_bg" - launcher:deferShadowGeneration="true" /> + launcher:deferShadowGeneration="true" + launcher:iconDisplay="all_apps" /> diff --git a/res/layout/apps_list_row_icon_view.xml b/res/layout/apps_list_row_icon_view.xml deleted file mode 100644 index 867dbdc99..000000000 --- a/res/layout/apps_list_row_icon_view.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. ---> - -<com.android.launcher3.BubbleTextView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto" - 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" - launcher:iconPaddingOverride="24dp" - launcher:textSizeOverride="16dp" - launcher:layoutHorizontal="true" - launcher:deferShadowGeneration="true" /> diff --git a/res/layout/apps_list_row_view.xml b/res/layout/apps_list_row_view.xml deleted file mode 100644 index e80285b95..000000000 --- a/res/layout/apps_list_row_view.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 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. ---> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="@dimen/apps_view_row_height" - android:orientation="horizontal" - android:focusable="true" - android:background="@drawable/focusable_view_bg" - android:descendantFocusability="afterDescendants"> - <TextView - android:id="@+id/section" - android:layout_width="64dp" - android:layout_height="match_parent" - android:paddingLeft="16dp" - android:gravity="start|center_vertical" - android:textColor="@color/apps_view_section_text_color" - android:textSize="@dimen/apps_view_section_text_size" - android:focusable="false" /> -</LinearLayout> |