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

10213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
623bb0c79e merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-21 11:35:55 -07:00
Dianne Hackborn
5da4c9079c Merge "Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev 2013-06-20 21:38:30 +00:00
Dianne Hackborn
f5f08628cc Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps 
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.

Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
 2013-06-19 17:01:51 -07:00
Baligh Uddin
80a0d9a37c Import translations. DO NOT MERGE 
Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12
Auto-generated-cl: translation import
 2013-06-19 12:40:06 -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 Automerger
8720f867c4 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:31 -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 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
f3e827e83d Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev 2013-06-07 21:53:15 +00:00
Baligh Uddin
2db8ca13a7 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-07 19:19:41 +00: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
681b21f3e4 resolved conflicts for merge of 5d21820a to jb-mr2-dev 
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
 2013-06-06 15:45:23 -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
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
Dianne Hackborn
0bccd7e7f4 am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '5f28c77bc64deb132082eaab0ebd544ba5111bd0':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:26:39 -07:00
Dianne Hackborn
5f28c77bc6 am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'd60861258169083f3174734af821fc8078ec5d2f':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:23:05 -07:00
Amith Yamasani
d63bd61ee8 Merge "Fix NullPointerException at RunningState" into jb-mr2-dev 2013-06-06 18:16:31 +00:00
Johan Redestig
6fd5800386 Fix NullPointerException at RunningState 
getServiceInfo returns null if you have a service defined in the
manifest as: <service android:name=".Xxx" android:exported="false" />
or and in an <application> with no label or icon.
Dont crash the Settings application because of that.

Change-Id: I6f9f69c130e610b7e4ab66426177b7bade1e1515
 2013-06-06 10:26:22 -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
f616ef4306 Import translations. DO NOT MERGE 
Change-Id: I4278f061c26bccc1713791f43a3cd81d69268d36
Auto-generated-cl: translation import
 2013-06-05 11:51:21 -07:00
The Android Automerger
8db2adb980 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-05 10:21:50 -07:00
Baligh Uddin
804b8b60e7 Import translations. DO NOT MERGE 
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
 2013-06-03 11:48:00 -07:00
The Android Automerger
a778aa2499 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:48 -07:00
Baligh Uddin
eb0fff7a9a Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-31 22:43:38 +00:00
Robert Greenwalt
5ac904321d Don't show scan-always text if it is off. 
bug:9206410
Change-Id: If7e06f50d3d8db6ea198f437d4d268e65ec96c16
 2013-05-30 11:33:36 -07:00
Baligh Uddin
586376a036 Import translations. DO NOT MERGE 
Change-Id: I484fae1bba709cad545b168242e79291e9599346
Auto-generated-cl: translation import
 2013-05-29 19:29:10 -07:00
The Android Automerger
0013525263 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-29 05:55:30 -07:00
Baligh Uddin
1182f6755f Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-29 03:56:37 +00:00
Russell Brenner
c280acc327 Merge "Improved logic for Skip warning message" into jb-mr2-dev 2013-05-28 20:22:40 +00:00