TreeHugger Robot
bcc18fa732
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-25 16:46:08 +00:00
Fan Zhang
be6bdc9306
Add non-transparent background to dashboard items. am: 6b75a69195
...
am: 478c57eba2
2016-07-25 16:35:39 +00:00
Fan Zhang
478c57eba2
Add non-transparent background to dashboard items.
...
am: 6b75a69195
2016-07-25 16:13:25 +00:00
Robin Lee
e68d957777
Include wifi certificates in settings
...
Deleting wifi certificates isn't supported yet since cascading the
removal back into wifi configs will need some easy way of enumerating
wifi configs first.
Bug: 29208062
Change-Id: I2d9d1ea7e0974701009bfa6ea162b8bc80806639
2016-07-25 15:35:08 +01:00
Bill Yi
4f77347f7d
Import translations. DO NOT MERGE
...
Change-Id: I460a8a0f711298b1658451774c021e8d4a3d2087
Auto-generated-cl: translation import
2016-07-25 07:34:40 -07:00
Bill Yi
cfd8cee323
Import translations. DO NOT MERGE
...
Change-Id: I97c5e8e2c638eeaf9348d0319cc16a4955a7f6bc
Auto-generated-cl: translation import
2016-07-25 06:45:37 -07:00
Svetoslav Ganov
b06766f129
Add Bluetooth toggle prompts - settings
...
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
bug:28715749
Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
2016-07-22 20:08:44 -07:00
Fan Zhang
6b75a69195
Add non-transparent background to dashboard items.
...
Bug: 30297664
Change-Id: Ia6173e8b0d5852a1c454ae466886f894c72e3e5f
2016-07-22 17:14:48 -07:00
Doris Ling
3075171f13
Fix scroll issue when going from Display->Ambient Display to Moves. am: 2f92d751e0
...
am: f6578b733c
2016-07-22 22:25:36 +00:00
Doris Ling
f6578b733c
Fix scroll issue when going from Display->Ambient Display to Moves.
...
am: 2f92d751e0
2016-07-22 22:18:15 +00:00
Doris Ling
0fd853ad66
Merge "Fix scroll issue when going from Display->Ambient Display to Moves." into nyc-mr1-dev
2016-07-22 22:14:01 +00:00
Anna Galusza
2ac90ce6bf
Fix font and display size settings pages for small screens. am: 798b35ac09
...
am: c3c3d0fb44
2016-07-22 21:16:25 +00:00
Anna Galusza
c3c3d0fb44
Fix font and display size settings pages for small screens.
...
am: 798b35ac09
2016-07-22 21:13:16 +00:00
Anna Galusza
bbb844f94d
Merge "Fix font and display size settings pages for small screens." into nyc-mr1-dev
2016-07-22 21:09:35 +00:00
Daniel Nishi
4a184d4360
Add a dropdown for changing the days of retained downloads.
...
Bug: 30304998
Change-Id: I3113d58313a4badff55f79988abd7612d3bb4da5
2016-07-22 14:02:52 -07:00
Doris Ling
2f92d751e0
Fix scroll issue when going from Display->Ambient Display to Moves.
...
Move the scroll-to extra param to inside the launch intent of the doze
preference screen for it to take effect. The original extra param is
added to the preference screen itself as we were defining the fragment
to launch previously.
Change-Id: Id3e8cfbe61b46be2a5945da7e531f1a3c8b1454f
Fixes: 30262357
2016-07-22 13:28:21 -07:00
Anna Galusza
798b35ac09
Fix font and display size settings pages for small screens.
...
This was particularly broken in split-screen mode.
Bug: 29835212
Change-Id: I141f659e2d2d282d5af1ae97d6c798e53f71f766
2016-07-22 20:06:42 +00:00
Sunny Goyal
bb176aa30d
Updating the shortcut icons for Settings app am: b67291a274
...
am: b828370049
2016-07-22 01:47:10 +00:00
Sunny Goyal
b828370049
Updating the shortcut icons for Settings app
...
am: b67291a274
2016-07-22 01:42:44 +00:00
Sunny Goyal
fe9bf6d9d1
Merge "Updating the shortcut icons for Settings app" into nyc-mr1-dev
2016-07-21 18:27:33 +00:00
Sunny Goyal
b67291a274
Updating the shortcut icons for Settings app
...
Bug: 30224034
Bug: 30280907
Change-Id: I6ebf85dbf2941c1cf55e443d611655cdb765da66
2016-07-21 11:26:52 -07:00
Makoto Onuki
8e8bcb6900
Improve string comment
...
Bug 30210359
Bug 30207992
Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
2016-07-21 10:35:47 -07:00
TreeHugger Robot
2ece9e4894
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-07-21 04:32:48 +00:00
Thierry Strudel
8f3c7dd719
Merge changes from topic 'enable_persist_kernel_log' into nyc-mr1-dev
...
* changes:
Settings: trampoline persist.logd.logpersistd to logd.logpersistd
Settings: add logpersist kernel only selection
Settings: add logpersist selection (actions)
2016-07-21 04:07:25 +00:00
Bill Yi
1dc5c8bcbf
Import translations. DO NOT MERGE
...
Change-Id: I2135a4c00d05ba973eae29159fa7ab87d4dc8bd4
Auto-generated-cl: translation import
2016-07-20 20:05:32 -07: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
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
