improve car appsPermission view

Fixes: 73127860

Test: deployed to head unit and test
Change-Id: I86744f7901c696bf04201840164206c8895b47b9
(cherry picked from commit 31c9070d270be764b94847df5b89ddc79cbd7be0)

3 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index ffef477b..712b860c 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -23,6 +23,7 @@ import android.util.Log;
 import android.view.MenuItem;
 
 import com.android.packageinstaller.DeviceUtils;
+import com.android.packageinstaller.R;
 import com.android.packageinstaller.permission.ui.handheld.ManageStandardPermissionsFragment;
 import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;
 
@@ -34,15 +35,14 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        if (DeviceUtils.isAuto(this)) {
+            setTheme(R.style.CarSettingTheme);
+        }
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
             return;
         }
-        // in automotive mode, there's no system wide back button, so need to add that
-        if (DeviceUtils.isAuto(this)) {
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
 
         Fragment fragment;
         String action = getIntent().getAction();
diff --git a/src/com/android/packageinstaller/permission/ui/auto/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/auto/AppPermissionsFragment.java
index 35d77243..36ad4691 100644
--- a/src/com/android/packageinstaller/permission/ui/auto/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/auto/AppPermissionsFragment.java
@@ -69,7 +69,7 @@ public final class AppPermissionsFragment extends Fragment{
     public static AppPermissionsFragment newInstance(String packageName) {
         AppPermissionsFragment fragment = new AppPermissionsFragment();
         Bundle arguments = new Bundle();
-        arguments.putInt(EXTRA_LAYOUT, com.android.car.list.R.layout.list);
+        arguments.putInt(EXTRA_LAYOUT, R.layout.car_app_permissions);
         arguments.putString(Intent.EXTRA_PACKAGE_NAME, packageName);
         fragment.setArguments(arguments);
         return fragment;
@@ -78,6 +78,8 @@ public final class AppPermissionsFragment extends Fragment{
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        getView().findViewById(R.id.action_bar_icon_container).setOnClickListener(
+                v -> getActivity().onBackPressed());
 
         mListView = (PagedListView) getView().findViewById(R.id.list);
         mPagedListAdapter = new TypedPagedListAdapter(getLineItems());
diff --git a/src/com/android/packageinstaller/permission/ui/auto/GrantPermissionsAutoViewHandler.java b/src/com/android/packageinstaller/permission/ui/auto/GrantPermissionsAutoViewHandler.java
index a127c10e..9e40d664 100644
--- a/src/com/android/packageinstaller/permission/ui/auto/GrantPermissionsAutoViewHandler.java
+++ b/src/com/android/packageinstaller/permission/ui/auto/GrantPermissionsAutoViewHandler.java
@@ -17,8 +17,8 @@
 package com.android.packageinstaller.permission.ui.auto;
 
 import android.app.Activity;
-import android.content.Context;
 import android.view.WindowManager;
+
 import com.android.packageinstaller.permission.ui.handheld.GrantPermissionsViewHandlerImpl;
 
 /**