Satoshi Kataoka
05483828cf
am c19a82a3
: am b5b541a5
: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
...
* commit 'c19a82a3798d8de616c72ce3993a330e021e2259':
Fix sort order of InputMethodSubtype
2013-04-18 20:09:32 -07:00
Satoshi Kataoka
c19a82a379
am b5b541a5
: Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
...
* commit 'b5b541a5776b95a985512b3bf694cac2301d8f06':
Fix sort order of InputMethodSubtype
2013-04-18 20:06:21 -07:00
Satoshi Kataoka
b5b541a577
Merge "Fix sort order of InputMethodSubtype" into jb-mr2-dev
2013-04-19 03:04:27 +00:00
Svetoslav
0fc0eb5a05
am 78c7c3fa
: am 9e7a84e2
: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
...
* commit '78c7c3faf62114a2197fbfa4dc319405c267b44d':
Replacing accessibility service permissions with capability attributes.
2013-04-18 18:05:24 -07:00
Svetoslav
78c7c3faf6
am 9e7a84e2
: Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
...
* commit '9e7a84e2684e94ea5ea2e036b9bb4f214cedab2e':
Replacing accessibility service permissions with capability attributes.
2013-04-18 18:01:32 -07:00
Svetoslav
9e7a84e268
Merge "Replacing accessibility service permissions with capability attributes." into jb-mr2-dev
2013-04-19 00:57:00 +00:00
Satoshi Kataoka
ef120bea7b
Fix sort order of InputMethodSubtype
...
Bug: 8638372
Change-Id: I65d30f968708dc836635f687aa51b51816daccdb
2013-04-19 02:09:26 +09:00
Amith Yamasani
87aa98befe
am ac395aae
: am d4abdd27
: Reorganize users screen
...
* commit 'ac395aaed59a70cb2b2eb36fa3b935cb0d12b20f':
Reorganize users screen
2013-04-17 22:17:29 -07:00
Amith Yamasani
ac395aaed5
am d4abdd27
: Reorganize users screen
...
* commit 'd4abdd27adac36e7243bcaae37a7a2c69ac73db7':
Reorganize users screen
2013-04-17 22:15:03 -07:00
Amith Yamasani
d4abdd27ad
Reorganize users screen
...
As per product/ux feedback, move around and rename the users.
Settings button for some users.
Fix crash in limited user when clicking on the user:
Bug: 8494377
Change-Id: I346d12646d32608b01f2c2c2c866b6da51408618
2013-04-17 21:55:06 -07:00
Svetoslav
8fdc564cd3
Replacing accessibility service permissions with capability attributes.
...
Accessibility services can perform special operations such as retrieve
the screen content, enable explore by touch, etc. To ensure the user
is aware that the service will perform special operations we were using
permissions. However, the special operations cannot be performed unless
the service is really enabled by the user and it is at this point that
we want to notify the user about the service capabilities.
This change adds the list of the service capabilities to the enable
warining dialog such that the user can asses whether to he/she is fine
with this service performing certain special operations.
Main change:https://googleplex-android-review.googlesource.com/#/c/298110/
bug:8633951
Change-Id: I1617fa82126b9a674cb74a15d7004a7cc007c7d3
2013-04-17 20:18:59 -07:00
Jeff Brown
fd3ef65132
am 8d37841e
: am ebd61e36
: Ensure WFD switch is removed along with settings fragment.
...
* commit '8d37841e26e6acca91d7c3d147f380d891e31cca':
Ensure WFD switch is removed along with settings fragment.
2013-04-17 19:29:14 -07:00
Jeff Brown
8d37841e26
am ebd61e36
: Ensure WFD switch is removed along with settings fragment.
...
* commit 'ebd61e36b2de03e5ccf2ab590cc44c817a3888ff':
Ensure WFD switch is removed along with settings fragment.
2013-04-17 19:26:20 -07:00
Jeff Brown
ebd61e36b2
Ensure WFD switch is removed along with settings fragment.
...
Bug: 8340072
Change-Id: I8d203725ef1bfa5b1b5e5c224fa57d5feaa9db5a
2013-04-17 19:22:05 -07:00
Jim Miller
19f09c37e1
am 71732616
: am cf00931c
: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
...
* commit '717326167bcf95ef64c8bf6f26a5b475fa1fddf9':
Move owner info from Settings.Secure to LockSettings
2013-04-17 13:43:08 -07:00
Jim Miller
717326167b
am cf00931c
: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev
...
* commit 'cf00931c09a39e89806649a69c96a98bd7619368':
Move owner info from Settings.Secure to LockSettings
2013-04-17 13:40:55 -07:00
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