summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nate Myren <ntmyren@google.com> 2022-02-16 10:21:59 -0800
committer Nate Myren <ntmyren@google.com> 2022-02-23 09:27:01 -0800
commit4de88d41ff3dfdca6b15c8058d2544cb0d50e572 (patch)
tree1361fa3f90cde88db0b49c50d41c0a8c13dd71a8
parent4d97d0e99f7da3783aa6728ae7e69e4dfbee12f8 (diff)
Add default icon and label to tile
Bug: 200280741 Test: manual Change-Id: Ia30cfc218f92286fbf50eb6a7706c0ab075003aa
-rw-r--r--PermissionController/AndroidManifest.xml5
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/service/SafetyHubQsTileService.kt (renamed from PermissionController/src/com/android/permissioncontroller/permission/service/SafetyHubQSTileService.kt)4
2 files changed, 4 insertions, 5 deletions
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml
index 5b14b6591..2d7af379a 100644
--- a/PermissionController/AndroidManifest.xml
+++ b/PermissionController/AndroidManifest.xml
@@ -341,9 +341,10 @@
</intent-filter>
</service>
- <service android:name="com.android.permissioncontroller.permission.service.SafetyHubQSTileService"
+ <service android:name="com.android.permissioncontroller.permission.service.SafetyHubQsTileService"
android:exported="true"
- android:label="Safety"
+ android:label="@string/safety_privacy_qs_tile_title"
+ android:icon ="@drawable/safety_shield"
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE" />
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/SafetyHubQSTileService.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/SafetyHubQsTileService.kt
index e68c8ca9e..70531b9e0 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/SafetyHubQSTileService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/SafetyHubQsTileService.kt
@@ -29,7 +29,7 @@ import com.android.permissioncontroller.R
/**
* The service backing a Quick Settings Tile which will take users to the Safety Hub QS Fragment.
*/
-class SafetyHubQSTileService : TileService() {
+class SafetyHubQsTileService : TileService() {
private var disabled = false
override fun onBind(intent: Intent?): IBinder? {
@@ -54,8 +54,6 @@ class SafetyHubQSTileService : TileService() {
qsTile.label = getString(R.string.safety_privacy_qs_tile_title)
qsTile.subtitle = getString(R.string.safety_privacy_qs_tile_subtitle)
- qsTile.icon = Icon.createWithResource(this,
- R.drawable.safety_shield)
qsTile.state = Tile.STATE_ACTIVE
qsTile.updateTile()
}