Doris Ling
8668aa0a8f
Merge \"Get gestures animation preview image in async loader.\" into nyc-mr1-dev
...
am: fd922cabd9
2016-07-21 02:47:12 +00:00
TreeHugger Robot
fd922cabd9
Merge "Get gestures animation preview image in async loader." into nyc-mr1-dev
2016-07-21 02:43:37 +00:00
Matthew Fritze
53b782d1bf
Merge \\"Revert \\"Revert \\"Error colors to point to frameworks instead of hard-coding them\\"\\"\\" into nyc-mr1-dev am: d739ea38fb
...
am: 1da5d326a1
2016-07-21 01:38:22 +00:00
Matthew Fritze
71368b83b8
resolve merge conflicts of 21b446c to master
...
Change-Id: I38d1f88f03505d690ccd1739c42e8d34ef87890f
2016-07-20 18:28:39 -07:00
Matthew Fritze
1da5d326a1
Merge \"Revert \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\"\" into nyc-mr1-dev
...
am: d739ea38fb
2016-07-21 01:24:09 +00:00
Doris Ling
de991f457d
Get gestures animation preview image in async loader.
...
When user scrolls in Gestures Settings, the textureview used for the
animation video will be destroyed if the view is scrolled outside the
screen. When the view is scrolled back in, a slight flicker is seen as
the animation video is not instantly made available on the new surface
texture. We are now retrieving the preview image in an async loader
after the preference is created, so that it will not delay the original
loading of the gestures settings page, but the preview will be made
available while we initialize the animation video in the new surface
texture.
Bug: 29790087
Change-Id: I83f4a5bc4f24b7aab4c0cc851cb524c10e74f328
2016-07-20 18:13:55 -07:00
Matthew Fritze
21b446cea9
Merge \"Revert \"Error colors to point to frameworks instead of hard-coding them\"\" into nyc-mr1-dev
...
am: c49c496f1c
2016-07-21 01:06:15 +00:00
Matthew Fritze
d739ea38fb
Merge "Revert "Revert "Error colors to point to frameworks instead of hard-coding them""" into nyc-mr1-dev
2016-07-21 01:04:26 +00:00
Matthew Fritze
892a54696b
Revert "Revert "Error colors to point to frameworks instead of hard-coding them""
...
This reverts commit f179f845e5
2016-07-21 01:03:45 +00:00
Daniel Nishi
730263fbe2
Merge \\"Update the Bluetooth pin pairing view to the new spec.\\" into nyc-mr1-dev am: 391f67e484
...
am: b0bb093519
2016-07-21 01:02:16 +00:00
Matthew Fritze
59dce9892c
Merge \\"Error colors to point to frameworks instead of hard-coding them\\" into nyc-mr1-dev am: d25148c8f7
...
am: 4a8695ed1e
2016-07-21 00:59:33 +00:00
Andrew Sapperstein
c49c496f1c
Merge "Revert "Error colors to point to frameworks instead of hard-coding them"" into nyc-mr1-dev
2016-07-21 00:57:02 +00:00
Matthew Fritze
f179f845e5
Revert "Error colors to point to frameworks instead of hard-coding them"
...
This reverts commit ae63c3db14
2016-07-21 00:55:21 +00:00
Daniel Nishi
b0bb093519
Merge \"Update the Bluetooth pin pairing view to the new spec.\" into nyc-mr1-dev
...
am: 391f67e484
2016-07-20 23:57:46 +00:00
Daniel Nishi
391f67e484
Merge "Update the Bluetooth pin pairing view to the new spec." into nyc-mr1-dev
2016-07-20 23:52:59 +00:00
Matthew Fritze
4a8695ed1e
Merge \"Error colors to point to frameworks instead of hard-coding them\" into nyc-mr1-dev
...
am: d25148c8f7
2016-07-20 23:47:28 +00:00
Matthew Fritze
d25148c8f7
Merge "Error colors to point to frameworks instead of hard-coding them" into nyc-mr1-dev
2016-07-20 23:34:42 +00:00
Daniel Nishi
e8869e8a23
Update the Bluetooth pin pairing view to the new spec.
...
Bug: 30191613
Change-Id: Ib7b5f1758be0af33f6ea60d581a27df4801fc835
2016-07-20 14:17:42 -07:00
Tony Mak
563668bebd
Merge \\"Should not report unsuccessful attempt if pattern size < minimal size\\" into nyc-mr1-dev am: 9d83a9fbbb
...
am: 3a681a32a8
2016-07-20 19:51:26 +00:00
Abodunrinwa Toki
95c446c14a
Merge \\"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\\" into nyc-mr1-dev am: 5af83786f7
...
am: 1fd447e778
2016-07-20 19:51:25 +00:00
Doris Ling
eacb97e3d7
Merge \\"Combine setCategories() and setSuggestions() in DashboardAdapter.\\" into nyc-mr1-dev am: 7e70fd1166
...
am: b3055b083a
2016-07-20 19:51:24 +00:00
Daniel Nishi
2b2ffa2dd6
Merge \\"Add a help item for the Help & Feedback for the Storage Manager.\\" into nyc-mr1-dev am: dd1c51a3e4
...
am: c354537c37
2016-07-20 19:51:17 +00:00
Michael Wright
40b75a094c
Merge \\"Color transforms are now color modes.\\" into nyc-mr1-dev am: 111e1dc6b3
...
am: 87fca0df00
2016-07-20 19:49:18 +00:00
Tony Mak
3a681a32a8
Merge \"Should not report unsuccessful attempt if pattern size < minimal size\" into nyc-mr1-dev
...
am: 9d83a9fbbb
2016-07-20 19:26:54 +00:00
Tony Mak
9d83a9fbbb
Merge "Should not report unsuccessful attempt if pattern size < minimal size" into nyc-mr1-dev
2016-07-20 19:20:55 +00:00
Julia Reynolds
0bb60ada96
Display days of week in locale order.
...
Change-Id: Id5d5920089a5da1fbdc7802431ca2909f72d7e12
Fixes: 21304061
2016-07-20 15:15:16 -04:00
Abodunrinwa Toki
1fd447e778
Merge \"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\" into nyc-mr1-dev
...
am: 5af83786f7
2016-07-20 18:57:18 +00:00
Doris Ling
b3055b083a
Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
...
am: 7e70fd1166
2016-07-20 18:51:17 +00:00
Daniel Nishi
c354537c37
Merge \"Add a help item for the Help & Feedback for the Storage Manager.\" into nyc-mr1-dev
...
am: dd1c51a3e4
2016-07-20 18:51:14 +00:00
Abodunrinwa Toki
5af83786f7
Merge "DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation." into nyc-mr1-dev
2016-07-20 18:50:16 +00:00
Michael Wright
87fca0df00
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
...
am: 111e1dc6b3
2016-07-20 18:49:59 +00:00
Doris Ling
7e70fd1166
Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev
2016-07-20 18:02:43 +00:00
Chad Brubaker
c92ed2721b
Merge "Dont use FLAG_ENCRYPT for certificates"
2016-07-20 17:37:07 +00:00
Daniel Nishi
dd1c51a3e4
Merge "Add a help item for the Help & Feedback for the Storage Manager." into nyc-mr1-dev
2016-07-20 17:33:40 +00:00
TreeHugger Robot
111e1dc6b3
Merge "Color transforms are now color modes." into nyc-mr1-dev
2016-07-20 17:21:36 +00:00
Fan Zhang
58222c5f70
Merge \\"Let talkback announce category name in Settings.\\" into nyc-mr1-dev am: 19d0f73c48
...
am: ed9bd61a4c
2016-07-20 17:04:57 +00:00
Fan Zhang
ed9bd61a4c
Merge \"Let talkback announce category name in Settings.\" into nyc-mr1-dev
...
am: 19d0f73c48
2016-07-20 17:00:04 +00:00
TreeHugger Robot
19d0f73c48
Merge "Let talkback announce category name in Settings." into nyc-mr1-dev
2016-07-20 16:51:13 +00:00
Bill Yi
3aaf72e6c8
Import translations. DO NOT MERGE am: b5c2131de4 -s ours
...
am: 06dac5c117
2016-07-20 14:48:01 +00:00
Bill Yi
06dac5c117
Import translations. DO NOT MERGE
...
am: b5c2131de4
2016-07-20 14:45:00 +00:00
Bill Yi
b5c2131de4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30202203
Change-Id: Ieb3d22c6a8d1608dce6d9bce23d85f31a75be58a
2016-07-20 07:34:39 -07:00
Bill Yi
ed6797ad67
Import translations. DO NOT MERGE am: 708c6264ac -s ours
...
am: 9471dbdd6a
2016-07-20 14:18:31 +00:00
Bill Yi
9471dbdd6a
Import translations. DO NOT MERGE
...
am: 708c6264ac
2016-07-20 14:15:59 +00:00
Bill Yi
708c6264ac
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
2016-07-20 07:09:37 -07:00
Jason Monk
7db2409581
Merge \\"Protect against work conditional crash\\" into nyc-mr1-dev am: bd6a4f9066
...
am: ff1132470b
2016-07-20 13:37:02 +00:00
Jason Monk
ff1132470b
Merge \"Protect against work conditional crash\" into nyc-mr1-dev
...
am: bd6a4f9066
2016-07-20 13:33:57 +00:00
Jason Monk
bd6a4f9066
Merge "Protect against work conditional crash" into nyc-mr1-dev
2016-07-20 13:28:13 +00:00
André Lago
91c03c0962
Merge "Improved always_on_vpn disabled text"
2016-07-20 11:31:19 +00:00
Andre Lago
f22679abbc
Improved always_on_vpn disabled text
...
When the admin disallowed config vpn, always-on vpn description was
"Disabled by admin", so it was changed to "Controlled by admin" which
suits it better.
Bug: 29265180
Change-Id: If0da6b9ef3ce7179adeda53203c6caf4e3e9a995
2016-07-20 10:51:30 +01:00
Tony Mak
818312d962
Should not report unsuccessful attempt if pattern size < minimal size
...
It is to align the behavior in personal side lock screen.
Change-Id: I811e72405615fbed85c2a4dc6b6cec51e4ad54f0
Fix: 30215101
2016-07-20 09:55:25 +01:00
