diff options
author | Adam Cohen <adamcohen@google.com> | 2014-07-07 11:58:56 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-07-07 15:29:53 -0700 |
commit | 96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd (patch) | |
tree | 91ff1045255107518b9ea6c9d08667b44ef5a8d2 /res/layout | |
parent | e54e67f8982f42190dcc3b2ee02092f474d1f7c6 (diff) | |
download | android_packages_apps_Trebuchet-96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd.tar.gz android_packages_apps_Trebuchet-96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd.tar.bz2 android_packages_apps_Trebuchet-96bb79819ef9ddf2d1c0cb0b72c2c9f6db26b4fd.zip |
Enabling quantum look and feel everywhere
-> _l assets become default, new folder icon look is default
-> Starting to unify folder look / feel with all apps
-> New page indicators
Change-Id: I50b2c647fbcbe6ed27705527d8e16bd89e123d0b
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/apps_customize_application.xml | 4 | ||||
-rw-r--r-- | res/layout/apps_customize_pane.xml | 38 | ||||
-rw-r--r-- | res/layout/folder_application.xml | 20 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 2 |
4 files changed, 45 insertions, 19 deletions
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml index 3b0fa6f4e..b48b9b7ac 100644 --- a/res/layout/apps_customize_application.xml +++ b/res/layout/apps_customize_application.xml @@ -19,10 +19,6 @@ 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/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index eae216e93..19db373bc 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -52,28 +52,38 @@ android:id="@android:id/tabcontent" android:layout_width="match_parent" android:layout_height="match_parent"> - <com.android.launcher3.AppsCustomizePagedView - android:id="@+id/apps_customize_pane_content" + + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" - launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" - launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" - launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" - launcher:maxGap="@dimen/workspace_max_gap" - launcher:pageIndicator="@+id/apps_customize_page_indicator" /> + android:orientation="vertical"> + + <com.android.launcher3.AppsCustomizePagedView + android:id="@+id/apps_customize_pane_content" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" + launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" + launcher:clingFocusedX="@integer/apps_customize_cling_focused_x" + launcher:clingFocusedY="@integer/apps_customize_cling_focused_y" + launcher:maxGap="@dimen/workspace_max_gap" + launcher:pageIndicator="@+id/apps_customize_page_indicator" /> + + <include + android:id="@+id/apps_customize_page_indicator" + layout="@layout/page_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + </LinearLayout> + <FrameLayout android:id="@+id/animation_buffer" android:layout_width="match_parent" android:layout_height="match_parent" android:background="#FF000000" android:visibility="gone" /> - <include - android:id="@+id/apps_customize_page_indicator" - layout="@layout/page_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" /> </FrameLayout> </LinearLayout> </com.android.launcher3.AppsCustomizeTabHost> diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml new file mode 100644 index 000000000..37dd79d37 --- /dev/null +++ b/res/layout/folder_application.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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.Folder" + android:focusable="true" + android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index 5d5f33b1f..4e5303ac0 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:background="@drawable/portal_container_holo"> + android:background="@drawable/quantum_panel"> <ScrollView android:id="@+id/scroll_view" |