From c3a609f950a713d995f1968574d8ed7b4449f415 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 26 Feb 2015 17:43:50 -0800
Subject: Refactoring folder content

> Refactoring the CellLayout in folder with a custom view so
that it can be replaced easily with a scrollable paged view.
> Moving some methods from the folder to this new view which
assume a single page layout for the folder
> Changing folder from LinearLayout to FrameLayout to properly
handle focus traversal in case of multi-page folders

Change-Id: I073c00b995488f9f5d8123b00357e094ca2cec7c
---
 res/layout/user_folder.xml | 57 +++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index ed8d43e46..74cdf11dc 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     Copyright (C) 2008 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.
@@ -14,42 +15,50 @@
      limitations under the License.
 -->
 
-<com.android.launcher3.Folder
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@drawable/quantum_panel">
+    android:background="@drawable/quantum_panel"
+    android:orientation="vertical" >
 
-    <ScrollView
-        android:id="@+id/scroll_view"
+    <FrameLayout
+        android:id="@+id/folder_content_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-      <com.android.launcher3.CellLayout
-          android:id="@+id/folder_content"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:cacheColorHint="#ff333333"
-          android:hapticFeedbackEnabled="false" />
-    </ScrollView>
+        android:layout_height="match_parent" >
+
+        <!-- Actual size of the indicator doesn't matter as it is scaled to match the view size -->
+
+        <com.android.launcher3.FocusIndicatorView
+            android:id="@+id/focus_indicator"
+            android:layout_width="20dp"
+            android:layout_height="20dp" />
+
+        <com.android.launcher3.FolderCellLayout
+            android:id="@+id/folder_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:cacheColorHint="#ff333333"
+            android:hapticFeedbackEnabled="false" />
+    </FrameLayout>
 
     <com.android.launcher3.FolderEditText
         android:id="@+id/folder_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:paddingTop="@dimen/folder_name_padding"
-        android:paddingBottom="@dimen/folder_name_padding"
         android:background="#00000000"
+        android:fontFamily="sans-serif-condensed"
+        android:gravity="center_horizontal"
         android:hint="@string/folder_hint_text"
-        android:textSize="14sp"
+        android:imeOptions="flagNoExtractUi"
+        android:paddingBottom="@dimen/folder_name_padding"
+        android:paddingTop="@dimen/folder_name_padding"
+        android:singleLine="true"
         android:textColor="#ff777777"
-        android:textColorHint="#ff808080"
         android:textColorHighlight="#ffCCCCCC"
+        android:textColorHint="#ff808080"
         android:textCursorDrawable="@null"
-        android:gravity="center_horizontal"
-        android:singleLine="true"
-        android:imeOptions="flagNoExtractUi"
-        android:fontFamily="sans-serif-condensed"/>
-</com.android.launcher3.Folder>
+        android:textSize="14sp" />
+
+</com.android.launcher3.Folder>
\ No newline at end of file
-- 
cgit v1.2.3


From 290800b5b7d575fd709f244f54a5fa5b63b58876 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 5 Mar 2015 11:33:33 -0800
Subject: Adding a scrollable folder content implementation

> Size is restricted to 3x3 for now
> Drag-drop across page s not implemented yet
> A-Z sorting is not implemented yet

Change-Id: I84328caa6ad910d1edeeac6f3a7fb61b7292ea7e
---
 res/layout/user_folder.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 74cdf11dc..7a4d5e881 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -46,7 +46,6 @@
         android:id="@+id/folder_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
         android:background="#00000000"
         android:fontFamily="sans-serif-condensed"
         android:gravity="center_horizontal"
-- 
cgit v1.2.3


From b863415c17aaaf6012647df5ed14803f89f94bcb Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 9 Apr 2015 14:17:14 -0700
Subject: Updating folder UI

> Removing 2 folder content implementations and merging unscrollable
content into FolderPagedView
> Disaling folder sorting
> Fixing pageIndicator height

Change-Id: I36e35e311eaf99b6c69d450c0765bd41b2d68738
---
 res/layout/user_folder.xml | 52 +++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 19 deletions(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 7a4d5e881..cd3a051ad 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2008 The Android Open Source Project
+     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.
@@ -34,30 +34,44 @@
             android:layout_width="20dp"
             android:layout_height="20dp" />
 
-        <com.android.launcher3.FolderCellLayout
+        <com.android.launcher3.FolderPagedView
             android:id="@+id/folder_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:cacheColorHint="#ff333333"
-            android:hapticFeedbackEnabled="false" />
+            launcher:pageIndicator="@+id/folder_page_indicator" />
     </FrameLayout>
 
-    <com.android.launcher3.FolderEditText
-        android:id="@+id/folder_name"
+    <LinearLayout
+        android:id="@+id/folder_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:fontFamily="sans-serif-condensed"
-        android:gravity="center_horizontal"
-        android:hint="@string/folder_hint_text"
-        android:imeOptions="flagNoExtractUi"
-        android:paddingBottom="@dimen/folder_name_padding"
-        android:paddingTop="@dimen/folder_name_padding"
-        android:singleLine="true"
-        android:textColor="#ff777777"
-        android:textColorHighlight="#ffCCCCCC"
-        android:textColorHint="#ff808080"
-        android:textCursorDrawable="@null"
-        android:textSize="14sp" />
+        android:orientation="vertical" >
+
+        <include
+            android:id="@+id/folder_page_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="12dp"
+            android:layout_gravity="center_horizontal"
+            layout="@layout/page_indicator" />
+
+        <com.android.launcher3.FolderEditText
+            android:id="@+id/folder_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="#00000000"
+            android:fontFamily="sans-serif-condensed"
+            android:gravity="center_horizontal"
+            android:hint="@string/folder_hint_text"
+            android:imeOptions="flagNoExtractUi"
+            android:paddingBottom="@dimen/folder_name_padding"
+            android:paddingTop="@dimen/folder_name_padding"
+            android:singleLine="true"
+            android:textColor="#ff777777"
+            android:textColorHighlight="#ffCCCCCC"
+            android:textColorHint="#ff808080"
+            android:textCursorDrawable="@null"
+            android:textSize="14sp" />
+    </LinearLayout>
 
 </com.android.launcher3.Folder>
\ No newline at end of file
-- 
cgit v1.2.3


From 75deaf3d8f369bd13ea59ec3740324a5cfeb3099 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 7 May 2015 16:13:12 -0700
Subject: Using xml-drawable and elevation as folder background

Change-Id: I21376bd3de8cd58c646d0898d5a8303af9057218
---
 res/layout/user_folder.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index cd3a051ad..5bacc9605 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -19,7 +19,7 @@
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/quantum_panel"
+    android:elevation="5dp"
     android:orientation="vertical" >
 
     <FrameLayout
-- 
cgit v1.2.3


From b7e15adc7b67cb1d70ca72014b200dd6cbbf166a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 7 May 2015 14:51:31 -0700
Subject: Animating the folder title & page indicator when a multi-page folder
 is opened for the first time

Change-Id: I70f5fd942724251a5e863fbb78a0c24f440b0283
---
 res/layout/user_folder.xml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index cd3a051ad..099da32e6 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -45,20 +45,16 @@
         android:id="@+id/folder_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
-
-        <include
-            android:id="@+id/folder_page_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="12dp"
-            android:layout_gravity="center_horizontal"
-            layout="@layout/page_indicator" />
+        android:orientation="horizontal"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp" >
 
         <com.android.launcher3.FolderEditText
             android:id="@+id/folder_name"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:layout_weight="1"
             android:background="#00000000"
             android:fontFamily="sans-serif-condensed"
             android:gravity="center_horizontal"
@@ -72,6 +68,13 @@
             android:textColorHint="#ff808080"
             android:textCursorDrawable="@null"
             android:textSize="14sp" />
+
+        <include
+            android:id="@+id/folder_page_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="12dp"
+            android:layout_gravity="center_vertical"
+            layout="@layout/page_indicator" />
     </LinearLayout>
 
 </com.android.launcher3.Folder>
\ No newline at end of file
-- 
cgit v1.2.3


From 22fc63ee298335b5f5c603ea1b77dc0e6180b16a Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 13 May 2015 16:01:07 -0700
Subject: Adding padding to the folder content

Change-Id: I88e56ff1aa26282e0167e2599f1b34ee374b705f
---
 res/layout/user_folder.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index ab349179c..ac5a88ce1 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -38,6 +38,9 @@
             android:id="@+id/folder_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
+            android:paddingTop="4dp"
             launcher:pageIndicator="@+id/folder_page_indicator" />
     </FrameLayout>
 
-- 
cgit v1.2.3


From 5a92b2356f1c5f79207c4e9bd47d7b0b5bcf6f78 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 13 May 2015 13:06:11 -0700
Subject: Reodering some drawables

  > quantum_panel_shape is xml rectangle with no margin
  > quantum_panel_bitmap is 9-patch drawable with inbuild shadow and margin
  > quantum_panel uses xml-shape for lollipop and 9-patch image for lower
    devices. It includes margin. For shadow, use elevation on lollipop
  > All drawables have _dark variant
  > Using #f5f5f5 for panel background, instead of #ffffff

Change-Id: Ia7c6cea6d514ee3774fcf5fef6139650bdd53208
---
 res/layout/user_folder.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index ab349179c..d75d6cd3b 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -14,11 +14,11 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="@drawable/quantum_panel"
     android:elevation="5dp"
     android:orientation="vertical" >
 
-- 
cgit v1.2.3


From a07c2f5c80908e8a612f4681314a7068b92baa9f Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 1 Jun 2015 11:00:38 -0700
Subject: Folder UI fixes

> Fixing top padding (b/21304523)
> Alinging the label and page indicators to the icons
> Fixing folder label alingment in RTL (b/21445821)
> Updating footer animation (b/21336853)

Bug: 21304523, 21445821, 21336853
Change-Id: I2cf3a48c76653b19437b31252d6ee559ce798094
---
 res/layout/user_folder.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'res/layout/user_folder.xml')

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 67b69cabf..ecf7def48 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -40,7 +40,7 @@
             android:layout_height="match_parent"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
-            android:paddingTop="4dp"
+            android:paddingTop="8dp"
             launcher:pageIndicator="@+id/folder_page_indicator" />
     </FrameLayout>
 
@@ -48,6 +48,7 @@
         android:id="@+id/folder_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clipChildren="false"
         android:orientation="horizontal"
         android:paddingLeft="8dp"
         android:paddingRight="8dp" >
@@ -63,8 +64,8 @@
             android:gravity="center_horizontal"
             android:hint="@string/folder_hint_text"
             android:imeOptions="flagNoExtractUi"
-            android:paddingBottom="@dimen/folder_name_padding"
-            android:paddingTop="@dimen/folder_name_padding"
+            android:paddingBottom="8dp"
+            android:paddingTop="4dp"
             android:singleLine="true"
             android:textColor="#ff777777"
             android:textColorHighlight="#ffCCCCCC"
@@ -78,6 +79,7 @@
             android:layout_height="12dp"
             android:layout_gravity="center_vertical"
             layout="@layout/page_indicator" />
+
     </LinearLayout>
 
 </com.android.launcher3.Folder>
\ No newline at end of file
-- 
cgit v1.2.3