PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,519 Commits 1 Branch 0 Tags
aeb1fa779ba781fc1decb68db387ee64df58befa
Commit Graph

10519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f7c2889c45 am 7f37c30b: (-s ours) Import translations. DO NOT MERGE 
* commit '7f37c30b713e29494f00c85916fc4fee246f2936':
  Import translations. DO NOT MERGE
 2013-06-17 09:27:45 -07:00
Baligh Uddin
e8d4b1a32c Import translations. DO NOT MERGE 
Change-Id: I37d7ec7d90da8ac2f9b4b48e75ddbaea44f02ae1
Auto-generated-cl: translation import
 2013-06-17 09:15:49 -07:00
Baligh Uddin
7f37c30b71 Import translations. DO NOT MERGE 
Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1
Auto-generated-cl: translation import
 2013-06-17 09:14:19 -07:00
The Android Open Source Project
bb3a943d1b Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Id19d096814424b1c1253d633f9bc0e18d53dc360
 2013-06-13 08:22:53 -07:00
The Android Automerger
8720f867c4 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:31 -07:00
The Android Open Source Project
a5520e7691 Reconcile with jb-mr2-release - do not merge 
Change-Id: I5a23b290d9a03dbae2ac2cbb7bcdebe84a773c55
 2013-06-12 18:04:45 -07:00
Baligh Uddin
af442496a9 Import translations. DO NOT MERGE 
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
 2013-06-12 14:32:13 -07:00
Baligh Uddin
b45bac74e9 am 0117cc7c: Import translations. DO NOT MERGE 
* commit '0117cc7ce562569d32fc18341111100068d11eff':
  Import translations. DO NOT MERGE
 2013-06-12 13:22:08 -07:00
Baligh Uddin
0117cc7ce5 Import translations. DO NOT MERGE 
Change-Id: I5b53d1be101da33a7aaa664eccf887e0b17c0b97
Auto-generated-cl: translation import
 2013-06-12 12:51:36 -07:00
The Android Open Source Project
302bd5c78a Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I7d22fa6b33c4e77725ae40de89fa6d83be4e8551
 2013-06-10 08:14:09 -07:00
The Android Automerger
fb4f46893e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-09 05:55:49 -07:00
Amith Yamasani
310f94e79f Don't show ApnEditor as a dialog 
Else it would be missing the menu buttons.

Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
 2013-06-07 15:32:20 -07:00
Baligh Uddin
8b5e2f4267 Import translations. DO NOT MERGE 
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
 2013-06-07 15:32:13 -07:00
Amith Yamasani
e108d69251 Allow hidden apps to opt-out 
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.

Bug: 8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
 2013-06-07 15:32:04 -07:00
Alex Klyubin
8059e00767 resolved conflicts for merge of 5d21820a to jb-mr2-dev 
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
 2013-06-07 15:31:11 -07:00
Dianne Hackborn
14e26fe7c9 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.

Change-Id: I0d3140222d8015f680e1f199bddae2221ee0e726
 2013-06-07 15:30:38 -07:00
Alex Klyubin
bc63004cbf Ensure all active Device Admins are listed. 
Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
 2013-06-07 15:29:18 -07:00
Amith Yamasani
29294d8408 am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev 
* commit 'f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
  Don't show ApnEditor as a dialog
 2013-06-07 14:55:09 -07:00
Amith Yamasani
f3e827e83d Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev 2013-06-07 21:53:15 +00:00
Baligh Uddin
e84b20ba2f am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '2db8ca13a781be5489df614a5513240493edaeed':
  Import translations. DO NOT MERGE
 2013-06-07 12:23:44 -07:00
Baligh Uddin
2db8ca13a7 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-07 19:19:41 +00:00
Amith Yamasani
893bdcd531 am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev 
* commit '1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
  Allow hidden apps to opt-out
 2013-06-07 10:47:24 -07:00
Amith Yamasani
1b79c5c804 Merge "Allow hidden apps to opt-out" into jb-mr2-dev 2013-06-07 17:45:26 +00:00
Amith Yamasani
34bd7e68db Don't show ApnEditor as a dialog 
Else it would be missing the menu buttons.

Bug: 7328535
Change-Id: I8e30eec0b3d23dadd9ab6f1efbaa185fe1b6b431
 2013-06-07 10:19:55 -07:00
Alex Klyubin
3c862fb5b6 am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev 
* commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
  Permit deactivation of malformed Device Admins.
 2013-06-06 17:51:57 -07:00
Alex Klyubin
681b21f3e4 resolved conflicts for merge of 5d21820a to jb-mr2-dev 
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
 2013-06-06 15:45:23 -07:00
Alex Klyubin
4fb1f873bb am 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '56604046c5c46087aa5320d7c6aa6eb49c313637':
  Ensure all active Device Admins are listed.
 2013-06-06 15:43:51 -07:00
Alex Klyubin
56604046c5 am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '5aa3f8782432c79d01702ca6a7214793501bd476':
  Ensure all active Device Admins are listed.
 2013-06-06 15:41:41 -07:00
Alex Klyubin
5d21820a97 am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit 'a65fa934f19ebfe59a8458be733e783292ad8d9c':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:35:41 -07:00
Alex Klyubin
5aa3f87824 am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '0c32da7ee01f7f523a889c5faf1a449e664f8bce':
  Ensure all active Device Admins are listed.
 2013-06-06 15:35:34 -07:00
Alex Klyubin
a65fa934f1 am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit '8bfb859e3b81a9b6448c17cfb02a0aa748580231':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:33:46 -07:00
Alex Klyubin
0c32da7ee0 am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '6f28e3420ade08f05588d35937b772ffb5cdaf83':
  Ensure all active Device Admins are listed.
 2013-06-06 15:33:45 -07:00
Alex Klyubin
8bfb859e3b am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit '8d5aeffa7dc27eba60fe4c64be6a89e645091958':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:32:00 -07:00
Alex Klyubin
6f28e3420a am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '9f6a193394de16bfe398c8b7424f273231c77134':
  Ensure all active Device Admins are listed.
 2013-06-06 15:32:00 -07:00
Alex Klyubin
8d5aeffa7d am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit '089d161588f07862ac1e8876a39227e4110b2bec':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:29:56 -07:00
Alex Klyubin
9f6a193394 am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
  Ensure all active Device Admins are listed.
 2013-06-06 15:29:56 -07:00
Alex Klyubin
089d161588 am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:28:53 -07:00
Alex Klyubin
0ffbbad5b1 am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
  Ensure all active Device Admins are listed.
 2013-06-06 15:28:52 -07:00
Alex Klyubin
01dbfbf9c3 am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev 
* commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda':
  Permit deactivation of malformed Device Admins.
 2013-06-06 15:26:49 -07:00
Alex Klyubin
60544e74b6 am 3dddd8cb: Ensure all active Device Admins are listed. 
* commit '3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
  Ensure all active Device Admins are listed.
 2013-06-06 15:26:48 -07:00
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
Amith Yamasani
48b8b8fd18 Allow hidden apps to opt-out 
When a system app doesn't have any UI, it wasn't being considered for
opt-out. Check for all system apps that want to opt-out and mark them
for uninstallation.

Bug: 8908632
Change-Id: Iad7ccbe544cc7c7ebf73f430fbab8d295eb40219
 2013-06-06 14:48:07 -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
f750cdea06 am adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'adc3a2825c754084728193ebf4f88b411e5b3dbc':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:54:34 -07:00
Dianne Hackborn
adc3a2825c am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:51:50 -07:00
Dianne Hackborn
9cd1d5e2c0 am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:35:00 -07:00
Dianne Hackborn
a9a28d2fee am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'f96a86c99d7505e15a39266967cf4d4d75295af1':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:32:46 -07:00
Dianne Hackborn
f96a86c99d am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '6d80d477391c6ad14a6bcdb044c3351de4e20481':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:30:51 -07:00
Dianne Hackborn
6d80d47739 am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:29:04 -07:00