Jim Miller
cf00931c09
Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
2013-04-17 20:37:29 +00:00
Amith Yamasani
a7a9fc4730
am 05f5437a
: am 5ee17505
: Changes to deal with restrictions API change
...
* commit '05f5437af1d7a6fa5ca27f9cadef0521c05ae09d':
Changes to deal with restrictions API change
2013-04-17 11:34:29 -07:00
Amith Yamasani
05f5437af1
am 5ee17505
: Changes to deal with restrictions API change
...
* commit '5ee175051951d3a0bc1533aece69af520c295d37':
Changes to deal with restrictions API change
2013-04-17 11:30:42 -07:00
Amith Yamasani
5ee1750519
Changes to deal with restrictions API change
...
Bug: 8633967
Change-Id: I5d8e843c850ad3eff900409a9006666ddf91b061
2013-04-17 10:47:34 -07:00
Amith Yamasani
6bf778ef35
am ed89cb87
: am e11a346f
: Remove wifi/bt restrictions choice for limited users
...
* commit 'ed89cb8765154506cc712482ef3b6fcb804375f4':
Remove wifi/bt restrictions choice for limited users
2013-04-16 16:01:49 -07:00
Amith Yamasani
ed89cb8765
am e11a346f
: Remove wifi/bt restrictions choice for limited users
...
* commit 'e11a346f1fe6adeb183e7dfb622ac6ab40016794':
Remove wifi/bt restrictions choice for limited users
2013-04-16 15:59:01 -07:00
Amith Yamasani
e11a346f1f
Remove wifi/bt restrictions choice for limited users
...
Bug: 8631653
Make "Unknown sources" visible but disabled if restricted for limited user.
Bug: 8629605
Also show the restriction name as the dialog title in the picker.
Change-Id: I8d6ea3571bcc4372347cad6a2c982f35afa7cc09
2013-04-16 15:39:47 -07:00
Amith Yamasani
f4bfad995d
am b7e49231
: am c1e3983b
: Merge "Fix NullPointerException at RunningState"
...
* commit 'b7e49231ff8c03120c80a28edc43eca83266497b':
Fix NullPointerException at RunningState
2013-04-16 06:45:58 -07:00
Amith Yamasani
cfb26bbb5b
am 728b6316
: am 91b5fab9
: Merge "Check if the Activity is finishing before showDialog()"
...
* commit '728b631653bfe5b9f69ad9c3d94819f06aa0f5fc':
Check if the Activity is finishing before showDialog()
2013-04-16 06:45:57 -07:00
Amith Yamasani
b7e49231ff
am c1e3983b
: Merge "Fix NullPointerException at RunningState"
...
* commit 'c1e3983b319ae4998ede94742db5462d01f53b73':
Fix NullPointerException at RunningState
2013-04-16 06:43:05 -07:00
Amith Yamasani
728b631653
am 91b5fab9
: Merge "Check if the Activity is finishing before showDialog()"
...
* commit '91b5fab9b0e8338850fe2838311a0801fddf31d4':
Check if the Activity is finishing before showDialog()
2013-04-16 06:43:04 -07:00
Amith Yamasani
c1e3983b31
Merge "Fix NullPointerException at RunningState"
2013-04-16 13:16:17 +00:00
Amith Yamasani
91b5fab9b0
Merge "Check if the Activity is finishing before showDialog()"
2013-04-16 13:13:53 +00:00
Jim Miller
99b50ae584
Move owner info from Settings.Secure to LockSettings
...
Fixes bug 8512972
Change-Id: I3eb68ace44c51daa012547908e28544a2d94847d
2013-04-15 20:27:55 -07:00
Kenny Root
0a10abbc83
am d56e4ad7
: am 1a72d9c4
: Merge "Remove old KeyStore API call sites" into jb-mr2-dev
...
* commit 'd56e4ad7738f588835c464d2e49f80114758e4bf':
Remove old KeyStore API call sites
2013-04-15 13:52:56 -07:00
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