OSDN Git Service
Doris Ling [Wed, 24 Aug 2016 16:18:05 +0000 (16:18 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
008ba4ec40 am:
12967ed1a8
am:
8467747449
Change-Id: I5ae2a65f4849588cccfa25b0d7ef981c0bef8eb5
Fan Zhang [Wed, 24 Aug 2016 16:18:02 +0000 (16:18 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am:
2c8178db3a am:
a9d2aa8dfa
am:
77ba0620ea
Change-Id: I7a557b4ce9923b7d9b3bd2add8c02fdbadfe589d
Fan Zhang [Wed, 24 Aug 2016 16:18:00 +0000 (16:18 +0000)]
Use isOemUnlockEnabled to drive oem unlocking toggle. am:
83f91f61ae am:
2fd3f18e27
am:
5de68da85a
Change-Id: I5788b58e9e09fb64bd935450c51f604b30c75b65
Svetoslav Ganov [Wed, 24 Aug 2016 16:17:57 +0000 (16:17 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am:
de090f3f85 am:
3300192cdb
am:
6c5c9ba8cb
Change-Id: Ib4a9e14a63bc6f2cb4cd49b1c20e3efacc95f204
Svetoslav Ganov [Wed, 24 Aug 2016 16:16:54 +0000 (16:16 +0000)]
Only sync adapters with access can see an account - settings am:
6f9bf1da90 am:
a2c7515a3f
am:
00f7070f18
Change-Id: Ib7efe9e11caf2e53cc73627d9ccc7ae834145b6a
Sudheer Shanka [Wed, 24 Aug 2016 16:16:52 +0000 (16:16 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev am:
acd34a9c72 am:
35221c350d
am:
e9f958f2b6
Change-Id: I050044222863cca5884461a555c05f47d2cc9a0e
Yoshinori Hirano [Wed, 24 Aug 2016 16:16:51 +0000 (16:16 +0000)]
Show summary of "Add user" item am:
2ce843b00e am:
9224414477
am:
c1cbdef71d
Change-Id: I21c85d4f833fa98ae40eb546dc838b4da9b40bd0
Maurice Lam [Wed, 24 Aug 2016 16:16:50 +0000 (16:16 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am:
497704a2cf am:
b62638e83b
am:
ce6a2356ad
Change-Id: I3c0a875966275473a8d411ca444e29fae22c7357
Maurice Lam [Wed, 24 Aug 2016 16:16:49 +0000 (16:16 +0000)]
Position fingerprint progress in the center on landscape am:
5fffa74d68 am:
b2d7eced0b
am:
44f8e7ab2e
Change-Id: I1a6448f769a82516337fb4366e0916f833998337
Fan Zhang [Wed, 24 Aug 2016 16:15:56 +0000 (16:15 +0000)]
Force phone number display to be LTR in support tab. am:
68c6d9956f am:
197829fb8a am:
97df6439b9
am:
7d64ded43f
Change-Id: I0a369b23fdd9374b0062839d168269605d0c5d2c
Maurice Lam [Wed, 24 Aug 2016 16:15:54 +0000 (16:15 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am:
993d37749e am:
8291dc725d
am:
017d6048c4
Change-Id: Ied2a171fa9bb1da0b55841a01249b0c483d4276c
Maurice Lam [Wed, 24 Aug 2016 16:15:53 +0000 (16:15 +0000)]
Remove duplicate string for fingerprint enroll am:
64ac93ba40 am:
e0c8fcf453
am:
1755a04f6b
Change-Id: I0624be0fc853864a7f82fabf3f4c8fccd8cb7388
Doris Ling [Wed, 24 Aug 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am:
c4e5acedba am:
12a0952d49
am:
7da62c35a7
Change-Id: I0729d5c62c7c29c173d419aace20ac44a99fd55b
Doris Ling [Wed, 24 Aug 2016 16:15:51 +0000 (16:15 +0000)]
resolve merge conflicts of
f757d1e to nyc-mr1-dev-plus-aosp
am:
6dcd71756d
Change-Id: Iae1f9cbd2f8e677e82f27e69de35228a4ae35b99
Andrew Sapperstein [Wed, 24 Aug 2016 14:50:28 +0000 (10:50 -0400)]
resolve merge conflicts of
6890d53 to master
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
Pat Tjin [Wed, 24 Aug 2016 04:48:07 +0000 (04:48 +0000)]
Merge "Remove duplicate KEY_DEVICE_MODEL string set"
Doris Ling [Wed, 24 Aug 2016 04:11:43 +0000 (04:11 +0000)]
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev am:
b88068a876
am:
7822cb6d35
Change-Id: If793369e690fa252431d73cd3443ae245dcf4c82
Doris Ling [Wed, 24 Aug 2016 04:11:42 +0000 (04:11 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off. am:
008ba4ec40
am:
12967ed1a8
Change-Id: Ief21c41a4caaa4f20b12cd9987c8fba32fe16f2a
Doris Ling [Wed, 24 Aug 2016 04:08:55 +0000 (04:08 +0000)]
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
am:
b88068a876
Change-Id: Ia49233d7e13eedad46af92ea58c08cedc0f07b0d
Doris Ling [Wed, 24 Aug 2016 04:08:55 +0000 (04:08 +0000)]
Fix animation video render issue when Settings->Moves is resumed from screen off.
am:
008ba4ec40
Change-Id: I48898d70a02a96a4fc76aa04bfeab309d6e9785f
Doris Ling [Wed, 24 Aug 2016 04:05:38 +0000 (04:05 +0000)]
Merge "Fix animation video render issue when Settings->Moves is resumed from screen off." into nyc-mr1-dev
Fan Zhang [Wed, 24 Aug 2016 02:33:39 +0000 (02:33 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev am:
2c8178db3a
am:
a9d2aa8dfa
Change-Id: I6eecc24f52e48900620058f7c4142275ad391d22
Fan Zhang [Wed, 24 Aug 2016 02:33:38 +0000 (02:33 +0000)]
Use isOemUnlockEnabled to drive oem unlocking toggle. am:
83f91f61ae
am:
2fd3f18e27
Change-Id: Ied30f294df99b869e06ee4dc11c300da3fd70ade
Svetoslav Ganov [Wed, 24 Aug 2016 02:10:31 +0000 (02:10 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev am:
de090f3f85
am:
3300192cdb
Change-Id: Icd81d8d32a85f5cb926d84f5b3239b93d6ce0d7e
Svetoslav Ganov [Wed, 24 Aug 2016 02:10:20 +0000 (02:10 +0000)]
Only sync adapters with access can see an account - settings am:
6f9bf1da90
am:
a2c7515a3f
Change-Id: I4b0d16639837e73fced0260e93b29c08aa4b7346
Sudheer Shanka [Wed, 24 Aug 2016 02:10:18 +0000 (02:10 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev am:
acd34a9c72
am:
35221c350d
Change-Id: Icfef29048747e36f5fdac374be18d092ccb71c9d
Yoshinori Hirano [Wed, 24 Aug 2016 02:10:16 +0000 (02:10 +0000)]
Show summary of "Add user" item am:
2ce843b00e
am:
9224414477
Change-Id: Iee1fe204b1d48b57c8d0577eb86dc3518c144b6f
Maurice Lam [Wed, 24 Aug 2016 02:10:15 +0000 (02:10 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev am:
497704a2cf
am:
b62638e83b
Change-Id: Ic3dccbbb7d27b157076c3009468f7c8a5acba34d
Maurice Lam [Wed, 24 Aug 2016 02:09:28 +0000 (02:09 +0000)]
Position fingerprint progress in the center on landscape am:
5fffa74d68
am:
b2d7eced0b
Change-Id: I24602a6cb4ae2a1ca56d6fffac25cbe6952d0b64
Fan Zhang [Wed, 24 Aug 2016 02:09:27 +0000 (02:09 +0000)]
Force phone number display to be LTR in support tab. am:
68c6d9956f am:
197829fb8a
am:
97df6439b9
Change-Id: I38eac1a0e7a55298cec6a818a051424306721752
Maurice Lam [Wed, 24 Aug 2016 02:09:27 +0000 (02:09 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev am:
993d37749e
am:
8291dc725d
Change-Id: I881722545a7b1605705377406f785bfa3ea0fa4b
Maurice Lam [Wed, 24 Aug 2016 02:09:26 +0000 (02:09 +0000)]
Remove duplicate string for fingerprint enroll am:
64ac93ba40
am:
e0c8fcf453
Change-Id: I1ea9fad83d06ec3526921f942f3476d008717ec4
Doris Ling [Wed, 24 Aug 2016 02:09:25 +0000 (02:09 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev am:
c4e5acedba
am:
12a0952d49
Change-Id: Iac5b318d0bc9f929e34fac9c46dfd3b020889738
Doris Ling [Wed, 24 Aug 2016 01:59:09 +0000 (18:59 -0700)]
resolve merge conflicts of
f757d1e to nyc-mr1-dev-plus-aosp
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
TreeHugger Robot [Wed, 24 Aug 2016 01:37:56 +0000 (01:37 +0000)]
Merge "Refactored Screenshot preference to be dependent on context preference."
Fan Zhang [Wed, 24 Aug 2016 00:36:11 +0000 (00:36 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
am:
2c8178db3a
Change-Id: I66489cdc64f5a2ce9ac2ca3c75014d8d3c981c7a
Fan Zhang [Wed, 24 Aug 2016 00:36:10 +0000 (00:36 +0000)]
Use isOemUnlockEnabled to drive oem unlocking toggle.
am:
83f91f61ae
Change-Id: I11d1210beaa26a0bad54e03f7a08817a3c500fe3
TreeHugger Robot [Wed, 24 Aug 2016 00:31:53 +0000 (00:31 +0000)]
Merge "Use isOemUnlockEnabled to drive oem unlocking toggle." into nyc-mr1-dev
Svetoslav Ganov [Tue, 23 Aug 2016 23:35:22 +0000 (23:35 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
am:
de090f3f85
Change-Id: I2d62ede26a41eee9f7a98a17df255c2b2f516b6c
Svetoslav Ganov [Tue, 23 Aug 2016 23:35:21 +0000 (23:35 +0000)]
Only sync adapters with access can see an account - settings
am:
6f9bf1da90
Change-Id: Ia97c5fe3a1101b9472bc8370671fba838d59edf7
Matthew Fritze [Wed, 17 Aug 2016 23:49:11 +0000 (16:49 -0700)]
Refactored Screenshot preference to be dependent on context preference.
Tests: Manual.
Change-Id: I2fde1a67ade4bf89bf38b4eae0ca98074cca868c
Fixes:
30681087
TreeHugger Robot [Tue, 23 Aug 2016 23:26:47 +0000 (23:26 +0000)]
Merge "Only sync adapters with access can see an account - settings" into nyc-mr1-dev
Sudheer Shanka [Tue, 23 Aug 2016 23:25:09 +0000 (23:25 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev
am:
acd34a9c72
Change-Id: Idc7d32b89a569e1201097dad3ad480a82b7f75fd
Yoshinori Hirano [Tue, 23 Aug 2016 23:25:05 +0000 (23:25 +0000)]
Show summary of "Add user" item
am:
2ce843b00e
Change-Id: I413ab13bbf58b7100348d20c02aeeff850a84639
Sudheer Shanka [Tue, 23 Aug 2016 23:23:07 +0000 (23:23 +0000)]
Merge "Show summary of "Add user" item" into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 23:08:34 +0000 (16:08 -0700)]
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
Maurice Lam [Tue, 23 Aug 2016 23:08:05 +0000 (23:08 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
am:
497704a2cf
Change-Id: I1e33c4ce331e2060b91b8038aca35c4a746b8edc
Maurice Lam [Tue, 23 Aug 2016 23:08:04 +0000 (23:08 +0000)]
Position fingerprint progress in the center on landscape
am:
5fffa74d68
Change-Id: I8a989108c1a72eef25bd0fe90875be856bd81cbc
Maurice Lam [Tue, 23 Aug 2016 22:57:32 +0000 (22:57 +0000)]
Merge "Position fingerprint progress in the center on landscape" into nyc-mr1-dev
Fan Zhang [Tue, 23 Aug 2016 22:46:01 +0000 (22:46 +0000)]
Force phone number display to be LTR in support tab. am:
68c6d9956f
am:
197829fb8a
Change-Id: Iccbd0ec126818f295d45855a8b2bc3d338bd9939
Fan Zhang [Tue, 23 Aug 2016 22:43:30 +0000 (22:43 +0000)]
Force phone number display to be LTR in support tab.
am:
68c6d9956f
Change-Id: Ib5a7b11f9063af047f37a1f342ec715c590cb337
Maurice Lam [Tue, 23 Aug 2016 22:23:01 +0000 (22:23 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
am:
993d37749e
Change-Id: I22a772df18ca5439912ad8b18e4aef0234f558fa
Maurice Lam [Tue, 23 Aug 2016 22:23:00 +0000 (22:23 +0000)]
Remove duplicate string for fingerprint enroll
am:
64ac93ba40
Change-Id: Id49d79278ad68b0b49194576467b5e0714c55c89
Maurice Lam [Tue, 23 Aug 2016 22:19:57 +0000 (22:19 +0000)]
Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
am:
c4e5acedba
Change-Id: Ice4efccbb63061053bc1b2ea75f65fcfe41555d0
Doris Ling [Tue, 23 Aug 2016 22:18:00 +0000 (22:18 +0000)]
Log settings suggestions events only once.
am:
bfbb964cb1
Change-Id: If4e3e15b56c7e5a99eb54376c519019ff44d6a34
Doris Ling [Tue, 23 Aug 2016 22:16:40 +0000 (22:16 +0000)]
Add scrollbar to Settings app. am:
124251d54e am:
13a4eeb2a9
am:
9ca6758e0b -s ours
Change-Id: Icb6cd08141983408afdf7d81c9df80f681d77d71
Doris Ling [Tue, 23 Aug 2016 22:15:52 +0000 (22:15 +0000)]
Merge "Log settings suggestions events only once." into nyc-mr1-dev
Fan Zhang [Tue, 23 Aug 2016 22:13:22 +0000 (15:13 -0700)]
Use isOemUnlockEnabled to drive oem unlocking toggle.
Bug:
31031467
Test: manually turned on/off persistent_data_block
Change-Id: I21d18a898a220f9e46a53715d4b4fa01c7116e7f
Doris Ling [Tue, 23 Aug 2016 21:46:42 +0000 (21:46 +0000)]
Add scrollbar to Settings app. am:
124251d54e
am:
13a4eeb2a9
Change-Id: Ifbb3c930d259bc65ec54ffa496c2cfcdb5bb9a63
Svetoslav Ganov [Tue, 12 Jul 2016 02:34:21 +0000 (19:34 -0700)]
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
Doris Ling [Tue, 23 Aug 2016 21:43:33 +0000 (21:43 +0000)]
Add scrollbar to Settings app.
am:
124251d54e
Change-Id: Id59772914f83860c5ff46ace71d640e17623c98d
Rubin Xu [Tue, 23 Aug 2016 21:42:51 +0000 (21:42 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am:
0948ce0cdb am:
f9665da994
am:
0085774488
Change-Id: I31354262b3f84024ff8ab237c14d157d04ab73fc
Rubin Xu [Tue, 23 Aug 2016 21:42:49 +0000 (21:42 +0000)]
Remove duplicated call to authenticationSucceeded() am:
3a437490be am:
886af76fb3
am:
7c23b6b04a
Change-Id: I15639663bf7c2dd10da1ac4d62301e1d2f71c16b
Rubin Xu [Tue, 23 Aug 2016 21:42:46 +0000 (21:42 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am:
7a4ecbac12 am:
bd7e2376fc
am:
a2da83d30a
Change-Id: If2d23f1594dd3ed75aab511252393d9be493e899
Rubin Xu [Tue, 23 Aug 2016 21:42:31 +0000 (21:42 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am:
da9f9a0fab am:
7425b2d677
am:
a63a05362f
Change-Id: Ie2bc5709e3610940b5f606a64ce13d1959eed653
Doris Ling [Tue, 23 Aug 2016 21:41:35 +0000 (21:41 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am:
6cdd5fccd8 am:
7849b2044c
am:
fa896fbf9a
Change-Id: Ia054e45ee6bcba19c040f64d39fcf79728cc268f
Doris Ling [Tue, 23 Aug 2016 21:41:34 +0000 (21:41 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents. am:
7574b64910 am:
0f7d5f36a3
am:
753f95d7e0
Change-Id: If963000c751255858be1fa5b24067048b2802193
Doris Ling [Tue, 23 Aug 2016 21:41:33 +0000 (21:41 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am:
e9af5024a1 am:
7c529e5ba8
am:
b29f18c49f
Change-Id: I277dee4300e66e7d7bb1d84cc122b5aedb761d1c
Doris Ling [Tue, 23 Aug 2016 21:41:32 +0000 (21:41 +0000)]
Update Jump to Camera gesture settings description text. am:
8d9b89ed5c am:
b9ed707735
am:
340d8b6268
Change-Id: I134dcdf0e2ea1aabed23788befc35b79ee2d6e9f
Doris Ling [Tue, 23 Aug 2016 21:41:31 +0000 (21:41 +0000)]
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
Change-Id: I177ecdd5a00ddc03e9ba9790a6275abcc58354b6
Doris Ling [Tue, 23 Aug 2016 21:40:46 +0000 (21:40 +0000)]
Fix caption text being cut off when text size is set to very large. am:
0f625ae280 am:
3768e718c6
am:
6e5ea7dbb9
Change-Id: I6dd5baf3ba3a42abb1e6e67058d2c8884228734b
Doris Ling [Tue, 23 Aug 2016 21:40:45 +0000 (21:40 +0000)]
Merge "Fix margin in Tap & pay -> Payment default." into nyc-mr1-dev am:
15c13f9e10 am:
ea445c9db7
am:
f101f3c396
Change-Id: Icb986ac5d17c0423bdd68dd975c13c20cdcad59d
Doris Ling [Tue, 23 Aug 2016 21:40:44 +0000 (21:40 +0000)]
Fix margin in Tap & pay -> Payment default. am:
9e29ac7983 am:
88842736d7
am:
a44f2e0f8f
Change-Id: I258bf58e922ff3b866bc21e8cdc7fb5fbf6991da
Matthew Fritze [Tue, 23 Aug 2016 21:40:44 +0000 (21:40 +0000)]
Merge "Stop apps with Storage Managers from launching activity when disabled" into nyc-mr1-dev am:
88d3cb7176 am:
c9be13f26e
am:
b4522799ef
Change-Id: I6ad201c483befea0a28e3fa21ddd1b63f09dfc00
Matthew Fritze [Tue, 23 Aug 2016 21:40:43 +0000 (21:40 +0000)]
Stop apps with Storage Managers from launching activity when disabled am:
1051fe1e14 am:
7444ee791c
am:
bf61bf6459
Change-Id: I14d7a4615a479f3a9e77a5139d89cc05d474f15c
Salvador Martinez [Tue, 23 Aug 2016 21:39:53 +0000 (21:39 +0000)]
Merge "Disabled BSM mode switch when plugged in" into nyc-mr1-dev am:
4c8776627b am:
b3b0fd931b
am:
bc81965891
Change-Id: Ibe60de90217cb7be265ee5b7f41c7ffcfaf4d6ac
Salvador Martinez [Tue, 23 Aug 2016 21:39:51 +0000 (21:39 +0000)]
Disabled BSM mode switch when plugged in am:
d4a6768880 am:
18d58269a8
am:
3f3ce9595b
Change-Id: I0e703a0d249ae4708bce34733834a52ab01bfc00
Salvador Martinez [Tue, 23 Aug 2016 21:39:49 +0000 (21:39 +0000)]
Merge "Made dialog material design compliant" into nyc-mr1-dev am:
4f6755931e am:
a60628517f
am:
fd59fa60e9
Change-Id: Ia76c4984d2d0433b5f66af634f744ed030563d90
Salvador Martinez [Tue, 23 Aug 2016 21:39:46 +0000 (21:39 +0000)]
Made dialog material design compliant am:
cfee94d448 am:
676db52b64
am:
1e9b8e67ff
Change-Id: I249dc055c7e429b3fb624e2fcaba90e0e2df1ebd
Salvador Martinez [Tue, 23 Aug 2016 21:39:43 +0000 (21:39 +0000)]
Merge "Settings Focus prevented from moving to pref" into nyc-mr1-dev am:
0e98c73666 am:
5817342f14
am:
597d352cfb
Change-Id: I865e8548b4b00cbddbd3ce54db9a4ff0ce5b7442
Salvador Martinez [Tue, 23 Aug 2016 21:30:13 +0000 (21:30 +0000)]
Merge "resolve merge conflicts of
052975e to master"
TreeHugger Robot [Tue, 23 Aug 2016 21:24:41 +0000 (21:24 +0000)]
Merge "Extract and refactor logic to determine the data usage summary mark."
Salvador Martinez [Tue, 23 Aug 2016 20:59:48 +0000 (13:59 -0700)]
resolve merge conflicts of
052975e to master
Change-Id: I276079d08c2a73b2b00b065da666e33b33642fbd
Maurice Lam [Fri, 29 Jul 2016 00:12:24 +0000 (17:12 -0700)]
Position fingerprint progress in the center on landscape
Update the layout of the landscape fingerprint enrolling screen to
be consistent with fingerprint find sensor, which vertically centers
the graphic on the right.
Also added back the accessibility live region for TalkBack.
Bug:
30288351
Bug:
30287231
Change-Id: Ia5b429215e36bbc108585aa8b14330b77ddc8584
(cherry picked from commit
c81575138ed00999aa0e9f1e5c4d6445f0300dda)
Maurice Lam [Wed, 10 Aug 2016 19:27:29 +0000 (12:27 -0700)]
Remove duplicate string for fingerprint enroll
Bug:
30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
(cherry picked from commit
56093f6f4f08c4d57b40d853d1491149ed07b5c1)
Fan Zhang [Tue, 23 Aug 2016 16:18:13 +0000 (09:18 -0700)]
Force phone number display to be LTR in support tab.
Bug:
31030062
Test: manual switch between LTR/RLT languages
Change-Id: I94272c0ecbfa2f96842838c0f590b3704cd5c020
(cherry picked from commit
dcfdde5a2c6fa72c564f8dd747d27fbef7fcab04)
Doris Ling [Tue, 2 Aug 2016 21:45:58 +0000 (14:45 -0700)]
Log settings suggestions events only once.
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.
Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.
Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes:
30108142
Salvador Martinez [Tue, 23 Aug 2016 20:06:53 +0000 (20:06 +0000)]
Merge "Prevent wifi icon from disappearing" into nyc-mr1-dev am:
89d138b724 am:
d31d90eecf
am:
2279920944
Change-Id: Iccb6ae0dd0b8d584fd0c1121b7bb91bcbbd235e8
Salvador Martinez [Tue, 23 Aug 2016 20:06:49 +0000 (20:06 +0000)]
Prevent wifi icon from disappearing am:
5c0063af7e am:
56ebf2a051
am:
5bbfa0555a
Change-Id: Ic365caef2c120220ae7ec13e576ae589017bc545
Matthew Fritze [Tue, 23 Aug 2016 00:40:02 +0000 (17:40 -0700)]
Extract and refactor logic to determine the data usage summary mark.
Created a new controller for DataUsageInfo and add appropriate
unit tests.
Bug:
30946416
Change-Id: Ida1281a771013fd807242f846edb4f2a9c0ccabb
Test: Robolectric tests with target RunSettingsRoboTests
TreeHugger Robot [Tue, 23 Aug 2016 18:37:45 +0000 (18:37 +0000)]
Merge "Force phone number display to be LTR in support tab."
Rubin Xu [Tue, 23 Aug 2016 18:31:19 +0000 (18:31 +0000)]
Merge "Remove duplicated call to authenticationSucceeded()" into nyc-mr1-dev am:
0948ce0cdb
am:
f9665da994
Change-Id: Ia5c441a86cfd6cc9c4c3ba0c207c4289ea5a4bb2
Rubin Xu [Tue, 23 Aug 2016 18:31:16 +0000 (18:31 +0000)]
Remove duplicated call to authenticationSucceeded() am:
3a437490be
am:
886af76fb3
Change-Id: Ic0154eef40bfe90a62644405e35092ac037db000
Rubin Xu [Tue, 23 Aug 2016 18:30:14 +0000 (18:30 +0000)]
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am:
7a4ecbac12
am:
bd7e2376fc
Change-Id: I07dbf8982e52bf83b111988e50dd0f41b83403cb
Rubin Xu [Tue, 23 Aug 2016 18:30:10 +0000 (18:30 +0000)]
Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog am:
da9f9a0fab
am:
7425b2d677
Change-Id: I69aad745936b8d53fbe9389d8ff8f7e2d3b98d66
Doris Ling [Tue, 23 Aug 2016 18:30:09 +0000 (18:30 +0000)]
Merge "Fix crash when selecting AppInfo for uninstalled app from Recents." into nyc-mr1-dev am:
6cdd5fccd8
am:
7849b2044c
Change-Id: I56adf86e478ac08dda17c3ad45ba862d50c952e7
Doris Ling [Tue, 23 Aug 2016 18:30:08 +0000 (18:30 +0000)]
Fix crash when selecting AppInfo for uninstalled app from Recents. am:
7574b64910
am:
0f7d5f36a3
Change-Id: I91f1ee6cebb8af959b0dbed6aa213fae4c8de605
Doris Ling [Tue, 23 Aug 2016 18:30:07 +0000 (18:30 +0000)]
Merge "Update Jump to Camera gesture settings description text." into nyc-mr1-dev am:
e9af5024a1
am:
7c529e5ba8
Change-Id: Ib5ce02c97c0f9f72c101c0412b232483f0893cc3
Doris Ling [Tue, 23 Aug 2016 18:29:11 +0000 (18:29 +0000)]
Update Jump to Camera gesture settings description text. am:
8d9b89ed5c
am:
b9ed707735
Change-Id: Ic4a89942d6007a1d96b1fc5c500bb3124575e7d2
OSDN Git Service
