Fan Zhang
6c5c9ba8cb
Use isOemUnlockEnabled to drive oem unlocking toggle. am: 83f91f61ae
...
am: 2fd3f18e27
2016-08-24 02:33:38 +00:00
Svetoslav Ganov
00f7070f18
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am: de090f3f85
...
am: 3300192cdb
2016-08-24 02:10:31 +00:00
Svetoslav Ganov
e9f958f2b6
Only sync adapters with access can see an account - settings am: 6f9bf1da90
...
am: a2c7515a3f
2016-08-24 02:10:20 +00:00
Sudheer Shanka
c1cbdef71d
Merge "Show summary of "Add user" item" into nyc-mr1-dev am: acd34a9c72
...
am: 35221c350d
2016-08-24 02:10:18 +00:00
Yoshinori Hirano
ce6a2356ad
Show summary of "Add user" item am: 2ce843b00e
...
am: 9224414477
2016-08-24 02:10:16 +00:00
Maurice Lam
44f8e7ab2e
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am: 497704a2cf
...
am: b62638e83b
2016-08-24 02:10:15 +00:00
Maurice Lam
7d64ded43f
Position fingerprint progress in the center on landscape am: 5fffa74d68
...
am: b2d7eced0b
2016-08-24 02:09:28 +00:00
Fan Zhang
017d6048c4
Force phone number display to be LTR in support tab. am: 68c6d9956f am: 197829fb8a
...
am: 97df6439b9
2016-08-24 02:09:27 +00:00
Maurice Lam
1755a04f6b
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am: 993d37749e
...
am: 8291dc725d
2016-08-24 02:09:27 +00:00
Maurice Lam
7da62c35a7
Remove duplicate string for fingerprint enroll am: 64ac93ba40
...
am: e0c8fcf453
2016-08-24 02:09:26 +00:00
Doris Ling
6dcd71756d
Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba
...
am: 12a0952d49
2016-08-24 02:09:25 +00:00
Doris Ling
6890d538ae
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
...
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
2016-08-23 19:02:31 -07:00
TreeHugger Robot
98d840576e
Merge "Refactored Screenshot preference to be dependent on context preference."
2016-08-24 01:37:57 +00:00
Fan Zhang
a9d2aa8dfa
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
...
am: 2c8178db3a
2016-08-24 00:36:11 +00:00
Fan Zhang
2fd3f18e27
Use isOemUnlockEnabled to drive oem unlocking toggle.
...
am: 83f91f61ae
2016-08-24 00:36:10 +00:00
TreeHugger Robot
2c8178db3a
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
2016-08-24 00:31:54 +00:00
Svetoslav Ganov
3300192cdb
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
...
am: de090f3f85
2016-08-23 23:35:22 +00:00
Svetoslav Ganov
a2c7515a3f
Only sync adapters with access can see an account - settings
...
am: 6f9bf1da90
2016-08-23 23:35:21 +00:00
Matthew Fritze
90d59f2332
Refactored Screenshot preference to be dependent on context preference.
...
Tests: Manual.
Change-Id: I2fde1a67ade4bf89bf38b4eae0ca98074cca868c
Fixes: 30681087
2016-08-23 23:32:46 +00:00
TreeHugger Robot
de090f3f85
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
2016-08-23 23:26:48 +00:00
Sudheer Shanka
35221c350d
Merge "Show summary of "Add user" item" into nyc-mr1-dev
...
am: acd34a9c72
2016-08-23 23:25:09 +00:00
Yoshinori Hirano
9224414477
Show summary of "Add user" item
...
am: 2ce843b00e
2016-08-23 23:25:05 +00:00
Sudheer Shanka
acd34a9c72
Merge "Show summary of "Add user" item" into nyc-mr1-dev
2016-08-23 23:23:08 +00:00
Doris Ling
008ba4ec40
Fix animation video render issue when Settings->Moves is resumed from
...
screen off.
Re-initialize the animation video if necessary when the preference is
visible to the user.
Fixes: 31023261
Test: manual -
1. Go to Settings -> Moves and verify that the animation video are
displayed correctly on load.
2. Press power button to turn screen off, then on again. Verify when
Moves settings resumes, the animation video is displayed correctly.
3. Repeat #2 above but let display time out instead of turning off
screen by power button.
Change-Id: I0ee21d23a4c402b3a8463dca3b36fce67d651993
2016-08-23 16:08:34 -07:00
Maurice Lam
b62638e83b
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
...
am: 497704a2cf
2016-08-23 23:08:05 +00:00
Maurice Lam
b2d7eced0b
Position fingerprint progress in the center on landscape
...
am: 5fffa74d68
2016-08-23 23:08:04 +00:00
Maurice Lam
497704a2cf
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
2016-08-23 22:57:32 +00:00
Fan Zhang
97df6439b9
Force phone number display to be LTR in support tab. am: 68c6d9956f
...
am: 197829fb8a
2016-08-23 22:46:01 +00:00
Fan Zhang
197829fb8a
Force phone number display to be LTR in support tab.
...
am: 68c6d9956f
2016-08-23 22:43:30 +00:00
Maurice Lam
8291dc725d
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
...
am: 993d37749e
2016-08-23 22:23:01 +00:00
Maurice Lam
e0c8fcf453
Remove duplicate string for fingerprint enroll
...
am: 64ac93ba40
2016-08-23 22:23:00 +00:00
Maurice Lam
993d37749e
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
2016-08-23 22:19:57 +00:00
Doris Ling
12a0952d49
Merge "Log settings suggestions events only once." into nyc-mr1-dev
...
am: c4e5acedba
2016-08-23 22:18:00 +00:00
Doris Ling
f757d1ede8
Log settings suggestions events only once.
...
am: bfbb964cb1
2016-08-23 22:18:00 +00:00
Doris Ling
e08dcee5df
Add scrollbar to Settings app. am: 124251d54e am: 13a4eeb2a9
...
am: 9ca6758e0b
2016-08-23 22:16:40 +00:00
Doris Ling
c4e5acedba
Merge "Log settings suggestions events only once." into nyc-mr1-dev
2016-08-23 22:15:52 +00:00
Fan Zhang
83f91f61ae
Use isOemUnlockEnabled to drive oem unlocking toggle.
...
Bug: 31031467
Test: manually turned on/off persistent_data_block
Change-Id: I21d18a898a220f9e46a53715d4b4fa01c7116e7f
2016-08-23 15:14:19 -07:00
Doris Ling
9ca6758e0b
Add scrollbar to Settings app. am: 124251d54e
...
am: 13a4eeb2a9
2016-08-23 21:46:42 +00:00
Svetoslav Ganov
6f9bf1da90
Only sync adapters with access can see an account - settings
...
This change ensures that when the user tries to toggle a sync for a
sync adapter that doesn't have access to an account we show UI for
the user to approve the sync.
bug:28163381
Change-Id: I59802df6614572cf0eaf4b72a177beb111b87b34
2016-08-23 21:44:47 +00:00
Doris Ling
13a4eeb2a9
Add scrollbar to Settings app.
...
am: 124251d54e
2016-08-23 21:43:33 +00:00
Rubin Xu
2b9b42f940
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am: 0948ce0cdb am: f9665da994
...
am: 0085774488
2016-08-23 21:42:51 +00:00
Rubin Xu
2358bf3330
Remove duplicated call to authenticationSucceeded() am: 3a437490be am: 886af76fb3
...
am: 7c23b6b04a
2016-08-23 21:42:49 +00:00
Rubin Xu
a305ec18fb
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am: 7a4ecbac12 am: bd7e2376fc
...
am: a2da83d30a
2016-08-23 21:42:46 +00:00
Rubin Xu
3c0e2cb4bf
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am: da9f9a0fab am: 7425b2d677
...
am: a63a05362f
2016-08-23 21:42:31 +00:00
Doris Ling
26ea60f188
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am: 6cdd5fccd8 am: 7849b2044c
...
am: fa896fbf9a
2016-08-23 21:41:35 +00:00
Doris Ling
7764047d7a
Fix crash when selecting AppInfo for uninstalled app from Recents. am: 7574b64910 am: 0f7d5f36a3
...
am: 753f95d7e0
2016-08-23 21:41:34 +00:00
Doris Ling
2859d0918b
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am: e9af5024a1 am: 7c529e5ba8
...
am: b29f18c49f
2016-08-23 21:41:33 +00:00
Doris Ling
61365a3155
Update Jump to Camera gesture settings description text. am: 8d9b89ed5c am: b9ed707735
...
am: 340d8b6268
2016-08-23 21:41:32 +00:00
Doris Ling
64b680ce4b
Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev am: cf988e3d64 am: f1c69ead73
...
am: 317af15dec
2016-08-23 21:41:31 +00:00
Doris Ling
cfdb2cb3c3
Fix caption text being cut off when text size is set to very large. am: 0f625ae280 am: 3768e718c6
...
am: 6e5ea7dbb9
2016-08-23 21:40:46 +00:00
