Merge "Pass UserHandle when opening app perm settings from dashboard" into sc-dev
diff --git a/Android.bp b/Android.bp
index deb17bd..6356b4c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,9 @@
key: "com.android.permission.key",
certificate: ":com.android.permission.certificate",
apps: ["PermissionController"],
+ // Indicates that pre-installed version of this apex can be compressed.
+ // Whether it actually will be compressed is controlled on per-device basis.
+ compressible: true,
}
apex_key {
diff --git a/PermissionController/res/layout/permission_usage_graphic.xml b/PermissionController/res/layout/permission_usage_graphic.xml
index 68e7d05..c5922e1 100644
--- a/PermissionController/res/layout/permission_usage_graphic.xml
+++ b/PermissionController/res/layout/permission_usage_graphic.xml
@@ -21,16 +21,16 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <com.android.permissioncontroller.permission.ui.handheld.CompositeCircleViewLabeler
+ <com.android.permissioncontroller.permission.ui.handheld.dashboard.CompositeCircleViewLabeler
android:id="@+id/composite_circle_view_labeler"
android:layout_height="260dp"
android:layout_width="match_parent">
- <com.android.permissioncontroller.permission.ui.handheld.CompositeCircleView
+ <com.android.permissioncontroller.permission.ui.handheld.dashboard.CompositeCircleView
android:id="@+id/composite_circle_view"
android:layout_centerInParent="true"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginHorizontal="30dp"
android:layout_marginVertical="40dp"/>
- </com.android.permissioncontroller.permission.ui.handheld.CompositeCircleViewLabeler>
+ </com.android.permissioncontroller.permission.ui.handheld.dashboard.CompositeCircleViewLabeler>
</LinearLayout>
diff --git a/PermissionController/res/layout/permissions_frame.xml b/PermissionController/res/layout/permissions_frame.xml
index 7365f9c..55189e7 100644
--- a/PermissionController/res/layout/permissions_frame.xml
+++ b/PermissionController/res/layout/permissions_frame.xml
@@ -34,6 +34,7 @@
<TextView
android:id="@+id/no_permissions"
+ android:visibility="gone"
style="@style/PermissionsFrameNoPermissionsText" />
</LinearLayout>
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java b/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java
index 30080d2..209be1f 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/debug/PermissionUsageV2Fragment.java
@@ -53,9 +53,9 @@
import com.android.permissioncontroller.permission.model.AppPermissionUsage;
import com.android.permissioncontroller.permission.model.AppPermissionUsage.GroupUsage;
import com.android.permissioncontroller.permission.model.legacy.PermissionApps;
-import com.android.permissioncontroller.permission.ui.handheld.PermissionUsageGraphicPreference;
import com.android.permissioncontroller.permission.ui.handheld.PermissionUsageV2ControlPreference;
import com.android.permissioncontroller.permission.ui.handheld.SettingsWithLargeHeader;
+import com.android.permissioncontroller.permission.ui.handheld.dashboard.PermissionUsageGraphicPreference;
import com.android.permissioncontroller.permission.utils.KotlinUtils;
import com.android.permissioncontroller.permission.utils.Utils;
import com.android.settingslib.HelpUtils;
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/CompositeCircleView.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/CompositeCircleView.java
similarity index 98%
rename from PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/CompositeCircleView.java
rename to PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/CompositeCircleView.java
index 05724f7..6eda8d3 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/CompositeCircleView.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/CompositeCircleView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.permissioncontroller.permission.ui.handheld;
+package com.android.permissioncontroller.permission.ui.handheld.dashboard;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/CompositeCircleViewLabeler.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/CompositeCircleViewLabeler.java
similarity index 98%
rename from PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/CompositeCircleViewLabeler.java
rename to PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/CompositeCircleViewLabeler.java
index 74550f4..16a2dcf 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/CompositeCircleViewLabeler.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/CompositeCircleViewLabeler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.permissioncontroller.permission.ui.handheld;
+package com.android.permissioncontroller.permission.ui.handheld.dashboard;
import android.content.Context;
import android.util.AttributeSet;
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PartialCircleView.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/PartialCircleView.java
similarity index 97%
rename from PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PartialCircleView.java
rename to PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/PartialCircleView.java
index 1242a9e..2ea46b2 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PartialCircleView.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/PartialCircleView.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.permissioncontroller.permission.ui.handheld;
+package com.android.permissioncontroller.permission.ui.handheld.dashboard;
import android.content.Context;
import android.graphics.Canvas;
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/PermissionUsageGraphicPreference.java
similarity index 98%
rename from PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java
rename to PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/PermissionUsageGraphicPreference.java
index 28bd3ce..6b1f550 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/PermissionUsageGraphicPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/dashboard/PermissionUsageGraphicPreference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.permissioncontroller.permission.ui.handheld;
+package com.android.permissioncontroller.permission.ui.handheld.dashboard;
import android.Manifest;
import android.content.Context;