Sudheer Shanka
87ec133f52
Merge "Show summary of "Add user" item" into nyc-mr1-dev am: acd34a9c72 am: 35221c350d
...
am: e9f958f2b6
2016-08-24 16:16:52 +00:00
Yoshinori Hirano
45655e5c7b
Show summary of "Add user" item am: 2ce843b00e am: 9224414477
...
am: c1cbdef71d
2016-08-24 16:16:51 +00:00
Maurice Lam
0b9da48d9f
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am: 497704a2cf am: b62638e83b
...
am: ce6a2356ad
2016-08-24 16:16:50 +00:00
Maurice Lam
c13e3fecda
Position fingerprint progress in the center on landscape am: 5fffa74d68 am: b2d7eced0b
...
am: 44f8e7ab2e
2016-08-24 16:16:49 +00:00
Fan Zhang
a92ab8d635
Force phone number display to be LTR in support tab. am: 68c6d9956f am: 197829fb8a am: 97df6439b9
...
am: 7d64ded43f
2016-08-24 16:15:56 +00:00
Maurice Lam
6d64e62233
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am: 993d37749e am: 8291dc725d
...
am: 017d6048c4
2016-08-24 16:15:54 +00:00
Maurice Lam
85164db460
Remove duplicate string for fingerprint enroll am: 64ac93ba40 am: e0c8fcf453
...
am: 1755a04f6b
2016-08-24 16:15:53 +00:00
Doris Ling
cc0ff8b164
Merge "Log settings suggestions events only once." into nyc-mr1-dev am: c4e5acedba am: 12a0952d49
...
am: 7da62c35a7
2016-08-24 16:15:53 +00:00
Doris Ling
7044490cfe
resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
...
am: 6dcd71756d
2016-08-24 16:15:51 +00:00
Andrew Sapperstein
f36eac3889
resolve merge conflicts of 6890d53 to master
...
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
2016-08-24 10:50:28 -04:00
Pat Tjin
28fcccd185
Merge "Remove duplicate KEY_DEVICE_MODEL string set"
2016-08-24 04:48:08 +00:00
Doris Ling
8467747449
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev am: b88068a876
...
am: 7822cb6d35
2016-08-24 04:11:43 +00:00
Doris Ling
77ba0620ea
Fix animation video render issue when Settings->Moves is resumed from screen off. am: 008ba4ec40
...
am: 12967ed1a8
2016-08-24 04:11:42 +00:00
Doris Ling
7822cb6d35
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
...
am: b88068a876
2016-08-24 04:08:55 +00:00
Doris Ling
12967ed1a8
Fix animation video render issue when Settings->Moves is resumed from screen off.
...
am: 008ba4ec40
2016-08-24 04:08:55 +00:00
Doris Ling
b88068a876
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
2016-08-24 04:05:39 +00:00
Fan Zhang
5de68da85a
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am: 2c8178db3a
...
am: a9d2aa8dfa
2016-08-24 02:33:39 +00:00
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
