From 2cdaf57f101f54f80ea7d9e75845719a6cb0e0e3 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 14 Dec 2017 09:12:14 -0800
Subject: [PATCH 1/2] Make work footer stick to the bottom if there are only a
 few apps

Bug: 70571983
Change-Id: I60ef59de0cfcbc8df24b270d0b6d2f6439ccad44
---
 res/layout/work_tab_footer.xml                | 103 +++++++++---------
 .../views/WorkModeToggleContainer.java        |  59 ++++++++++
 2 files changed, 109 insertions(+), 53 deletions(-)
 create mode 100644 src/com/android/launcher3/views/WorkModeToggleContainer.java

diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml
index 48578d799a..64c95e3fc3 100644
--- a/res/layout/work_tab_footer.xml
+++ b/res/layout/work_tab_footer.xml
@@ -13,60 +13,57 @@
      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="wrap_content"
-      android:orientation="vertical"
-      android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_bottom_padding"
-      android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
-      android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
-      android:paddingTop="@dimen/all_apps_work_profile_tab_footer_top_padding">
+<com.android.launcher3.views.WorkModeToggleContainer
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_bottom_padding"
+    android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
+    android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
+    android:paddingTop="@dimen/all_apps_work_profile_tab_footer_top_padding">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <Switch
-            android:id="@+id/work_mode_toggle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:theme="@style/WorkModeSwitchTheme"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@id/work_mode_toggle"
-            android:layout_alignParentLeft="true"
-            android:ellipsize="end"
-            android:fontFamily="roboto-regular"
-            android:lines="1"
-            android:text="@string/work_profile_toggle_label"
-            android:textColor="?android:attr/textColorTertiary"
-            android:textSize="16sp"/>
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
+    <Switch
+        android:id="@+id/work_mode_toggle"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="8dp">
+        android:layout_alignParentEnd="true"
+        android:theme="@style/WorkModeSwitchTheme"/>
 
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:src="@drawable/ic_corp"/>
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@id/work_mode_toggle"
+        android:layout_alignParentStart="true"
+        android:ellipsize="end"
+        android:fontFamily="roboto-regular"
+        android:lines="1"
+        android:text="@string/work_profile_toggle_label"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="16sp"/>
 
-        <TextView
-            android:id="@+id/managed_by_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:ellipsize="end"
-            android:lines="1"
-            android:paddingLeft="12dp"
-            android:textColor="?android:attr/textColorHint"
-            android:textSize="13sp"/>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_below="@android:id/title"
+        android:layout_marginTop="8dp"
+        android:src="@drawable/ic_corp"/>
+
+
+    <TextView
+        android:id="@+id/managed_by_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@android:id/title"
+        android:layout_marginTop="8dp"
+        android:layout_toEndOf="@android:id/icon"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:lines="1"
+        android:minHeight="24dp"
+        android:paddingStart="12dp"
+        android:textColor="?android:attr/textColorHint"
+        android:textSize="13sp"/>
+
+</com.android.launcher3.views.WorkModeToggleContainer>
\ No newline at end of file
diff --git a/src/com/android/launcher3/views/WorkModeToggleContainer.java b/src/com/android/launcher3/views/WorkModeToggleContainer.java
new file mode 100644
index 0000000000..c1b5ddd256
--- /dev/null
+++ b/src/com/android/launcher3/views/WorkModeToggleContainer.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2017 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.
+ */
+package com.android.launcher3.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+/**
+ * Container to show work mode toggle in all-apps
+ */
+public class WorkModeToggleContainer extends RelativeLayout {
+
+    public WorkModeToggleContainer(Context context) {
+        super(context);
+    }
+
+    public WorkModeToggleContainer(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WorkModeToggleContainer(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        updateTranslation();
+    }
+
+    @Override
+    public void offsetTopAndBottom(int offset) {
+        super.offsetTopAndBottom(offset);
+        updateTranslation();
+    }
+
+    private void updateTranslation() {
+        if (getParent() instanceof View) {
+            View parent = (View) getParent();
+            int availableBot = parent.getHeight() - parent.getPaddingBottom();
+            setTranslationY(Math.max(0, availableBot - getBottom()));
+        }
+    }
+}

From 2bfa4d469a271c9e43a9e4c55a8da3c0a203acb8 Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Fri, 15 Dec 2017 11:38:11 +0000
Subject: [PATCH 2/2] Make work footer stick to the bottom if there are only a
 few apps #2

1. Move the work footer divider into the container, so it is translated
   with the rest of the footer.

2. Fixed the scrollbar issue in work tab by putting the footer height
   in AllAppsRecyclerView

3. We planned to drop the company name, and decided to use
   "Managed by your organisation".

4. Rename WorkModeToggleContainer to WorkFooterContainer as
   we are using work footer in else where.

BUG: 70571983
Change-Id: I218fe7d9970780a1a457ee450f1a32e7a46d9766
---
 res/layout/work_tab_footer.xml                | 19 +++++++++++++++----
 res/values/strings.xml                        |  2 ++
 .../launcher3/allapps/AllAppsGridAdapter.java |  4 ----
 .../allapps/AllAppsRecyclerView.java          |  2 ++
 .../allapps/AlphabeticalAppsList.java         |  1 -
 ...ontainer.java => WorkFooterContainer.java} | 10 +++++-----
 6 files changed, 24 insertions(+), 14 deletions(-)
 rename src/com/android/launcher3/views/{WorkModeToggleContainer.java => WorkFooterContainer.java} (82%)

diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml
index 64c95e3fc3..2606b87a10 100644
--- a/res/layout/work_tab_footer.xml
+++ b/res/layout/work_tab_footer.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher3.views.WorkModeToggleContainer
+<com.android.launcher3.views.WorkFooterContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -22,11 +22,23 @@
     android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
     android:paddingTop="@dimen/all_apps_work_profile_tab_footer_top_padding">
 
+    <ImageView
+        android:id="@+id/work_footer_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="false"
+        android:importantForAccessibility="no"
+        android:paddingBottom="@dimen/all_apps_divider_margin_vertical"
+        android:paddingTop="@dimen/all_apps_divider_margin_vertical"
+        android:scaleType="fitXY"
+        android:src="@drawable/all_apps_divider"/>
+
     <Switch
         android:id="@+id/work_mode_toggle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
+        android:layout_below="@id/work_footer_divider"
         android:theme="@style/WorkModeSwitchTheme"/>
 
     <TextView
@@ -36,7 +48,6 @@
         android:layout_alignBaseline="@id/work_mode_toggle"
         android:layout_alignParentStart="true"
         android:ellipsize="end"
-        android:fontFamily="roboto-regular"
         android:lines="1"
         android:text="@string/work_profile_toggle_label"
         android:textColor="?android:attr/textColorTertiary"
@@ -50,7 +61,6 @@
         android:layout_marginTop="8dp"
         android:src="@drawable/ic_corp"/>
 
-
     <TextView
         android:id="@+id/managed_by_label"
         android:layout_width="wrap_content"
@@ -63,7 +73,8 @@
         android:lines="1"
         android:minHeight="24dp"
         android:paddingStart="12dp"
+        android:text="@string/managed_by_your_organisation"
         android:textColor="?android:attr/textColorHint"
         android:textSize="13sp"/>
 
-</com.android.launcher3.views.WorkModeToggleContainer>
\ No newline at end of file
+</com.android.launcher3.views.WorkFooterContainer>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eca64c852b..d77065c11f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -330,5 +330,7 @@
     <string name="bottom_work_tab_user_education_title">Find work apps here</string>
     <!-- Body text in bottom user education view in work tab -->
     <string name="bottom_work_tab_user_education_body">Each work app has an orange badge, which means it\'s kept secure by your organization. Work apps can be moved to your Home Screen for easier access.</string>
+    <!-- Label in work tab to tell users that work profile is managed by their organisation. -->
+    <string name="managed_by_your_organisation">Managed by your organisation</string>
 
 </resources>
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index da4d9f0cc2..246f7be10e 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -381,10 +381,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.
             case VIEW_TYPE_WORK_TAB_FOOTER:
                 Switch workModeToggle = holder.itemView.findViewById(R.id.work_mode_toggle);
                 workModeToggle.setChecked(!isAnyProfileQuietModeEnabled());
-
-                TextView textView = holder.itemView.findViewById(R.id.managed_by_label);
-                // TODO: Configure the textview properly.
-                textView.setText("Managed by your company");
                 break;
         }
         if (mBindViewCallback != null) {
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index fd80784632..4f931cadad 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -168,6 +168,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView implements LogContaine
                 AllAppsGridAdapter.VIEW_TYPE_SEARCH_MARKET);
         putSameHeightFor(adapter, widthMeasureSpec, heightMeasureSpec,
                 AllAppsGridAdapter.VIEW_TYPE_EMPTY_SEARCH);
+        putSameHeightFor(adapter, widthMeasureSpec, heightMeasureSpec,
+                AllAppsGridAdapter.VIEW_TYPE_WORK_TAB_FOOTER);
         if (FeatureFlags.DISCOVERY_ENABLED) {
             putSameHeightFor(adapter, widthMeasureSpec, heightMeasureSpec,
                     AllAppsGridAdapter.VIEW_TYPE_APPS_LOADING_DIVIDER);
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 2b9cba3023..02e731a893 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -621,7 +621,6 @@ public class AlphabeticalAppsList {
 
         // Add the work profile footer if required.
         if (mIsWork) {
-            mAdapterItems.add(AdapterItem.asAllAppsDivider(position++));
             mAdapterItems.add(AdapterItem.asWorkTabFooter(position++));
         }
     }
diff --git a/src/com/android/launcher3/views/WorkModeToggleContainer.java b/src/com/android/launcher3/views/WorkFooterContainer.java
similarity index 82%
rename from src/com/android/launcher3/views/WorkModeToggleContainer.java
rename to src/com/android/launcher3/views/WorkFooterContainer.java
index c1b5ddd256..fb17b4fff1 100644
--- a/src/com/android/launcher3/views/WorkModeToggleContainer.java
+++ b/src/com/android/launcher3/views/WorkFooterContainer.java
@@ -21,19 +21,19 @@ import android.view.View;
 import android.widget.RelativeLayout;
 
 /**
- * Container to show work mode toggle in all-apps
+ * Container to show work footer in all-apps.
  */
-public class WorkModeToggleContainer extends RelativeLayout {
+public class WorkFooterContainer extends RelativeLayout {
 
-    public WorkModeToggleContainer(Context context) {
+    public WorkFooterContainer(Context context) {
         super(context);
     }
 
-    public WorkModeToggleContainer(Context context, AttributeSet attrs) {
+    public WorkFooterContainer(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public WorkModeToggleContainer(Context context, AttributeSet attrs, int defStyleAttr) {
+    public WorkFooterContainer(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }