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
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
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
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
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
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
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
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
708c6264ac
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 30202203
Change-Id: I3fefeaaa89f3c3707b1e7c84c431689733547ca4
2016-07-20 07:09:37 -07: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
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
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
Justin Klaassen
d60f09edaf
Add Night display settings conditional
...
Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
2016-07-19 14:31:46 -07:00
Mark Salyzyn
c8b1c3ec22
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28813587
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-07-19 13:59:56 -07: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
Fan Zhang
9b95b3fc3d
Clarify string translation.
...
Bug: 30196308
Clarify ringtong volume string format and add an example.
Change-Id: I52769d5d274c7502f73ac25e8e1ce9ae6d0b87a5
2016-07-19 09:40:31 -07:00
Bill Yi
89912fee23
Import translations. DO NOT MERGE
...
Change-Id: I34ef9d17f926e12706029e3825182e6dd0e1c24e
Auto-generated-cl: translation import
2016-07-18 16:43:22 -07:00
Bill Yi
e2202bff87
Import translations. DO NOT MERGE
...
Change-Id: I7d981db41c95b851c9e98f733b83dc55efb08ec0
Auto-generated-cl: translation import
2016-07-18 15:57:45 -07:00
Fan Zhang
ccc8641d71
Let talkback announce category name in Settings.
...
Bug: 30082459
Change-Id: Id88e5b6d361ebc6863a30a765323a74345657c39
2016-07-15 13:14:09 -07:00
Matthew Fritze
d5d92f4505
Merge \\"Settings ViewPager now correctly handles RTL mode\\" into nyc-mr1-dev am: b8257e6fee
...
am: b51d45aed0
2016-07-15 19:29:11 +00:00
Matthew Fritze
b51d45aed0
Merge \"Settings ViewPager now correctly handles RTL mode\" into nyc-mr1-dev
...
am: b8257e6fee
2016-07-15 19:17:07 +00:00
Matthew Fritze
b8257e6fee
Merge "Settings ViewPager now correctly handles RTL mode" into nyc-mr1-dev
2016-07-15 19:06:48 +00:00
Matthew Fritze
44564126c3
Settings ViewPager now correctly handles RTL mode
...
Previously, the settings and support tabs were incorrectly orderded,
and had inverted transitions on click and on swipe.
Ordering of tabs now correctly displays All Settings as the default,
right tab, and the Support tab to its left. The tab headers also now
function properly in transition, and onclick.
Change-Id: Iab499ee13433cb78941bc33cbb0e99ffe2937174
Fixes: 30079049
2016-07-15 11:55:53 -07:00
TreeHugger Robot
995a5144cf
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-14 20:14:21 +00:00
TreeHugger Robot
8c6822ec57
Merge "Import translations. DO NOT MERGE"
2016-07-14 14:27:13 +00:00
Andrew Sapperstein
513ebfbb02
Merge \\"Open Security Patch Bulletin\\" into nyc-mr1-dev am: 410273210d
...
am: 1d13c973bf
2016-07-14 14:13:06 +00:00
Andrew Sapperstein
1d13c973bf
Merge \"Open Security Patch Bulletin\" into nyc-mr1-dev
...
am: 410273210d
2016-07-14 13:59:18 +00:00
TreeHugger Robot
410273210d
Merge "Open Security Patch Bulletin" into nyc-mr1-dev
2016-07-14 13:49:58 +00:00
