Trebuchet: Remote Folder UX & early badge code

 Patch 8: Fixed manifest & makefile config
 9: Updated caching for RemoteFolder info
 12: FolderIcon updates for RemoteFolder
 13: RemoteFolder UX and minor code fixes
 15: UX and rebase on metrics code
 19: Fix content clicks and clean up
 20: Wi-Fi check added

Issue-Id: :CYNGNOS-1332
Change-Id: I3b86ed71b95da69488a4eee6c7c4b5fae4411388

2 files changed, 11 insertions, 116 deletions

diff --git a/res/layout/remote_folder.xml b/res/layout/remote_folder.xml
index ffbcb645c..49d47292d 100644
--- a/res/layout/remote_folder.xml
+++ b/res/layout/remote_folder.xml
@@ -1,112 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <!-- Copyright (C) 2008 The Android Open Source Project
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-         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.RemoteFolder
-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:paddingTop="16dp"
-android:paddingStart="@dimen/folder_preview_padding"
-android:paddingEnd="@dimen/folder_preview_padding"
-android:paddingBottom="@dimen/folder_preview_padding"
-android:layout_gravity="center"
-android:background="@drawable/folder_bg">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/folder_info_container"
-        android:background="@android:color/holo_green_dark">
-
-        <!-- TODO replace background with android:background="@android:color/transparent" -->
-        <com.android.launcher3.FolderEditText
-            android:id="@+id/folder_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/holo_orange_dark"
-            android:fontFamily="sans-serif-condensed"
-            android:hint="@string/folder_hint_text"
-            android:imeOptions="flagNoExtractUi"
-            android:paddingBottom="@dimen/folder_name_padding"
-            android:paddingTop="@dimen/folder_name_padding"
-            android:layout_marginStart="@dimen/folder_name_padding"
-            android:layout_marginEnd="@dimen/folder_name_padding"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textColor="@color/workspace_icon_text_color"
-            android:textColorHighlight="#ffCCCCCC"
-            android:textColorHint="#78ffffff"
-            android:textCursorDrawable="@null"
-            android:textSize="18sp"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"/>
-
-
-        <ImageView
-            android:id="@+id/folder_info"
-            android:layout_width="@dimen/folder_lock_icon"
-            android:layout_height="@dimen/folder_lock_icon"
-            android:padding="@dimen/folder_name_padding"
-            android:src="@drawable/ic_launcher_info_normal_holo"
-            android:layout_alignTop="@id/folder_name"
-            android:layout_alignParentRight="true"/>
-
-        <TextView
-            android:id="@+id/help_text_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/folder_name_padding"
-            android:layout_marginEnd="@dimen/folder_name_padding"
-            android:text="@string/recommendations_help_text"
-            android:fontFamily="sans-serif-condensed"
-            android:textSize="18sp"
-            android:textColor="@color/workspace_icon_text_color"
-            android:textColorHighlight="#ffCCCCCC"
-            android:textColorHint="#78ffffff"
-            android:layout_below="@id/folder_info"
-            android:background="@android:color/holo_purple"
-            />
-
-        <Button
-            android:id="@+id/close_info_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/folder_lock_icon"
-            android:text="@string/close"
-            android:layout_below="@id/help_text_view"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            />
-
-    </RelativeLayout>
-
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:background="@android:color/holo_red_dark">
-
-        <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"
-            android:background="@android:color/holo_blue_bright"/>
-    </ScrollView>
-</com.android.launcher3.RemoteFolder>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index d1a7536a3..dc597de91 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -23,12 +23,17 @@
     android:paddingStart="@dimen/folder_preview_padding"
     android:paddingEnd="@dimen/folder_preview_padding"
     android:paddingBottom="@dimen/folder_preview_padding"
-    android:layout_gravity="center"
+    android:layout_marginBottom="@dimen/folder_margin"
+    android:layout_gravity="bottom|center_horizontal"
     android:background="@drawable/folder_bg">
 
+    <include layout="@layout/remote_folder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
     <ScrollView
         android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal">
         <com.android.launcher3.CellLayout
@@ -41,7 +46,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:id="@+id/folder_name_lock_container">
 
         <ImageView
@@ -50,7 +55,6 @@
             android:layout_height="@dimen/folder_lock_icon"
             android:padding="@dimen/folder_name_padding"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
             android:src="@drawable/folder_unlocked" />
 
         <com.android.launcher3.FolderEditText
@@ -73,8 +77,7 @@
             android:textSize="18sp"
             android:layout_toStartOf="@id/folder_lock"
             android:layout_alignTop="@id/folder_lock"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"/>
+            android:layout_alignParentStart="true"/>
 
     </RelativeLayout>
 </com.android.launcher3.Folder>