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
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
Michael Wright
87fca0df00
Merge \"Color transforms are now color modes.\" into nyc-mr1-dev
...
am: 111e1dc6b3
2016-07-20 18:49:59 +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
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
Fan Zhang
c9fca1a1ee
Add ripple effect on all preference tiles.
...
Bug: 30201359
Change-Id: If02b7b08c05c23a4db3a0455ce12df31c4b7bf42
2016-07-19 16:04:28 -07:00
Daniel Nishi
f21465e14f
Add a help item for the Help & Feedback for the Storage Manager.
...
Bug: 29793176
Change-Id: Ic4104525961e7f173212df54f19857a06c0fac05
2016-07-19 15:47:10 -07:00
Andrew Sapperstein
5bf0dcaad4
Merge \\"Fix a bunch of straggler themes.\\" into nyc-mr1-dev am: 85902750a5
...
am: 25e2e0338f
2016-07-19 21:56:16 +00:00
Andrew Sapperstein
25e2e0338f
Merge \"Fix a bunch of straggler themes.\" into nyc-mr1-dev
...
am: 85902750a5
2016-07-19 21:52:38 +00:00
Andrew Sapperstein
85902750a5
Merge "Fix a bunch of straggler themes." into nyc-mr1-dev
2016-07-19 21:42:27 +00:00
Justin Klaassen
d60f09edaf
Add Night display settings conditional
...
Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
2016-07-19 14:31:46 -07:00
Jason Monk
1cc91467c2
Merge \\\"Pre-setup restrictions\\\" into nyc-dev am: 5a3d1c17f2 am: 3b0bfee337
...
am: 36446521fd
2016-07-19 20:59:10 +00:00
Jason Monk
01333561c1
Merge \\\"Pre-setup restrictions\\\" into nyc-dev am: 5a3d1c17f2 am: 69ce586155
...
am: ef7473f012
2016-07-19 20:59:10 +00:00
Jason Monk
36446521fd
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
...
am: 3b0bfee337
2016-07-19 20:54:06 +00:00
Jason Monk
ef7473f012
Merge \\"Pre-setup restrictions\\" into nyc-dev am: 5a3d1c17f2
...
am: 69ce586155
2016-07-19 20:47:46 +00:00
Jason Monk
3b0bfee337
Merge \"Pre-setup restrictions\" into nyc-dev
...
am: 5a3d1c17f2
2016-07-19 20:40:35 +00:00
Jason Monk
69ce586155
Merge \"Pre-setup restrictions\" into nyc-dev
...
am: 5a3d1c17f2
2016-07-19 20:39:18 +00:00
Doris Ling
106352620d
Merge \\"Fix janky scrolling for Gestures Settings.\\" into nyc-mr1-dev am: c2733db43f
...
am: a87329dc31
2016-07-19 20:38:49 +00:00
Doris Ling
a87329dc31
Merge \"Fix janky scrolling for Gestures Settings.\" into nyc-mr1-dev
...
am: c2733db43f
2016-07-19 20:35:42 +00:00
Jason Monk
5a3d1c17f2
Merge "Pre-setup restrictions" into nyc-dev
2016-07-19 20:31:15 +00:00
Doris Ling
c2733db43f
Merge "Fix janky scrolling for Gestures Settings." into nyc-mr1-dev
2016-07-19 20:30:12 +00:00
Doris Ling
b98a2ed989
Merge \\"Add Gestures settings to search index.\\" into nyc-mr1-dev am: bd3ac3bf22
...
am: 6f975d2430
2016-07-19 20:24:15 +00:00
Doris Ling
6f975d2430
Merge \"Add Gestures settings to search index.\" into nyc-mr1-dev
...
am: bd3ac3bf22
2016-07-19 20:21:45 +00:00
Doris Ling
bd3ac3bf22
Merge "Add Gestures settings to search index." into nyc-mr1-dev
2016-07-19 20:19:05 +00:00
Fan Zhang
b4cdc90ec7
Merge \\"Clarify string translation.\\" into nyc-mr1-dev am: 677cf28f6d
...
am: f465a1b635
2016-07-19 19:37:51 +00:00
Fan Zhang
f465a1b635
Merge \"Clarify string translation.\" into nyc-mr1-dev
...
am: 677cf28f6d
2016-07-19 19:35:06 +00:00
TreeHugger Robot
677cf28f6d
Merge "Clarify string translation." into nyc-mr1-dev
2016-07-19 19:30:44 +00:00
Doris Ling
ffb87f7e2a
Add Gestures settings to search index.
...
Add GestureSettings class to the resource map of
SearchIndeSearchIndexableResources so that the preferences in the
gestures settings will be indexed and showed up as search result.
Bug: 30169776
Change-Id: I51be9e82dc8bce93e2abd13b48ceb3cd051cbcf4
2016-07-19 11:45:03 -07:00
