Commit Graph

4672 Commits

Author SHA1 Message Date
Kenny Root
1a72d9c49b Merge "Remove old KeyStore API call sites" into jb-mr2-dev 2013-04-15 20:45:17 +00:00
Amith Yamasani
7f34b399fc am 9217185d: am c39dcc1c: Don\'t show developer options to secondary users
* commit '9217185d74dad396ea87e4b82597c0fe2d949efe':
  Don't show developer options to secondary users
2013-04-13 18:51:53 -07:00
Amith Yamasani
c39dcc1ce4 Don't show developer options to secondary users
Show just a message that developer options are not available for the user.

Also fix silent exit of AddAccount operation by showing a toast that user
cannot add accounts.

Bug: 7409523
Bug: 8519646
Bug: 7304007

Change-Id: Id3f430d568d6b7151ac55f86dbc0ef91803fa10c
2013-04-13 18:43:41 -07:00
Amith Yamasani
c9e8ea7b22 am c36b3969: am 34a62601: Merge "Disable apps that require an account on a limited user" into jb-mr2-dev
* commit 'c36b39696cd4110c7161f375e59d2486013b7355':
  Disable apps that require an account on a limited user
2013-04-13 15:58:34 -07:00
Amith Yamasani
9517b02d43 Disable apps that require an account on a limited user
If an app is marked as requiring an account to work, disable that app
and show a message in the summary.

Also, implement graying out of icons for deselected apps.

Bug: 8600261
Change-Id: I9cf48832675c24257e09addad4316249082c30fb
2013-04-12 17:56:34 -07:00
Kenny Root
14415168b1 Remove old KeyStore API call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: I59e38efbab6ad60a905ce8678a340da2088b19c9
2013-04-12 17:35:55 -07:00
Maggie Benthall
c1fc6b1493 am 5cc298c8: am 8c32c28f: Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev
* commit '5cc298c838e8fa6dd540624fa354e7d2fab16f92':
  Implement Settings app UX for when a user has wifi config locked down.
2013-04-12 14:38:47 -07:00
Maggie Benthall
8c32c28f19 Merge "Implement Settings app UX for when a user has wifi config locked down." into jb-mr2-dev 2013-04-12 21:28:19 +00:00
Emily Bernier
b8bb07def6 am 0e34529c: am 91d40b7d: Merge "User restrictions for creds storage & user removal" into jb-mr2-dev
* commit '0e34529c2a01e5cd9d8aaf499e7777a41411c26b':
  User restrictions for creds storage & user removal
2013-04-12 13:29:32 -07:00
Emily Bernier
91d40b7d97 Merge "User restrictions for creds storage & user removal" into jb-mr2-dev 2013-04-12 20:22:04 +00:00
Amith Yamasani
90288faffd am a01f625f: am 35f02378: Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev
* commit 'a01f625f509b0491398b854c1f63562c80902330':
  Embed the app restrictions fragment in the dual-pane settings.
2013-04-12 11:06:58 -07:00
Amith Yamasani
35f0237871 Merge "Embed the app restrictions fragment in the dual-pane settings." into jb-mr2-dev 2013-04-12 17:58:03 +00:00
Irfan Sheriff
bafefe0031 am 2cc2b0f2: am a2e64ac8: Merge "Limit device name length" into jb-mr2-dev
* commit '2cc2b0f2cbae003eaca44e12333f754748ddb0c1':
  Limit device name length
2013-04-12 10:38:25 -07:00
Irfan Sheriff
a2e64ac815 Merge "Limit device name length" into jb-mr2-dev 2013-04-12 16:55:13 +00:00
Irfan Sheriff
540f75aa92 Limit device name length
Bug: 8599677
Change-Id: Ifce5579c0a65c98a4faaad286a7255b2e63d2a76
2013-04-11 22:26:28 -07:00
Amith Yamasani
cc395695fc Embed the app restrictions fragment in the dual-pane settings.
Change the limited user creation flow to show the usual message before
actually adding the user. Might need to customize the message for limited
users.

Removed the old activity wrapper and moved the logic to UserSettings.

Removed the finish button.

Bug: 8566751
Change-Id: Ie9e1a03736c41758b0bb6e79d004ad662a5af7f4
2013-04-11 18:21:07 -07:00
Emily Bernier
11bd33a564 User restrictions for creds storage & user removal
Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
2013-04-11 19:54:57 -04:00
Benjamin Poiesz
f18d2fea2a am 2bd65910: am b0746763: Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev
* commit '2bd6591025aaf1d1b5a9a9d0d2ce5981617476b3':
  Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.
2013-04-11 15:18:02 -07:00
Benjamin Poiesz
b0746763ba Merge "Forcing the settings apk to be built with the zz_ZZ pseudolocale. This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker." into jb-mr2-dev 2013-04-11 22:12:10 +00:00
Amith Yamasani
9d2d752654 am c077cd8d: am d8b0d0ed: Make sure Settings app restrictions show up
* commit 'c077cd8dec7fab6b4224c123007789c1869164ed':
  Make sure Settings app restrictions show up
2013-04-11 14:58:21 -07:00
Benjamin Poiesz
cbde502ebb Forcing the settings apk to be built with the zz_ZZ pseudolocale.
This will enable Settings to show the effects of the zz_ZZ pseudolocale when selected in the LocalePicker.

Bug #8556677

Change-Id: I68ffc81454865dec94a3c1460019d1efce00ea49
2013-04-11 13:32:39 -07:00
Maggie Benthall
7e61c23306 Implement Settings app UX for when a user has wifi config locked down.
When the user is restricted from configuring wifi:
- Leave the on/off button enabled
- Hide all menu options
- Hide all networks, and display a message saying:
 "This user is not allowed to configure wireless networks."

Change-Id: I20193b552ea071740686bd9091637459e9b668b5
2013-04-11 15:45:58 -04:00
Amith Yamasani
d8b0d0ed8e Make sure Settings app restrictions show up
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.

Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
2013-04-11 11:12:35 -07:00
Maggie Benthall
c20bc9f1cd am 2def3df6: am 3c3fa0cc: Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev
* commit '2def3df600d13000855ce352536b49094d746be4':
  Implement Settings app UX for when a user has bluetooth config locked down.
2013-04-11 07:12:06 -07:00
Maggie Benthall
3c3fa0ccb8 Merge "Implement Settings app UX for when a user has bluetooth config locked down." into jb-mr2-dev 2013-04-11 14:04:40 +00:00
Amith Yamasani
8ce6386484 am 7805d74c: am d81a3f73: Improve app list for limited users
* commit '7805d74cd7710c868bdebae872c79470b622c86f':
  Improve app list for limited users
2013-04-10 22:16:15 -07:00
Amith Yamasani
d81a3f7368 Improve app list for limited users
Show all activities in the same package with a master/slave relationship,
toggling all when the master is toggled.
Don't show required apps that have no restrictions.
Show apps that are only installed on the target user.

Bug: 8520813 lowercase app names
Bug: 8520185 apps installed only in limited user
Bug: 8567000 strange behavior with apps that have two launcher icons
Change-Id: Id8ab296c13202735a9534f918bd81ea4b4c14b46
2013-04-10 21:59:18 -07:00
Svetoslav
549857a8b4 am fce2148f: am 96cd9e7c: First accessibility device disabled if enableing a second one is canceled.
* commit 'fce2148f3c679ef12ee59a8dcf071e34cea100f5':
  First accessibility device disabled if enableing a second one is canceled.
2013-04-10 18:22:49 -07:00
Svetoslav
96cd9e7cc7 First accessibility device disabled if enableing a second one is canceled.
The value whether accessibility should stay enabled was incorrectly
computed and as a result accessibility was disaabled when the second
accessibility service enabling is canceled.

bug:7716830

Change-Id: Ic23c24b1ffa90811e21210aeeca158568ad37904
2013-04-10 17:33:42 -07:00
Dianne Hackborn
ab27d31a81 am 5d46a54c: am 8c94273c: Merge "Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats" into jb-mr2-dev
* commit '5d46a54c55a4e48332905bd927c24bc2544e2893':
  Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
2013-04-10 14:18:56 -07:00
Dianne Hackborn
1d675e6546 Fix issue #7691456: adbd CPU usage identified as Bluetooth in battery stats
Should be comparing with Bluetooth UID, not the wrong and broken GID.

Change-Id: I2cb33e25b0ae5a441a467c12d91860dcf36232dc
2013-04-10 12:50:32 -07:00
Amith Yamasani
e2367654b6 am 0c8f9246: am 80b1dfe4: Merge "Select text in user name dialog" into jb-mr2-dev
* commit '0c8f9246437234a0de217feb339c5811012bea5c':
  Select text in user name dialog
2013-04-09 17:33:13 -07:00
Amith Yamasani
80b1dfe46a Merge "Select text in user name dialog" into jb-mr2-dev 2013-04-10 00:29:12 +00:00
Amith Yamasani
583757908b Select text in user name dialog
Enables quickly changing the name without moving the cursor.
Also use cap words style.

Bug: 8518507
Change-Id: I6841cad221b56bb4c3d51c21d30b3858d1ee3e1c
2013-04-09 17:26:43 -07:00
Wink Saville
69e57fa7f3 am 9f5f4fdd: am 460f2478: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
* commit '9f5f4fdde61fabb634885e71f845d8d3c1fc9c7b':
  Add FW support for CellInfo RIL commands.
2013-04-09 16:02:04 -07:00
Wink Saville
460f24786a Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev 2013-04-09 22:50:41 +00:00
Ben Murdoch
9f8c61ee1a am 6fdc642e: am f452008f: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev
* commit '6fdc642e8640927bee97f93812a58897afa252e9':
  Properly remove experimental WebView preference when unavailable.
2013-04-09 14:25:22 -07:00
Amith Yamasani
dfead4eb31 am e9691ed5: am 0a970cae: Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
* commit 'e9691ed5fb51b58dc4b144fec4226e6353f8df93':
  Send app restrictions broadcast to stopped apps as well
2013-04-09 14:25:16 -07:00
Ben Murdoch
f452008f5b Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev 2013-04-09 19:00:41 +00:00
Jared Duke
9225bc538d Properly remove experimental WebView preference when unavailable.
When the experimental WebView library is unavailable, properly remove it from
the appropriate preferences group.

Bug: 8572673
Change-Id: I34dd0720199c826ca12e0f991e2f6bd9c5ad35f3
2013-04-09 19:14:57 +01:00
Amith Yamasani
0a970caed4 Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev 2013-04-09 18:09:40 +00:00
Amith Yamasani
872d4fba77 Send app restrictions broadcast to stopped apps as well
Otherwise the restrictions won't be shown for apps that haven't been
launched yet.

Bug: 8577600
Change-Id: I1d0d93553456dfedfb749e3d8262911af4362a80
2013-04-09 11:05:18 -07:00
Amith Yamasani
66ab414ea8 am 631285a4: am 350938ec: Potential fix for a monkey-related NPE
* commit '631285a43f0c1de9df02d3ebd1c4e22a6ef74d1f':
  Potential fix for a monkey-related NPE
2013-04-09 10:39:32 -07:00
Amith Yamasani
350938ecc6 Potential fix for a monkey-related NPE
Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.

Bug: 8005271

Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608
2013-04-09 10:25:43 -07:00
Wink Saville
bf4712895a Add FW support for CellInfo RIL commands.
Add being able to setCellInfoListRate.

Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
2013-04-08 15:19:44 -07:00
Maggie Benthall
11b69bf86d Implement Settings app UX for when a user has bluetooth config locked down.
When a user has the user restriction DISALLOW_CONFIG_BLUETOOTH
- Remove all the menu items for searching and other config
- Hide "available" but non-paired devices
- Remove settings button from paired devices
- Remove ability to make the device visible to others

Change-Id: Icaebf29d3cce55d924fdd65449447b5b7a438bbe
2013-04-08 16:05:38 -04:00
Kenny Root
fc783b06cd am 56e75f3c: am 645e78d8: Merge "Allow multiuser use of keystore" into jb-mr2-dev
* commit '56e75f3c170f859ecd05b43ca5e3a14ac7878cf7':
  Allow multiuser use of keystore
2013-04-08 11:07:37 -07:00
Kenny Root
645e78d806 Merge "Allow multiuser use of keystore" into jb-mr2-dev 2013-04-08 17:58:37 +00:00
Kenny Root
c5550c2012 Allow multiuser use of keystore
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

(cherry picked from commit cc48b0104e)

Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
2013-04-08 10:36:05 -07:00
Kenny Root
cc48b0104e Allow multiuser use of keystore
Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

Bug: 7249554
Change-Id: I5aa069ca439cea68e87e141c497be8cd86b0ba9d
2013-04-08 10:23:38 -07:00