diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/overlayable.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 10 | ||||
| -rw-r--r-- | res/values/styles.xml | 34 |
3 files changed, 4 insertions, 47 deletions
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 23737634..f18db51c 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -121,13 +121,6 @@ <item type="style" name="LoadingContainerTextView" /> <!-- END LOADING CONTAINER --> - <!-- START GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG --> - <item type="style" name="GrandfatheredModernStorageGroupWarningDialogHeader" /> - - <item type="style" name="GrandfatheredModernStorageGroupWarningDialogTitleIcon" /> - <item type="style" name="GrandfatheredModernStorageGroupWarningDialogTitleMessage" /> - <!-- END GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG --> - <!-- START ONGOING USAGE DIALOG --> <item type="style" name="PermissionUsageDialogContainerScrollView" /> <item type="style" name="PermissionUsageDialogContainerLayout" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index ab04e5f6..485a315f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -775,16 +775,6 @@ Allow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug repo <!-- Label for the button to NOT allow sharing of the report. [CHAR LIMIT=20] --> <string name="incident_report_dialog_deny_label">Deny</string> - <!-- Title for the warning dialog shown when user tried to revoke a grandfathered modern storage permission. - [CHAR LIMIT=100] --> - <string name="grandfathered_modern_storage_permission_deny_warning_title">Permission can\u2019t be denied. Uninstall <xliff:g id="app_name" example="Gmail">%1$s</xliff:g>.</string> - - <!-- Content for the warning dialog shown when user tried to revoke a grandfathered modern storage permission [CHAR LIMIT=none] --> - <string name="grandfathered_modern_storage_permission_deny_warning_content"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> has legacy storage permission to keep your previous data accessible, and the app can stop working when this permission is denied.\n\nTo continue using the app, uninstall it and then reinstall it. Your data in this app may be lost.</string> - - <!-- Dismiss with acknowledgment [CHAR LIMIT=30] --> - <string name="dismiss_with_acknowledgment">Got it</string> - <!-- Label for screen allowing the user to force certain apps to always be shown in permission controller settings ui instead of being hidden behind "system app" menu. [CHAR LIMIT=60] --> <string name="adjust_user_sensitive_title">Advanced settings</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index a30380f7..15c30178 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -445,8 +445,10 @@ </style> <style name="PreferenceUsageImageFrame"> - <item name="android:layout_width">48dp</item> - <item name="android:layout_height">48dp</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:maxWidth">48dp</item> + <item name="android:maxHeight">48dp</item> <item name="android:gravity">center</item> </style> @@ -518,34 +520,6 @@ <!-- END LOADING CONTAINER --> - <!-- START GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG --> - - <style name="GrandfatheredModernStorageGroupWarningDialogHeader"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:orientation">vertical</item> - <item name="android:gravity">center</item> - <item name="android:paddingTop">16dp</item> - <item name="android:paddingStart">24dp</item> - <item name="android:paddingEnd">24dp</item> - </style> - - <style name="GrandfatheredModernStorageGroupWarningDialogTitleIcon"> - <item name="android:layout_width">24dp</item> - <item name="android:layout_height">24dp</item> - <item name="android:layout_marginBottom">12dp</item> - <item name="android:scaleType">fitCenter</item> - </style> - - <style name="GrandfatheredModernStorageGroupWarningDialogTitleMessage" - parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:gravity">center</item> - </style> - - <!-- END GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG --> - <!-- START ONGOING USAGE DIALOG --> <style name="PermissionUsageDialogContainerScrollView"> |