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

Commit ac9408a5 authored by Mario Bertschler's avatar Mario Bertschler
Browse files

Enable work profile tab in all apps. 

This CL will bring two tabs to all apps: Personal and Work,
currently only if the user has a workfile set up and
behind a feature flag defaulting to disabled.

Bug: 68713881

Change-Id: Ib5a558281ef3593359db3ad593ee1d0cf279f547
parent f405f507

res/layout/all_apps.xml

+40 −13
Original line number Diff line number Diff line
@@ -27,17 +27,46 @@ 
    android:focusableInTouchMode="true"

    android:saveEnabled="false" >



    <!-- DO NOT CHANGE THE ID -->

    <com.android.launcher3.allapps.AllAppsRecyclerView

        android:id="@+id/apps_list_view"

    <include layout="@layout/all_apps_rv_layout" />



    <include layout="@layout/all_apps_fast_scroller" />



    <RelativeLayout

        android:id="@+id/all_apps_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clickable="true"

        android:paddingTop="30dp"

        android:layout_below="@id/search_container_all_apps" >



        <com.android.launcher3.allapps.PredictionRowView

            android:id="@+id/header_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <LinearLayout

            android:id="@+id/tab_layout"

            android:layout_width="match_parent"

            android:layout_height="@dimen/all_apps_header_tab_height"

            android:layout_below="@id/header_content"

            android:orientation="horizontal">

            <Button

                android:id="@+id/tab_personal"

                android:layout_width="0dp"

                android:layout_height="match_parent"

        android:layout_below="@id/search_container_all_apps"

        android:layout_gravity="center_horizontal|top"

        android:clipToPadding="false"

        android:descendantFocusability="afterDescendants"

        android:focusable="true"

        android:overScrollMode="never" />

                android:layout_weight="1"

                android:text="@string/all_apps_personal_tab"

                android:background="?android:attr/selectableItemBackground"/>

            <Button

                android:id="@+id/tab_work"

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:text="@string/all_apps_work_tab"

                android:background="?android:attr/selectableItemBackground"/>

        </LinearLayout>



    </RelativeLayout>



    <!-- Note: we are reusing/repurposing a system attribute for search layout, because of a

     platform bug, which prevents using custom attributes in <include> tag -->
@@ -45,8 +74,6 @@ 
        android:id="@id/search_container_all_apps"

        layout="?android:attr/keyboardLayout"/>



    <include layout="@layout/all_apps_fast_scroller" />



    <View

        android:id="@+id/nav_bar_bg"

        android:layout_width="match_parent"

res/layout/all_apps_rv_layout.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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.

  -->

<com.android.launcher3.allapps.AllAppsRecyclerView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/apps_list_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_below="@id/search_container_all_apps"

    android:clipToPadding="false"

    android:descendantFocusability="afterDescendants"

    android:focusable="true"

    android:overScrollMode="never" />

res/layout/all_apps_tabs.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ 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.

  -->

<com.android.launcher3.allapps.InterceptingViewPager

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/all_apps_tabs_view_pager"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_below="@id/search_container_all_apps"

    android:layout_gravity="center_horizontal|top"

    android:layout_marginTop="@dimen/all_apps_header_tab_height"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:descendantFocusability="afterDescendants"

    android:paddingTop="30dp">



    <include layout="@layout/all_apps_rv_layout" />



    <include layout="@layout/all_apps_rv_layout" />



</com.android.launcher3.allapps.InterceptingViewPager>
 
 No newline at end of file

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
    <dimen name="all_apps_background_canvas_width">700dp</dimen>

    <dimen name="all_apps_background_canvas_height">475dp</dimen>

    <dimen name="all_apps_caret_workspace_offset">18dp</dimen>

    <dimen name="all_apps_header_tab_height">50dp</dimen>



<!-- Search bar in All Apps -->

    <dimen name="all_apps_header_max_elevation">3dp</dimen>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -318,4 +318,10 @@ 
    <!-- Accessibility confirmation for notification being dismissed. -->

    <string name="notification_dismissed">Notification dismissed</string>



    <!-- Label of tab to indicate personal apps -->

    <string name="all_apps_personal_tab">Personal</string>



    <!-- Label of tab to indicate work apps -->

    <string name="all_apps_work_tab">Work</string>



</resources>