diff options
| author | 2022-02-24 17:31:09 +0000 | |
|---|---|---|
| committer | 2022-02-24 17:31:09 +0000 | |
| commit | 2c51668470a06b3bac20dc85aa4d0bb66b155b7d (patch) | |
| tree | 06f1326f80eaabc7cd34eaa65daef3edae0835d0 | |
| parent | d8ef9c55988da536f44497b862747cffc2a2b367 (diff) | |
| parent | 4de88d41ff3dfdca6b15c8058d2544cb0d50e572 (diff) | |
Merge "Add default icon and label to tile" into tm-dev
| -rw-r--r-- | PermissionController/AndroidManifest.xml | 5 | ||||
| -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() } |