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

Commit 1a028cdd authored by Heemin Seog's avatar Heemin Seog
Browse files

New permissions page for app specific permissions 

This does not handle All permissions quite yet. This will be handled in
a separate CL.

This change by itself also affects the full permissions page, so it will
not be submitted until other permissions CLs are approved.

This CL also tries to unify the base frame for car related settings
permission controller. Will need to do a separate cleanup CL for default
applications.

Bug: 122822231
Test: manual
Change-Id: Idf946d4ce0b299e6b3a4b3b094d475a708bdfd13
parent bb0d5d0c

res/layout/car_default_app_frame.xml→res/layout/car_settings_frame.xml

+90 −0
Original line number Diff line number Diff line
@@ -17,39 +17,74 @@ 


<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    <LinearLayout



    <androidx.constraintlayout.widget.ConstraintLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/car_action_bar_height"

        android:gravity="center_vertical"

        android:orientation="horizontal">

        android:layout_height="@*android:dimen/car_app_bar_height">



        <FrameLayout

            android:id="@+id/back_button"

            android:layout_width="@dimen/car_margin"

            android:layout_height="match_parent">

            android:layout_width="0dp"

            android:layout_height="0dp"

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

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toStartOf="@+id/start_margin"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent">

            <ImageView

                android:layout_width="@dimen/car_icon_size"

                android:layout_height="@dimen/car_icon_size"

                android:layout_width="@*android:dimen/car_primary_icon_size"

                android:layout_height="@*android:dimen/car_primary_icon_size"

                android:layout_gravity="center"

                android:scaleType="fitCenter"

                android:src="@drawable/ic_arrow_back"

                android:tint="?android:attr/textColorPrimary"/>

        </FrameLayout>



        <androidx.constraintlayout.widget.Guideline

            android:id="@+id/start_margin"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            app:layout_constraintGuide_begin="@*android:dimen/action_bar_margin_start"/>



        <TextView

            android:id="@+id/label"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceLarge"/>

    </LinearLayout>

            android:textAppearance="?android:attr/textAppearanceLarge"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintStart_toEndOf="@+id/start_margin"

            app:layout_constraintTop_toTopOf="parent"/>



        <Button

            android:id="@+id/action"

            style="@*android:style/ActionBarButton"

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            android:layout_marginEnd="@*android:dimen/action_bar_button_margin"

            android:visibility="gone"

            app:layout_constraintBottom_toBottomOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="parent"/>

    </androidx.constraintlayout.widget.ConstraintLayout>



    <ProgressBar

        android:id="@+id/progress_bar"

        style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:indeterminate="true"

        android:visibility="gone"/>



    <FrameLayout

        android:id="@android:id/list_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingEnd="@dimen/car_margin"

        android:paddingStart="@dimen/car_margin"/>

        android:paddingEnd="@*android:dimen/car_margin"

        android:paddingStart="@*android:dimen/car_margin"/>

</LinearLayout>

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ 
    <!-- START CAR SETTINGS PREFERENCE STYLES -->



    <style name="CarPreferenceFragment">

        <item name="android:layout">@layout/car_default_app_frame</item>

        <item name="android:layout">@layout/car_settings_frame</item>

    </style>



    <style name="CarPreferenceFragmentList">

src/com/android/packageinstaller/auto/AutoSettingsFrameFragment.java

0 → 100644
+121 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 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.packageinstaller.auto;



import android.os.Bundle;

import android.text.TextUtils;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.ProgressBar;

import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.preference.PreferenceFragmentCompat;



import com.android.permissioncontroller.R;



/** Common settings frame for car related settings in permission controller. */

public abstract class AutoSettingsFrameFragment extends PreferenceFragmentCompat {



    private TextView mLabelView;

    private ProgressBar mProgressBar;

    private Button mAction;



    private CharSequence mLabel;

    private boolean mIsLoading;

    private CharSequence mActionLabel;

    private View.OnClickListener mActionOnClickListener;



    @Override

    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,

            @Nullable Bundle savedInstanceState) {

        View rootView = super.onCreateView(inflater, container, savedInstanceState);



        View backButton = rootView.findViewById(R.id.back_button);

        backButton.setOnClickListener(v -> getActivity().onBackPressed());



        mLabelView = rootView.findViewById(R.id.label);

        updateHeaderLabel();



        mProgressBar = rootView.findViewById(R.id.progress_bar);

        updateLoading();



        mAction = rootView.findViewById(R.id.action);

        updateAction();



        return rootView;

    }



    /** Sets the header text of this fragment. */

    public void setHeaderLabel(CharSequence label) {

        mLabel = label;

        updateHeaderLabel();

    }



    /** Gets the header text of this fragment. */

    public CharSequence getHeaderLabel() {

        return mLabel;

    }



    private void updateHeaderLabel() {

        if (mLabelView != null) {

            mLabelView.setText(mLabel);

        }

    }



    /**

     * Shows a progress view while content is loading.

     *

     * @param isLoading {@code true} if the progress view should be visible.

     */

    public void setLoading(boolean isLoading) {

        mIsLoading = isLoading;

        updateLoading();

    }



    private void updateLoading() {

        if (mProgressBar != null) {

            mProgressBar.setVisibility(mIsLoading ? View.VISIBLE : View.GONE);

        }

    }



    /**

     * Shows a button with the given {@code label} that when clicked will call the given {@code

     * onClickListener}.

     */

    public void setAction(CharSequence label, View.OnClickListener onClickListener) {

        mActionLabel = label;

        mActionOnClickListener = onClickListener;

        updateAction();

    }



    private void updateAction() {

        if (mAction == null) {

            return;

        }

        if (!TextUtils.isEmpty(mActionLabel) && mActionOnClickListener != null) {

            mAction.setText(mActionLabel);

            mAction.setOnClickListener(mActionOnClickListener);

            mAction.setVisibility(View.VISIBLE);

        } else {

            mAction.setVisibility(View.GONE);

        }

    }

}

src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java

+24 −8
Original line number Diff line number Diff line
@@ -28,10 +28,12 @@ import androidx.fragment.app.Fragment; 
import androidx.fragment.app.FragmentActivity;



import com.android.packageinstaller.DeviceUtils;

import com.android.packageinstaller.permission.ui.auto.AutoAppPermissionsFragment;

import com.android.packageinstaller.permission.ui.handheld.ManageStandardPermissionsFragment;

import com.android.packageinstaller.permission.ui.handheld.PermissionUsageFragment;

import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;

import com.android.packageinstaller.permission.utils.Utils;

import com.android.permissioncontroller.R;



public final class ManagePermissionsActivity extends FragmentActivity {

    private static final String LOG_TAG = ManagePermissionsActivity.class.getSimpleName();
@@ -41,6 +43,11 @@ public final class ManagePermissionsActivity extends FragmentActivity { 


    @Override

    public void onCreate(Bundle savedInstanceState) {

        if (DeviceUtils.isAuto(this)) {

            // Automotive relies on a different theme. Apply before calling super so that

            // fragments are restored properly on configuration changes.

            setTheme(R.style.CarSettings);

        }

        super.onCreate(savedInstanceState);



        // If there is a previous instance, re-use its Fragment instead of making a new one.
@@ -103,21 +110,30 @@ public final class ManagePermissionsActivity extends FragmentActivity { 
                    finish();

                    return;

                }



                final boolean allPermissions = getIntent().getBooleanExtra(

                        EXTRA_ALL_PERMISSIONS, false);



                UserHandle userHandle = getIntent().getParcelableExtra(Intent.EXTRA_USER);

                if (userHandle == null) {

                    userHandle = UserHandle.of(UserHandle.myUserId());

                }



                if (DeviceUtils.isAuto(this)) {

                    fragment = com.android.packageinstaller.permission.ui.auto

                            .AppPermissionsFragment.newInstance(packageName);

                    if (allPermissions) {

                        // TODO: Replace this with a car version.

                        androidXFragment = com.android.packageinstaller.permission.ui.handheld

                                .AllAppPermissionsFragment.newInstance(packageName, userHandle);

                    } else {

                        androidXFragment = AutoAppPermissionsFragment.newInstance(packageName,

                                userHandle);

                    }

                } else if (DeviceUtils.isWear(this)) {

                    androidXFragment = AppPermissionsFragmentWear.newInstance(packageName);

                } else if (DeviceUtils.isTelevision(this)) {

                    fragment = com.android.packageinstaller.permission.ui.television

                            .AppPermissionsFragment.newInstance(packageName);

                } else {

                    final boolean allPermissions = getIntent().getBooleanExtra(

                            EXTRA_ALL_PERMISSIONS, false);

                    UserHandle userHandle = getIntent().getParcelableExtra(Intent.EXTRA_USER);

                    if (userHandle == null) {

                        userHandle = UserHandle.of(UserHandle.myUserId());

                    }

                    if (allPermissions) {

                        androidXFragment = com.android.packageinstaller.permission.ui.handheld

                                .AllAppPermissionsFragment.newInstance(packageName, userHandle);

src/com/android/packageinstaller/permission/ui/auto/AutoAppPermissionsFragment.java

0 → 100644
+388 −0

File added.

Preview size limit exceeded, changes collapsed.