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

Commit 5f1a837a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add work/personal profile tab for storage page"

parents 8ec3dbe1 539ab8ac

res/layout/profile_select_tablayout.xml

+17 −11
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <androidx.viewpager.widget.ViewPager

        android:id="@+id/view_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <com.google.android.material.tabs.TabLayout

        android:background="@android:color/transparent"

        android:id="@+id/tabs"
@@ -35,8 +30,19 @@ 
        app:tabMaxWidth="0dp"

        app:tabGravity="fill"

        app:tabMode="fixed"

        app:tabIndicatorFullWidth="false"

        app:tabIndicatorColor="@*android:color/accent_device_default"

        app:tabSelectedTextColor="@*android:color/accent_device_default"

        app:tabTextColor="?android:attr/textColorSecondary" />

    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

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



    <androidx.viewpager.widget.ViewPager

        android:id="@+id/view_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    </androidx.viewpager.widget.ViewPager>

</LinearLayout>

src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java

+4 −3
Original line number Diff line number Diff line
@@ -19,9 +19,8 @@ package com.android.settings.dashboard.profileselector; 
import android.util.ArrayMap;



import com.android.settings.accounts.AccountDashboardFragment;

import com.android.settings.accounts.AccountProfileSelectFragment;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.applications.manageapplications.ProfileSelectManageApplications;

import com.android.settings.deviceinfo.StorageDashboardFragment;



import java.util.Map;
@@ -39,8 +38,10 @@ public class ProfileFragmentBridge { 
    static {

        FRAGMENT_MAP = new ArrayMap<>();

        FRAGMENT_MAP.put(AccountDashboardFragment.class.getName(),

                AccountProfileSelectFragment.class.getName());

                ProfileSelectAccountFragment.class.getName());

        FRAGMENT_MAP.put(ManageApplications.class.getName(),

                ProfileSelectManageApplications.class.getName());

        FRAGMENT_MAP.put(StorageDashboardFragment.class.getName(),

                ProfileSelectStorageFragment.class.getName());

    }

}

src/com/android/settings/accounts/AccountProfileSelectFragment.java→src/com/android/settings/dashboard/profileselector/ProfileSelectAccountFragment.java

+4 −3
Original line number Diff line number Diff line
@@ -14,15 +14,16 @@ 
 * limitations under the License.

 */



package com.android.settings.accounts;

package com.android.settings.dashboard.profileselector;

import androidx.fragment.app.Fragment;



import com.android.settings.dashboard.profileselector.ProfileSelectFragment;

import com.android.settings.accounts.AccountPersonalDashboardFragment;

import com.android.settings.accounts.AccountWorkProfileDashboardFragment;



/**

 * Account Setting page for personal/managed profile.

 */

public class AccountProfileSelectFragment extends ProfileSelectFragment {

public class ProfileSelectAccountFragment extends ProfileSelectFragment {



    @Override

    public Fragment[] getFragments() {

src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import androidx.viewpager.widget.ViewPager; 
import com.android.settings.R;

import com.android.settings.core.InstrumentedFragment;



import com.google.android.material.tabs.TabLayout;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -69,6 +71,8 @@ public abstract class ProfileSelectFragment extends InstrumentedFragment { 
        mContentView = inflater.inflate(R.layout.profile_select_tablayout, null /* root */);

        final ViewPager viewPager = mContentView.findViewById(R.id.view_pager);

        viewPager.setAdapter(new ViewPagerAdapter(this));

        final TabLayout tabs = mContentView.findViewById(R.id.tabs);

        tabs.setupWithViewPager(viewPager);

        return mContentView;

    }

src/com/android/settings/applications/manageapplications/ProfileSelectManageApplications.java→src/com/android/settings/dashboard/profileselector/ProfileSelectManageApplications.java

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.applications.manageapplications;

package com.android.settings.dashboard.profileselector;



import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_PERSONAL_ONLY;

import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY;
@@ -23,10 +23,10 @@ import android.os.Bundle; 


import androidx.fragment.app.Fragment;



import com.android.settings.dashboard.profileselector.ProfileSelectFragment;

import com.android.settings.applications.manageapplications.ManageApplications;



/**

 * Application Setting page for work profile.

 * Application Setting page for personal/managed profile.

 */

public class ProfileSelectManageApplications extends ProfileSelectFragment {