Commit Graph

10208 Commits

Author SHA1 Message Date
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
Baligh Uddin
804b8b60e7 Import translations. DO NOT MERGE
Change-Id: I59c9aa5dbbce1520b7f0a0c6357849ef9c7dbd76
Auto-generated-cl: translation import
2013-06-03 11:48:00 -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
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
Baligh Uddin
44338bae31 Import translations. DO NOT MERGE
Change-Id: I3808f0d486b1050f53c5f3d9129f758d66db68df
Auto-generated-cl: translation import
2013-05-27 11:58:11 -07:00
Russell Brenner
765f55f52a Improved logic for Skip warning message
Use ConnectivityManager instead of TelephonyManager to determine
how device is connected.

Bug: 9118704
Change-Id: I5c1db90500591ca67e927976066a46e1f66e2e60
2013-05-24 16:09:39 -07:00
Baligh Uddin
6fa5e627b8 Import translations. DO NOT MERGE
Change-Id: I42d8fcaccbdec16d54e85adcd73e4c455097715d
Auto-generated-cl: translation import
2013-05-23 00:31:54 -07:00
Amith Yamasani
21f008e1f4 Merge "Update strings for clarity about restricted profiles" into jb-mr2-dev 2013-05-22 22:04:59 +00:00
Alex Klyubin
7229e29f17 Merge "Ensure all active Device Admins are listed." into jb-mr2-dev 2013-05-22 21:06:32 +00:00
Amith Yamasani
7c4dfccda4 Update strings for clarity about restricted profiles
Bug: 9051422
Bug: 9051178
Change-Id: I1b88286fdd0db27bb6980d0ebbc846370fd0082e
2013-05-22 12:51:30 -07:00
Dianne Hackborn
8274b67702 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-05-22 11:50:23 -07:00
Alex Klyubin
d14258e50e Ensure all active Device Admins are listed.
Bug: 9074296
Change-Id: Ifb70c12ccea6628042b98a18186816887cb4477b
2013-05-22 09:08:53 -07:00
Amith Yamasani
0b2781ae53 Write restriction bundle right away for required apps.
User shouldn't have to go tap on the settings icon for an app that is ON by default
in a restricted profile. This way apps can write some defaults to the restricted
profile when it is created.

The app entry is also automatically removed from the list if there are no visible
restrictions.

Bug: 9074051

Also fix an incorrect dialog label. Bug: 9068877

Change-Id: I2a7ddc31fe695f58611d2ba36a8bf541b7817b10
2013-05-21 16:07:28 -07:00
Amith Yamasani
f88e6e5ae6 Don't mutate all instances of app icons in Settings
When adding color filters to an app icon in User Settings, don't
modify the original drawable state. Get a mutable drawable.

Bug: 9054675
Change-Id: I6ea374cb801abef3f5b597fda2e84b4e67cfa9d0
2013-05-20 16:05:22 -07:00
Amith Yamasani
b96ebf9eed Merge "Load the avatar icon if it's not yet in the activity view" into jb-mr2-dev 2013-05-18 00:37:15 +00:00
Amith Yamasani
76738fa651 Load the avatar icon if it's not yet in the activity view
Save any changes that weren't committed yet, but don't restore
earlier cancelled changes.

Bug: 9008014
Change-Id: I8faacc42a3600d1338ddedb1b59f7307903743b4
2013-05-17 15:09:47 -07:00
Baligh Uddin
27d5c392ba Import translations. DO NOT MERGE
Change-Id: Idaa8cda2a62a48bfaf80cd2a3c848ab99179dcda
Auto-generated-cl: translation import
2013-05-17 12:17:02 -07:00
John Spurlock
31ce86d3bd Merge "Hide notification listeners setting if no listeners." into jb-mr2-dev 2013-05-16 15:36:27 +00:00
Amith Yamasani
e5fc407146 Merge "Return proper result code after creating pin/password lock" into jb-mr2-dev 2013-05-16 00:01:42 +00:00
Amith Yamasani
8d26ba45e3 Return proper result code after creating pin/password lock
When adding a new restricted profile, user must enter some lockscreen
security. For PIN/password, return the result code (instead of cancelled)
so that UserSettings can proceed with adding the profile.

Bug: 8909229
Change-Id: I3567d7dfac869e38762f9e2a45d8ec83c51fa657
2013-05-15 11:26:19 -07:00
John Spurlock
55dbdf68f9 Hide notification listeners setting if no listeners.
Hide the new notification listeners management setting when
no listeners using this API are available.

Bug: 8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
2013-05-15 10:13:34 -04:00
Amith Yamasani
00dc15d9da Merge "Add a settings icon to restricted profile config header" into jb-mr2-dev 2013-05-14 21:54:28 +00:00
Amith Yamasani
1d4329631d Add a settings icon to restricted profile config header
This is to make it obvious that the header invokes user info settings.

Bug: 8888002

Also fix a minor copy/paste error in contentDesription attribute.

Change-Id: I3a90b0d691df8302fee696d82c5819f43109ae8e
2013-05-13 14:58:56 -07:00
Robert Greenwalt
d5d61a0ab1 Merge "Remove wifi scan-always dialog." into jb-mr2-dev 2013-05-13 21:11:20 +00:00
Robert Greenwalt
7e59f73e9c Remove wifi scan-always dialog.
When wifi is switched off we no longer want a notification dialog
about scan-always, instead using in-panel text.

bug:8907190
Change-Id: I707f306a056068d92f69070873f1e6330b598b1e
2013-05-13 11:39:08 -07:00
Baligh Uddin
0a3cf29344 Import translations. DO NOT MERGE
Change-Id: I7bfc101728e9083d730511df65771c9899ab6549
Auto-generated-cl: translation import
2013-05-13 09:42:52 -07:00
Svetoslav
7e554395cb Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev 2013-05-08 21:33:14 +00:00
Svetoslav
084fbc8107 Settings crashing if there are no installed accessibility services.
If there is no installed accessibility services and the user goes into
the accessibility settings section, the app crashes. This is due to a
lacking null pointer check against the list of installed services
returned by the accessibility manager. We should not have returned
null, rather an empty list - too late now, sigh...

bug:8871034

Change-Id: Id3800d398af83868862847fa7ed861a9dee61c8f
2013-05-08 12:14:18 -07:00
Baligh Uddin
2c766ba56c Import translations. DO NOT MERGE
Change-Id: I693437e166d38e6b56a9b568c455daebfde8694d
Auto-generated-cl: translation import
2013-05-08 11:03:17 -07:00