Alex Klyubin
efd88e2c46
Merge "Permit deactivation of malformed Device Admins." into jb-dev
2013-06-06 22:25:29 +00:00
Alex Klyubin
29de9d5153
Permit deactivation of malformed Device Admins.
...
Bug: 9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
2013-06-06 14:56:24 -07:00
Alex Klyubin
3dddd8cbff
Ensure all active Device Admins are listed.
...
Bug: 9074296
(cherry picked from commit d14258e50e
)
Conflicts:
src/com/android/settings/DeviceAdminSettings.java
Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
PackageManager.queryBroadcastReceivers invocation. The above
flag was introduced in API Level 18.
Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
2013-06-06 14:08:34 -07:00
Dianne Hackborn
d608612581
Fix issue #9074296 : Device Admins can activate in a way...
...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
(cherry picked from commit 8274b67702
)
Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.
Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
2013-06-05 15:48:20 -07:00
Baligh Uddin
1166503886
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-08-15 07:54:44 -07:00
Baligh Uddin
ba60a45ae7
Import translations. DO NOT MERGE
...
Change-Id: Iec7b8dc92746f9c0449588e191cfa5920f112c19
Auto-generated-cl: translation import
2012-08-14 21:51:07 -07:00
Baligh Uddin
cb5624b806
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-08-14 13:05:19 -07:00
Baligh Uddin
c5acc132ca
Import translations. DO NOT MERGE
...
Change-Id: Iba3c413c6b912f21e0529b16159abf4e4427b14b
Auto-generated-cl: translation import
2012-08-14 12:45:33 -07:00
Baligh Uddin
059b123cb9
Import translations. DO NOT MERGE
...
Change-Id: I7921607b000389e13db13a4a6e0b0014ec1e87a1
Auto-generated-cl: translation import
2012-08-13 13:24:26 -07:00
Ying Wang
3eee86b8d7
Import translations. DO NOT MERGE
...
Change-Id: Ia673ddc20188c59c8591015e51033a526a7151ab
Auto-generated-cl: translation import
2012-08-03 13:41:54 -07:00
Michael Jurka
ca511a8115
Fix appwidget bind dialog
...
Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
2012-08-02 18:36:42 -07:00
Ying Wang
d7ae05dbdc
Import translations. DO NOT MERGE
...
Change-Id: I581b48ef0f69e5bd2c469fd2ac61a8c5564bc553
Auto-generated-cl: translation import
2012-08-01 14:13:16 -07:00
Ying Wang
723bdf1ec5
Import translations. DO NOT MERGE
...
Change-Id: I6789871cb46bac62934f63182d2dacce3dda85e3
Auto-generated-cl: translation import
2012-07-30 13:25:03 -07:00
Ying Wang
eaeb8b61d6
Import translations. DO NOT MERGE
...
Change-Id: Id5983c861a0f8d50f39517bae9271dba88c9e530
Auto-generated-cl: translation import
2012-07-27 12:25:46 -07:00
Amith Yamasani
0784166898
Merge "Move Google-apps specific location settings to a Google package" into jb-dev
2012-07-26 16:05:19 -07:00
Ying Wang
4e53a0cbdc
Import translations. DO NOT MERGE
...
Change-Id: I278308a46da25f82ee3da787b628cf67df4b6f0b
Auto-generated-cl: translation import
2012-07-26 15:11:52 -07:00
Amith Yamasani
8442db24a1
Move Google-apps specific location settings to a Google package
...
Bug: 6882764
This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.
Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
2012-07-26 14:28:07 -07:00
Ying Wang
c31f6b23e4
Import translations. DO NOT MERGE
...
Change-Id: I56c497673b39fb29801bc6f4bb71ec205ddc4d10
Auto-generated-cl: translation import
2012-07-25 14:17:08 -07:00
Ying Wang
54199540b1
Import translations. DO NOT MERGE
...
Change-Id: Iaab1ba57ddc978edab0389c9172be39899d9bd24
Auto-generated-cl: translation import
2012-07-24 12:38:57 -07:00
Amith Yamasani
4635ec6b8d
Strings for upcoming location settings changes.
...
Adding these first to parallelize translations.
Change-Id: Ia0fcecd6d714ad58c45e5ddc9ae5f00afce3e810
2012-07-23 16:40:02 -07:00
Ying Wang
13be54694f
Import translations. DO NOT MERGE
...
Change-Id: Idf81094651355da7433c69cefd2fddf0ccc0bc0a
Auto-generated-cl: translation import
2012-07-23 13:05:38 -07:00
Ying Wang
509cfa1d54
Import translations. DO NOT MERGE
...
Change-Id: Ic57f9912261e3b685eac931269bdac10353305d4
Auto-generated-cl: translation import
2012-07-20 12:53:45 -07:00
Ying Wang
35e404c8f0
Import translations. DO NOT MERGE
...
Change-Id: I029b2b28210dbac2b523152441195db55c352120
Auto-generated-cl: translation import
2012-07-19 14:21:34 -07:00
Ying Wang
2bc05a2726
Import translations. DO NOT MERGE
...
Change-Id: If2837c8bd3b5aaf6aa089a0a7a711e1a5662fd7e
Auto-generated-cl: translation import
2012-07-18 16:18:09 -07:00
Ying Wang
fa0f3fe162
Import translations. DO NOT MERGE
...
Change-Id: Ia121cd0efbc34dbfbfcd96ad3befbeefd37de9ff
Auto-generated-cl: translation import
2012-07-17 12:54:32 -07:00
Ying Wang
66daca6b24
Import translations. DO NOT MERGE
...
Change-Id: Ief2131970749fdea0ec210f4d9ab309e671eb166
Auto-generated-cl: translation import
2012-07-16 12:57:58 -07:00
Dianne Hackborn
ea819b07fa
Merge "Implement issue #6819955 : Add button to take bug report." into jb-dev
2012-07-13 17:03:43 -07:00
Dianne Hackborn
fd8c315573
Implement issue #6819955 : Add button to take bug report.
...
Change-Id: Ic615180121d4db52f92aa8264d95d790de5fff9d
2012-07-13 16:10:16 -07:00
Ying Wang
4b25c5ad82
Import translations. DO NOT MERGE
...
Change-Id: I8959d6559f2a47b296216d6fb9817765e87588e5
Auto-generated-cl: translation import
2012-07-13 13:09:18 -07:00
Ying Wang
62acae4f85
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-07-12 14:25:51 -07:00
Ying Wang
51f13809a9
Import translations. DO NOT MERGE
...
Change-Id: Id2c66f1ef1fbb1333fd1b6cea90839d2d0371006
Auto-generated-cl: translation import
2012-07-12 13:15:15 -07:00
John Wang
b0b45c02ec
Display FCC id for LTE in Settings.
...
If ro.ril.fccid is set by RIL, display it at Settings -> About Tablet -> FCC Equipment ID.
bug:4965501
Change-Id: I920ab071bf1997c4fbf3ce81f88e24f512d004c3
2012-07-11 16:50:32 -07:00
Ying Wang
efc229b3c3
Import translations. DO NOT MERGE
...
Change-Id: Ifb1aa8aba94ef321761769d8253dab6b5326b59e
Auto-generated-cl: translation import
2012-07-10 13:42:00 -07:00
Ying Wang
051619c063
Import translations. DO NOT MERGE
...
Change-Id: I33c2d51c27d2942ddb00f11ad163406180fb1e17
Auto-generated-cl: translation import
2012-07-09 13:20:45 -07:00
Ying Wang
39aade5b4e
Import translations. DO NOT MERGE
...
Change-Id: I1634d69f5cdd74a0c33cc4796a1a17e89376a1e3
Auto-generated-cl: translation import
2012-07-03 13:41:30 -07:00
Eric Fischer
a1146f83a9
Import translations. DO NOT MERGE
...
Change-Id: Ic3255b6b87db2a3b98fd3b41e4ab0ef24d67e292
Auto-generated-cl: translation import
2012-07-02 13:55:16 -07:00
Ying Wang
9ca616e425
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-29 17:54:50 -07:00
Dianne Hackborn
313ab17270
Fix issue #6761130 : Clearing app data in settings does not clear app's USB storage
...
The installed app details was not correctly distinguishing between cache and
normal data on external storage. The cache files on external storage are now
correctly shown in the cache section, since those are what get deleted when
you hit the clear cache button.
Change-Id: Id98bdb7fb5202d6a092fe5a772638eeb6aed2b47
2012-06-29 15:01:23 -07:00
Ying Wang
92b47c3690
Import translations. DO NOT MERGE
...
Change-Id: Ic81c64b7405a6de52473a90f61d58242779c8bf5
Auto-generated-cl: translation import
2012-06-29 13:19:19 -07:00
Brian Muramatsu
beb3d8b1e0
Merge "Fix Settings NPE" into jb-dev
2012-06-28 16:53:47 -07:00
Brian Muramatsu
c28af52e59
Fix Settings NPE
...
Labels for account types can be null which causes a NPE to occur in
Settings. If the label is null, don't bother adding an account
header. If we don't do this, then it would blow up when trying to
sort the headers anyway, so this change will fix the crash.
Bug 6727947
Change-Id: I284d7204b6d21c8d1b0a36e18ecae2c2361eeb84
2012-06-28 14:25:14 -07:00
Eric Fischer
3cc385b83c
Import translations. DO NOT MERGE
...
Change-Id: If4dd46dc84b974aabefe57aefb43de4329396c51
Auto-generated-cl: translation import
2012-06-28 12:51:19 -07:00
Ying Wang
c812fe4c0e
Import translations. DO NOT MERGE
...
Change-Id: I5c769ea97c25696684c6818bfb84c95d30689b22
2012-06-27 16:19:29 -07:00
Jake Hamby
f59dd9d67e
Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-dev
2012-06-25 16:19:23 -07:00
Jake Hamby
ef57ed71bf
Add menu item to Settings to go to Cell Broadcast settings.
...
Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).
The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.
Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
2012-06-25 13:20:45 -07:00
Eric Fischer
40b78280eb
Import translations. DO NOT MERGE
...
Change-Id: Ic94e1bba24f847df6b65c46539bb2de12e8ab38b
2012-06-25 13:00:04 -07:00
Ying Wang
d7e8025fdf
Import translations. DO NOT MERGE
...
Change-Id: I417b1bbfd809569e110d5534fb2db1dd2c82075e
2012-06-22 15:07:41 -07:00
Eric Fischer
3c46b11039
Import translations. DO NOT MERGE
...
Change-Id: I77226bb57376204d2b55012c3be037a6f05be228
2012-06-21 15:04:08 -07:00
Eric Fischer
f776a738fa
Import translations. DO NOT MERGE
...
Change-Id: I8d15ef5cb523bdc7f68216a7d465dcb7b9152477
2012-06-20 21:12:09 -07:00
Amith Yamasani
9938ac8a6e
Merge "Fix incorrect updating of headers in Settings" into jb-dev
2012-06-20 15:45:05 -07:00