Xiaohui Chen
8ae4680977
sys user split: update createUser method
...
After the system user is split out, all users are more or less the same.
We combine the generic user and secondary user create method to reflect
this concept. This also fixes the bug the newly created Primary user
from lock screen contains secondary user restrictions.
Bug: 19913735
Change-Id: I407a877c11346409bad85e00038f6cfd3d126da3
2015-07-16 14:34:00 -07:00
Jason Monk
b1d9536e58
Remove tuner from development settings
...
It has a new home now.
Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
2015-07-16 16:41:15 -04:00
Xiaohui Chen
33b17beb9d
Merge "sys user split: fix user settings user list"
2015-07-16 17:46:08 +00:00
Julia Reynolds
16eec50576
Remove blank switchtext from switch preferences.
...
This makes TTS services read the default text (on/off) when
these switches are toggled.
Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Kenny Guy
2a9b911a85
am 32b5ec83
: am dbb975f8
: am 00a82a4e
: am 29d1b0d0
: am 705faddb
: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '32b5ec834adfd5a14eaca23ece62aecfab143baa':
Show disabled trust agents as off.
2015-07-16 17:17:34 +00:00
Xiaohui Chen
148ef7795d
sys user split: fix user settings user list
...
Only end user switchable users should show up in this list.
BUG:19913735
Change-Id: Ifb83f159864f2210d779b5831c5a5c4dc5e6f4bb
2015-07-16 10:09:37 -07:00
Xiaohui Chen
c49c26bf04
Merge "sys user split: refactor user settings"
2015-07-16 16:16:20 +00:00
Kenny Guy
32b5ec834a
am dbb975f8
: am 00a82a4e
: am 29d1b0d0
: am 705faddb
: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit 'dbb975f8a0dc77bbfa9578a3a394de9cbe08d7cd':
Show disabled trust agents as off.
2015-07-16 13:42:00 +00:00
Kenny Guy
dbb975f8a0
am 00a82a4e
: am 29d1b0d0
: am 705faddb
: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '00a82a4e1b125a25ec3c92e90dbc3de986124813':
Show disabled trust agents as off.
2015-07-16 13:30:00 +00:00
Kenny Guy
00a82a4e1b
am 29d1b0d0
: am 705faddb
: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
Show disabled trust agents as off.
2015-07-16 13:15:57 +00:00
Kenny Guy
29d1b0d0f4
am 705faddb
: Merge "Show disabled trust agents as off." into mnc-dev
...
* commit '705faddbb37bbaa8dc7a18ab3290c02b5b6a2a2c':
Show disabled trust agents as off.
2015-07-16 13:02:44 +00:00
Kenny Guy
705faddbb3
Merge "Show disabled trust agents as off." into mnc-dev
2015-07-16 12:42:41 +00:00
Sanket Padawe
423a891b38
am 45c5de2f
: am e07fce2c
: am 18c31082
: am c5be2243
: am 046decca
: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit '45c5de2f62bcdea70a5f25f60ab10398f5911574':
Use common xml file for multi-tab settings.
2015-07-16 06:02:20 +00:00
Sanket Padawe
45c5de2f62
am e07fce2c
: am 18c31082
: am c5be2243
: am 046decca
: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit 'e07fce2c3bde8c8fd5c380a0a524378d0d99e092':
Use common xml file for multi-tab settings.
2015-07-16 05:48:44 +00:00
Sanket Padawe
e07fce2c3b
am 18c31082
: am c5be2243
: am 046decca
: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit '18c31082b397858564f1dc99a785dc77d1814151':
Use common xml file for multi-tab settings.
2015-07-16 05:40:25 +00:00
Sanket Padawe
18c31082b3
am c5be2243
: am 046decca
: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit 'c5be2243d79ea0a27a7c61ee3aeffdacd7f63b06':
Use common xml file for multi-tab settings.
2015-07-16 05:27:44 +00:00
Sanket Padawe
c5be2243d7
am 046decca
: Merge "Use common xml file for multi-tab settings." into mnc-dev
...
* commit '046decca29376aba5b97b78900bfd867ca3f310c':
Use common xml file for multi-tab settings.
2015-07-16 05:14:09 +00:00
Sanket Padawe
046decca29
Merge "Use common xml file for multi-tab settings." into mnc-dev
2015-07-16 05:01:27 +00:00
Maurice Lam
2632b5946b
am 1e83db94
: am 037ec868
: am 85f199d8
: am 021b3d95
: am bec1d295
: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '1e83db942671f4efb28cc1d2d0820649bac7cf66':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 03:23:26 +00:00
Maurice Lam
1e83db9426
am 037ec868
: am 85f199d8
: am 021b3d95
: am bec1d295
: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '037ec86847055f57fa98db71c7b30ae3030ff16d':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 03:10:26 +00:00
Maurice Lam
037ec86847
am 85f199d8
: am 021b3d95
: am bec1d295
: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '85f199d8620c689ae6f0ae94eeda9168fa93c2db':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:57:00 +00:00
Maurice Lam
85f199d862
am 021b3d95
: am bec1d295
: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit '021b3d955f91eeaa03f8f45401663954560dc748':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:43:11 +00:00
Maurice Lam
021b3d955f
am bec1d295
: Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
...
* commit 'bec1d295586b752f81f523c8339dcd49c586d722':
[Fingerprint] Use accent color for fingerprint highlight
2015-07-16 02:28:09 +00:00
Maurice Lam
bec1d29558
Merge "[Fingerprint] Use accent color for fingerprint highlight" into mnc-dev
2015-07-16 02:19:19 +00:00
Jason Monk
8dc988c811
am 6d2be9f2
: am a4dfe05b
: am 543d68cc
: am 194e92d3
: am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '6d2be9f2043bbd1fb7e5afc44583c7cc80a7b1a0':
Disable ignore battery optimization items that can't change
2015-07-16 00:04:45 +00:00
Jason Monk
4904f3cbaf
am bfa8e5d5
: am 5d780aa9
: am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit 'bfa8e5d53b53a9accbf567f986b625c9ac473f35':
Change move storage from dropdown pref to dialog
2015-07-16 00:04:43 +00:00
Jason Monk
6d2be9f204
am a4dfe05b
: am 543d68cc
: am 194e92d3
: am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit 'a4dfe05b29118055f9e8d4437655e2354cfb1dd7':
Disable ignore battery optimization items that can't change
2015-07-15 23:48:21 +00:00
Jason Monk
bfa8e5d53b
am 5d780aa9
: am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '5d780aa92175ae9d3b1204d67d0c23e943041d8e':
Change move storage from dropdown pref to dialog
2015-07-15 23:48:20 +00:00
Jason Monk
a4dfe05b29
am 543d68cc
: am 194e92d3
: am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '543d68cc3a68098bface7335266a46d1ae0603ca':
Disable ignore battery optimization items that can't change
2015-07-15 23:30:21 +00:00
Jason Monk
5d780aa921
am f9d8deff
: am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit 'f9d8deffaa79da57f04c9eed50d0d1991daac4b1':
Change move storage from dropdown pref to dialog
2015-07-15 23:30:19 +00:00
Jason Monk
543d68cc3a
am 194e92d3
: am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '194e92d3a0dcc15056fac17690f2f36bdc96861a':
Disable ignore battery optimization items that can't change
2015-07-15 23:20:43 +00:00
Jason Monk
f9d8deffaa
am 7beb763d
: am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '7beb763da239fb71f214cab0587ae52f383985fc':
Change move storage from dropdown pref to dialog
2015-07-15 23:20:41 +00:00
Maurice Lam
90cc69eeee
am 614cf892
: am 3603d8ad
: am 2ea2950d
: am 77352c65
: am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '614cf892a6b8813461ff7e5619cb3bc062afcbf6':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 23:12:19 +00:00
Jim Miller
399133d3f2
am 9b94f839
: am ab5cdb2f
: am 593fe777
: am 22e51c8b
: am 6b9d7889
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit '9b94f839d63bba8e1144e146d19001c585a29254':
Fixed the layout for the fingerprint renaming
2015-07-15 23:12:18 +00:00
Maurice Lam
ecf1c04f68
am d3107ce4
: am dfe3368b
: am 649215a5
: am e63322f6
: resolved conflicts for merge of f90628c6
to mnc-dr-dev
...
* commit 'd3107ce40fe4bcabf6d65ad26659b938da610905':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-15 23:12:17 +00:00
Jason Monk
194e92d3a0
am 50972605
: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev
...
* commit '509726054a3efc09d65d6c15f485ea6f1da2d272':
Disable ignore battery optimization items that can't change
2015-07-15 23:03:58 +00:00
Jason Monk
7beb763da2
am 4a6b9095
: Merge "Change move storage from dropdown pref to dialog" into mnc-dev
...
* commit '4a6b909559d50e02833afd5119876df070dfd458':
Change move storage from dropdown pref to dialog
2015-07-15 23:03:57 +00:00
Maurice Lam
614cf892a6
am 3603d8ad
: am 2ea2950d
: am 77352c65
: am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '3603d8ad823796a279007feb7af8b00bc532a26e':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:55:49 +00:00
Jim Miller
9b94f839d6
am ab5cdb2f
: am 593fe777
: am 22e51c8b
: am 6b9d7889
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit 'ab5cdb2f4d0557fd37092966ccd8cdfb42880561':
Fixed the layout for the fingerprint renaming
2015-07-15 22:55:48 +00:00
Maurice Lam
d3107ce40f
am dfe3368b
: am 649215a5
: am e63322f6
: resolved conflicts for merge of f90628c6
to mnc-dr-dev
...
* commit 'dfe3368bf67e5bee41fe92a9cca0879007199bcb':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-15 22:55:47 +00:00
Jason Monk
509726054a
Merge "Disable ignore battery optimization items that can't change" into mnc-dev
2015-07-15 22:48:13 +00:00
Jason Monk
4a6b909559
Merge "Change move storage from dropdown pref to dialog" into mnc-dev
2015-07-15 22:48:06 +00:00
Maurice Lam
3603d8ad82
am 2ea2950d
: am 77352c65
: am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '2ea2950d9c15e2da38d5aece8de7c0079539d99a':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:47:19 +00:00
Jim Miller
ab5cdb2f4d
am 593fe777
: am 22e51c8b
: am 6b9d7889
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit '593fe7778cde419f73d3ec331d028bd86a4f442b':
Fixed the layout for the fingerprint renaming
2015-07-15 22:47:18 +00:00
Maurice Lam
dfe3368bf6
am 649215a5
: am e63322f6
: resolved conflicts for merge of f90628c6
to mnc-dr-dev
...
* commit '649215a50c65b512b51cd21b54e479cd4ff3b926':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-15 22:47:17 +00:00
Maurice Lam
2ea2950d9c
am 77352c65
: am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '77352c65be3d4106da93609794610d88347e069b':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:32:46 +00:00
Jim Miller
593fe7778c
am 22e51c8b
: am 6b9d7889
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit '22e51c8b4f6622cc160d8652b8abe9db304b9a5a':
Fixed the layout for the fingerprint renaming
2015-07-15 22:32:45 +00:00
Maurice Lam
649215a50c
am e63322f6
: resolved conflicts for merge of f90628c6
to mnc-dr-dev
...
* commit 'e63322f640cf955ba296e064b07e4920d334f851':
[Fingerprint] Export FingerprintEnrollIntroduction
2015-07-15 22:32:43 +00:00
Maurice Lam
77352c65be
am 4595978b
: Merge "[Fingerprint] Add fingerprint enroll in setup wizard" into mnc-dev
...
* commit '4595978b72eda7ed53ce0c0cbb763bed02ea13ab':
[Fingerprint] Add fingerprint enroll in setup wizard
2015-07-15 22:26:51 +00:00
Jim Miller
22e51c8b4f
am 6b9d7889
: Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
...
* commit '6b9d788914a600917e8edd4ecd502d6ccf87ca12':
Fixed the layout for the fingerprint renaming
2015-07-15 22:26:50 +00:00