Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bfa4d46 authored by Tony Mak's avatar Tony Mak
Browse files

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
parent 2cdaf57f

res/layout/work_tab_footer.xml

+15 −4
Original line number Diff line number Diff line
@@ -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

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

+0 −4
Original line number Diff line number Diff line
@@ -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) {

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

+2 −0
Original line number Diff line number Diff line
@@ -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);

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

+0 −1
Original line number Diff line number Diff line
@@ -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++));

        }

    }