From 82196ead569c25dae76a70be6b2bc147666ea24d Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Tue, 13 May 2014 23:19:54 -0700
Subject: Trebuchet Settings UI Refresh

- Overview Panel contains all Launcher Settings
  - Accessible through long press on Workspace or HW Menu button
  - Settings are held in a SlidingPanel in the Overview Panel
  - Replace the Settings shortcut in Overview Panel with Themes shortcut
  - Replace widgets icon with new widgets icon from Launcher3
- Trebuchet Settings changes no longer require restarting Process
- Transition Effects have PNG Sequence to show animation sequence
- Remove PageIndicator click event to open Overview Panel in AppTray

Contributors:
  Adrian Foulk - UX Lead
  Abishek Devkota - Project Manager
  Hayden Schoen - UX Designer

Change-Id: I2186213960cf12e840e814757894fe104551856b
---
 res/layout/overview_panel.xml              | 148 +++++------------------------
 res/layout/settings_pane.xml               | 121 +++++++++++++++++++++++
 res/layout/settings_pane_list_header.xml   |  19 ++++
 res/layout/settings_pane_list_item.xml     |  36 +++++++
 res/layout/settings_transitions_screen.xml |  51 ++++++++++
 5 files changed, 251 insertions(+), 124 deletions(-)
 create mode 100644 res/layout/settings_pane.xml
 create mode 100644 res/layout/settings_pane_list_header.xml
 create mode 100644 res/layout/settings_pane_list_item.xml
 create mode 100644 res/layout/settings_transitions_screen.xml

(limited to 'res/layout')

diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index 479b622ec..b6707417c 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!--
+     Copyright (C) 2013 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.
@@ -13,138 +14,37 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+
+<com.android.launcher3.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:slidingpanel="http://schemas.android.com/apk/res/com.android.launcher3"
+    android:id="@+id/sliding_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:gravity="bottom"
+    slidingpanel:overlay="false"
+    slidingpanel:panelHeight="@dimen/sliding_panel_padding" >
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
+        android:id="@+id/default_home_screen_panel"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal|top"
-        android:paddingTop="@dimen/overview_panel_top_padding">
+        android:layout_gravity="center_horizontal"
+        android:background="@color/settings_bg_color"
+        android:paddingTop="@dimen/overview_panel_top_padding" >
 
-        <TextView
+        <ImageView
             android:id="@+id/default_screen_button"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/app_icon_size"
             android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:src="@drawable/default_screen_button"
+            android:scaleType="fitCenter"
+            android:gravity="top"
             android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/default_screen_button_text"
-            android:drawablePadding="4dp"
-            android:drawableTop="@drawable/default_screen_button"
-            android:gravity="center_horizontal"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/transition_effect_button"
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/transition_effect_button_text"
-            android:drawablePadding="4dp"
-            android:drawableTop="@drawable/wallpaper_button"
-            android:gravity="center_horizontal"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:id="@+id/icon_pack_button"
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/icon_packs_title"
-            android:drawablePadding="4dp"
-            android:drawableTop="@drawable/iconpack_button"
-            android:gravity="center_horizontal"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp" />
-
+            android:paddingRight="@dimen/overview_panel_button_spacing"/>
     </LinearLayout>
 
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal|bottom"
-        android:paddingBottom="@dimen/overview_panel_bottom_padding">
+    <include layout="@layout/settings_pane" />
 
-        <TextView
-            android:id="@+id/wallpaper_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/wallpaper_button_text"
-            android:drawablePadding="4dp"
-            android:drawableTop="@drawable/wallpaper_button"
-            android:gravity="center_horizontal"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp" />
-        <TextView
-            android:id="@+id/sort_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/sort_button_text"
-            android:drawablePadding="4dp"
-            android:drawableTop="@drawable/wallpaper_button"
-            android:gravity="center_horizontal"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp" />
-        <TextView
-            android:id="@+id/widget_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/widget_button_text"
-            android:drawablePadding="4dp"
-            android:gravity="center_horizontal"
-            android:drawableTop="@drawable/widget_button"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp"/>
-        <TextView
-            android:id="@+id/filter_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/filter_button_text"
-            android:drawablePadding="4dp"
-            android:gravity="center_horizontal"
-            android:drawableTop="@drawable/widget_button"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp"/>
-        <TextView
-            android:id="@+id/settings_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/overview_panel_button_spacing"
-            android:paddingRight="@dimen/overview_panel_button_spacing"
-            android:text="@string/settings_button_text"
-            android:drawablePadding="4dp"
-            android:gravity="center_horizontal"
-            android:drawableTop="@drawable/setting_button"
-            android:fontFamily="sans-serif-condensed"
-            android:textAllCaps="true"
-            android:textSize="12sp" />
-    </LinearLayout>
-</FrameLayout>
+</com.android.launcher3.SlidingUpPanelLayout>
\ No newline at end of file
diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
new file mode 100644
index 000000000..26ee8fc26
--- /dev/null
+++ b/res/layout/settings_pane.xml
@@ -0,0 +1,121 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal|bottom"
+        android:background="@color/settings_bg_color"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/overview_panel_bottom_padding" >
+
+        <LinearLayout
+            android:id="@+id/settings_pane_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/overview_panel_top_padding" >
+
+            <ImageView
+                android:id="@+id/settings_drag_arrow"
+                android:layout_width="@dimen/overview_panel_button_spacing"
+                android:layout_height="@dimen/overview_panel_button_spacing"
+                android:layout_gravity="center_horizontal"
+                android:adjustViewBounds="true"
+                android:background="@drawable/launcheranimatedarrow_00000"/>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:orientation="horizontal"
+                android:paddingBottom="@dimen/overview_panel_bottom_padding"
+                android:paddingTop="@dimen/overview_panel_list_padding" >
+
+                <Space
+                    android:layout_width="0dip"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/wallpaper_button"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="4dp"
+                    android:drawableTop="@drawable/wallpaper_button"
+                    android:fontFamily="sans-serif-condensed"
+                    android:gravity="center_horizontal"
+                    android:layout_weight="2"
+                    android:text="@string/wallpaper_button_text"
+                    android:textAllCaps="true"
+                    android:textSize="12sp"
+                    android:textColor="@android:color/white"
+                    android:maxLines="2" />
+
+                <Space
+                    android:layout_width="0dip"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/widget_button"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="4dp"
+                    android:drawableTop="@drawable/widget_button"
+                    android:fontFamily="sans-serif-condensed"
+                    android:gravity="center_horizontal"
+                    android:layout_weight="2"
+                    android:text="@string/widget_button_text"
+                    android:textAllCaps="true"
+                    android:textSize="12sp"
+                    android:textColor="@android:color/white"
+                    android:maxLines="2" />
+
+                <Space
+                    android:layout_width="0dip"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+                <TextView
+                    android:id="@+id/themes_button"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="4dp"
+                    android:drawableTop="@drawable/themes_button"
+                    android:fontFamily="sans-serif-condensed"
+                    android:gravity="center_horizontal"
+                    android:layout_weight="2"
+                    android:text="@string/themes_button_text"
+                    android:textAllCaps="true"
+                    android:textSize="12sp"
+                    android:textColor="@android:color/white"
+                    android:maxLines="2" />
+
+                <Space
+                    android:layout_width="0dip"
+                    android:layout_height="1dp"
+                    android:layout_weight="1" />
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <view
+            class="com.android.launcher3.list.PinnedHeaderListView"
+            android:id="@+id/settings_home_screen_listview"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:fastScrollEnabled="true"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/dark_panel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/background_dark"
+        android:visibility="gone" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/settings_pane_list_header.xml b/res/layout/settings_pane_list_header.xml
new file mode 100644
index 000000000..700f5e773
--- /dev/null
+++ b/res/layout/settings_pane_list_header.xml
@@ -0,0 +1,19 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|bottom"
+    android:background="@color/settings_bg_color"
+    android:paddingLeft="@dimen/overview_panel_list_padding"
+    android:paddingRight="@dimen/overview_panel_list_padding"
+    android:orientation="horizontal" >
+
+    <TextView
+        android:id="@+id/item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="4dp"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="left"
+        android:textSize="16sp"
+        android:textColor="@color/settings_header_text"/>
+</RelativeLayout>
diff --git a/res/layout/settings_pane_list_item.xml b/res/layout/settings_pane_list_item.xml
new file mode 100644
index 000000000..2a9d31b95
--- /dev/null
+++ b/res/layout/settings_pane_list_item.xml
@@ -0,0 +1,36 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal|bottom"
+    android:background="@drawable/listitem_bg"
+    android:paddingLeft="@dimen/overview_panel_list_padding"
+    android:paddingRight="@dimen/overview_panel_list_padding"
+    android:orientation="horizontal" >
+
+    <TextView
+        android:id="@+id/item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="4dp"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="left"
+        android:paddingBottom="@dimen/overview_panel_list_padding"
+        android:paddingTop="@dimen/overview_panel_list_padding"
+        android:textSize="20sp"
+        android:textColor="@color/listitem_text"/>
+
+    <TextView
+        android:id="@+id/item_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:drawablePadding="4dp"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="right"
+        android:paddingBottom="@dimen/overview_panel_list_padding"
+        android:paddingTop="@dimen/overview_panel_list_padding"
+        android:textSize="20sp"
+        android:textAllCaps="true"
+        android:textColor="@color/listitem_text" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml
new file mode 100644
index 000000000..23b3b37e9
--- /dev/null
+++ b/res/layout/settings_transitions_screen.xml
@@ -0,0 +1,51 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal|bottom"
+    android:background="@color/settings_bg_color"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/overview_panel_bottom_padding"
+    android:paddingTop="@dimen/overview_panel_bottom_padding"
+    android:clickable="true" >
+
+    <LinearLayout
+        android:id="@+id/transition_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@drawable/listitem_bg"
+        android:clickable="true" >
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"
+            android:src="@drawable/handle_left" />
+
+        <TextView
+            android:id="@+id/transition_effect_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/transition_effect_button_text"
+            android:textAllCaps="true"
+            android:textColor="@android:color/white"
+            android:layout_gravity="center_vertical"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/settings_transition_image"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center_horizontal"
+        android:adjustViewBounds="true" />
+
+    <ListView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/settings_transitions_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:listSelector="@android:color/transparent"
+        android:splitMotionEvents="false"/>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3