Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 31d866e1: am a4eabfde: am bc3cab99: Merge "Fix issue #7330867: Cannot disable a built-in app if you\'ve downloaded updates" into jb-mr1-dev

Browse Source 
* commit '31d866e1c612d2391e8b279addd052ac779c503b':
  Fix issue #7330867: Cannot disable a built-in app if you've downloaded updates
This commit is contained in:
Dianne Hackborn
2012-10-14 11:13:20 -07:00
committed by Android Git Automerger
parent e19424f29d 31d866e1c6
commit c76ceba9ca
3 changed files with 105 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/installed_app_details.xml
View File

@@ -49,6 +49,11 @@
layout="@layout/two_buttons_panel"
android:id="@+id/control_buttons_panel"/>
<!-- Force stop and uninstall buttons -->
<include
layout="@layout/two_buttons_panel"
android:id="@+id/more_control_buttons_panel"/>
<!-- Ban notifications for this package -->
<CheckBox android:id="@+id/notification_switch"
android:layout_width="wrap_content"

5
res/values/strings.xml
View File

@@ -2707,6 +2707,11 @@
<!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
<string name="app_disable_dlg_text">If you disable a built-in app, other apps
may misbehave.</string>
<!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
<string name="app_special_disable_dlg_title">Delete data and disable app?</string>
<!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
<string name="app_special_disable_dlg_text">If you disable a built-in app, other apps
may misbehave. Your data will also be deleted.</string>
<!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
<string name="app_disable_notifications_dlg_title">Turn off notifications?</string>
<!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->