Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,293 Commits 1 Branch 0 Tags
082deedeec4c522db0538db211b5ff69757ebd12
Commit Graph

10293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
082deedeec merge in master-release history after reset to master 2013-04-18 07:50:16 -07: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
Baligh Uddin
19d451c5e7 am 51a860fe: am 4e8cbb32: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '51a860fe9b96685802377c6229bcbcb42b866b59':
  Import translations. DO NOT MERGE
 2013-04-17 20:49:20 -07:00
Baligh Uddin
51a860fe9b am 4e8cbb32: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '4e8cbb32a2ecef9c0bbdaaeb97e6fc29ec14a902':
  Import translations. DO NOT MERGE
 2013-04-17 20:45:06 -07:00
Baligh Uddin
83543474e3 Merge "Import translations. DO NOT MERGE" 2013-04-18 03:42:10 +00:00
Baligh Uddin
4e8cbb32a2 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 03:41:23 +00: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
Baligh Uddin
7b2305cb0e Import translations. DO NOT MERGE 
Change-Id: I46b94a6c07511edfbac1fe38edee77c46e14c2cd
Auto-generated-cl: translation import
 2013-04-17 11:18:30 -07:00
Baligh Uddin
cdd3238b67 Import translations. DO NOT MERGE 
Change-Id: I04afe54c24573ae6980c1140aede0e0d3b0a06f8
Auto-generated-cl: translation import
 2013-04-17 11:15:26 -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
The Android Automerger
c96b64f3f9 merge in master-release history after reset to master 2013-04-17 07:49:52 -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
The Android Automerger
37fe281bb3 merge in master-release history after reset to master 2013-04-16 12:21:35 -07:00
The Android Automerger
b14b33f689 merge in master-release history after reset to master 2013-04-16 07:50:06 -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
d56e4ad773 am 1a72d9c4: Merge "Remove old KeyStore API call sites" into jb-mr2-dev 
* commit '1a72d9c49b11355135af6807d316e473d7d2423e':
  Remove old KeyStore API call sites
 2013-04-15 13:49:51 -07:00
Kenny Root
1a72d9c49b Merge "Remove old KeyStore API call sites" into jb-mr2-dev 2013-04-15 20:45:17 +00:00
Baligh Uddin
935e583276 am a9e23a52: am cc41daba: Import translations. DO NOT MERGE 
* commit 'a9e23a52e1d8935bbe2f344e2d7edee43441ebd7':
  Import translations. DO NOT MERGE
 2013-04-15 13:04:48 -07:00
Baligh Uddin
a9e23a52e1 am cc41daba: Import translations. DO NOT MERGE 
* commit 'cc41daba492503c6ea6ffad27691197f7165dce1':
  Import translations. DO NOT MERGE
 2013-04-15 13:00:55 -07:00
Baligh Uddin
c08c676597 Merge "Import translations. DO NOT MERGE" 2013-04-15 19:56:33 +00:00
Baligh Uddin
da06101b1e Import translations. DO NOT MERGE 
Change-Id: Id1ca56661136c6d96224f8da56e9535e84b2f518
Auto-generated-cl: translation import
 2013-04-15 11:15:51 -07:00
Baligh Uddin
cc41daba49 Import translations. DO NOT MERGE 
Change-Id: Ia5a4c8320ec06c7aee2eeb272fc62939a7b63cce
Auto-generated-cl: translation import
 2013-04-15 11:12:49 -07:00
The Android Open Source Project
a189051f50 am a53807dd: Reconcile with jb-mr2-release - do not merge 
* commit 'a53807ddd815be36f0992576f2260f486206766d':
 2013-04-15 10:53:12 -07:00
The Android Open Source Project
a53807ddd8 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ie31f29c0b7587e4567140530b6f8bd199b0e5a79
 2013-04-15 10:46:27 -07:00
The Android Automerger
1ca604ba42 merge in master-release history after reset to master 2013-04-15 07:50:23 -07:00
The Android Automerger
375a27daa6 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:56:22 -07: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
9217185d74 am c39dcc1c: Don\'t show developer options to secondary users 
* commit 'c39dcc1ce4d1885ef1de926b67e88cf2dd1acaff':
  Don't show developer options to secondary users
 2013-04-13 18:48:49 -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
c36b39696c am 34a62601: Merge "Disable apps that require an account on a limited user" into jb-mr2-dev 
* commit '34a62601adf20482d88c153b13d51074a9f3ae5a':
  Disable apps that require an account on a limited user
 2013-04-13 15:56:28 -07:00
Amith Yamasani
34a62601ad Merge "Disable apps that require an account on a limited user" into jb-mr2-dev 2013-04-13 22:54:18 +00:00