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

Commit e75d30d8 authored by Saeid Farivar Asanjan's avatar Saeid Farivar Asanjan Committed by Android (Google) Code Review
Browse files

Merge "Updating PermissionController/packageinstaller to use baselayouts" into rvc-dev

parents e511d9f5 70bbaf8f

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
           parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar">

    </style>



    <style name="CarSettings" parent="Theme.CarUi">

    <style name="CarSettings" parent="Theme.CarUi.WithToolbar">

        <item name="carDividerColor">@*android:color/car_list_divider</item>

    </style>

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

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.permissioncontroller.auto;



import static com.android.car.ui.core.CarUi.getToolbar;



import android.os.Bundle;

import android.text.TextUtils;

import android.view.LayoutInflater;
@@ -28,7 +30,6 @@ import androidx.annotation.Nullable; 
import com.android.car.ui.preference.PreferenceFragment;

import com.android.car.ui.toolbar.MenuItem;

import com.android.car.ui.toolbar.ToolbarController;

import com.android.permissioncontroller.R;



import java.util.Collections;
@@ -47,7 +48,7 @@ public abstract class AutoSettingsFrameFragment extends PreferenceFragment { 
            @Nullable Bundle savedInstanceState) {

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



        mToolbar = rootView.findViewById(R.id.toolbar);

        mToolbar = getToolbar(requireActivity());



        updateHeaderLabel();

        updateLoading();