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
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
Justin Klaassen
3e2ddff8f7
Merge \\"Add Night display settings conditional\\" into nyc-mr1-dev am: b57ee0e02f
...
am: 5d8b1ca588
2016-07-20 02:55:05 +00:00
Fan Zhang
7be870325a
Merge \\"Add ripple effect on all preference tiles.\\" into nyc-mr1-dev am: 99da60a35f
...
am: 0780fd8b99
2016-07-20 02:54:20 +00:00
Justin Klaassen
5d8b1ca588
Merge \"Add Night display settings conditional\" into nyc-mr1-dev
...
am: b57ee0e02f
2016-07-20 01:06:41 +00:00
Fan Zhang
0780fd8b99
Merge \"Add ripple effect on all preference tiles.\" into nyc-mr1-dev
...
am: 99da60a35f
2016-07-20 01:06:40 +00:00
TreeHugger Robot
b57ee0e02f
Merge "Add Night display settings conditional" into nyc-mr1-dev
2016-07-20 01:00:25 +00:00
TreeHugger Robot
99da60a35f
Merge "Add ripple effect on all preference tiles." into nyc-mr1-dev
2016-07-20 00:49:38 +00:00
Matthew Fritze
ae63c3db14
Error colors to point to frameworks instead of hard-coding them
...
Rather than have each instance of the system error color hard code
the argb values, they now point to frameworks/base/core/res/.
Bug: 30021554
Change-Id: I6ec0512c5e69bc822810745b1745fa9feff95150
2016-07-19 16:10:31 -07:00
