commit 274ff296ad580c5829faf0b3f1d1dcbec8f8555a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 20 21:19:13 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 20 21:19:13 2019 +0000
tree 8d6bd6d0f8ee8bc4fd3b9c57265cd05c8658b265
parent 167d10664521e4977085ba30c6db7569d0b34cfd
parent 5f20806b3c37f4d803ee9ebc3706665a36c2a025

Merge "Allow OEMs to show/hide action bar icon of setting's root through config" into pi-car-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 39b7790..a9c6acf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,7 @@
 # (for example, projected). See b/30064991
 ifeq (,$(TARGET_BUILD_APPS))
   LOCAL_PACKAGE_NAME := CarSettings
+  LOCAL_OVERRIDES_PACKAGES := Settings
   LOCAL_PRIVATE_PLATFORM_APIS := true
 
   LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -63,12 +64,6 @@
 
   LOCAL_DX_FLAGS := --multi-dex
 
-  ifdef DISABLE_AOSP_PHONE_SETTING
-    ifeq ($(DISABLE_AOSP_PHONE_SETTING),true)
-      # This will hide AOSP phone setting.
-      LOCAL_OVERRIDES_PACKAGES := Settings
-    endif
-  endif
   include $(BUILD_PACKAGE)
 endif
 
@@ -81,6 +76,7 @@
 # (for example, projected). See b/30064991
 ifeq (,$(TARGET_BUILD_APPS))
   LOCAL_PACKAGE_NAME := CarSettingsForTesting
+  LOCAL_OVERRIDES_PACKAGES := Settings
   LOCAL_PRIVATE_PLATFORM_APIS := true
 
   LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -123,12 +119,6 @@
 
   LOCAL_DX_FLAGS := --multi-dex
 
-  ifdef DISABLE_AOSP_PHONE_SETTING
-    ifeq ($(DISABLE_AOSP_PHONE_SETTING),true)
-      # This will hide AOSP phone setting.
-      LOCAL_OVERRIDES_PACKAGES := Settings
-    endif
-  endif
   include $(BUILD_PACKAGE)
 endif
 ###################################################################################

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2ef39a1..60838ed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -174,6 +174,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
+            <intent-filter android:priority="100">
+                <action android:name="android.settings.STORAGE_VOLUME_ACCESS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATE_SETTINGS" />
                 <action android:name="android.intent.action.QUICK_CLOCK" />

src/com/android/car/settings/common/FragmentResolver.java

diff --git a/src/com/android/car/settings/common/FragmentResolver.java b/src/com/android/car/settings/common/FragmentResolver.java
index 8c5b0d4..4ae48da 100644
--- a/src/com/android/car/settings/common/FragmentResolver.java
+++ b/src/com/android/car/settings/common/FragmentResolver.java
@@ -32,6 +32,7 @@
 import com.android.car.settings.applications.DefaultApplicationsSettingsFragment;
 import com.android.car.settings.applications.assist.ManageAssistFragment;
 import com.android.car.settings.applications.defaultapps.DefaultAutofillPickerFragment;
+import com.android.car.settings.applications.specialaccess.DirectoryAccessFragment;
 import com.android.car.settings.applications.specialaccess.ModifySystemSettingsFragment;
 import com.android.car.settings.applications.specialaccess.NotificationAccessFragment;
 import com.android.car.settings.applications.specialaccess.UsageAccessFragment;
@@ -148,6 +149,9 @@
             case Settings.ACTION_USAGE_ACCESS_SETTINGS:
                 return new UsageAccessFragment();
 
+            case Settings.ACTION_STORAGE_VOLUME_ACCESS_SETTINGS:
+                return new DirectoryAccessFragment();
+
             case Intent.ACTION_QUICK_CLOCK:
             case Settings.ACTION_DATE_SETTINGS:
                 return new DatetimeSettingsFragment();