Maurice Lam
cdedff01cb
Use different text in fingeprint intro for SUW
...
am: a3397cbbcc
Change-Id: Ia875f59977e855fb75d29368e2661219e6da63e8
2016-08-05 22:12:20 +00:00
Maurice Lam
297be6c350
Merge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev
2016-08-05 22:06:30 +00:00
Doris Ling
e3f691c310
Revert change to move Display->Ambient Display to Moves->Quick screen check. am: 9b3000d8ac
am: ded92189c2
...
am: e3f166432e
Change-Id: Ia218a5738c6d08d84d26c61d874cdfe58c08425f
2016-08-05 21:14:00 +00:00
Maurice Lam
a3397cbbcc
Use different text in fingeprint intro for SUW
...
Bug: 30681287
Change-Id: Idd03b96c9447523f3128e559be213d89691f4ce1
2016-08-05 12:06:05 -07:00
Doris Ling
9b3000d8ac
Revert change to move Display->Ambient Display to Moves->Quick screen
...
check.
1. Add back original toggle for Display->Ambient Display and revert
summary text.
2. Remove Moves->Quick screen check preference and related scroll logic.
3. Remove ambient display related animation videos
Bug: 30686297
Change-Id: Ie01a201f0a8deb0a858bc2a7f9cc607b749ab6e4
2016-08-05 11:36:33 -07:00
Jorim Jaggi
bbf6e5e0c5
resolve merge conflicts of 4c839a5
to master
...
Change-Id: Ie02e2b015c03512615fa25a0f4f0e955fd6910be
2016-08-02 22:26:55 +02:00
Jorim Jaggi
984079442f
Show progress user unlocking is delayed
...
Sometimes it takes a while to unlock a user, for example, after an OTA.
In these cases, we show a progress bar in FallbackHome so the user knows
that something is happening.
Fixes: 30213213
Change-Id: Ie36a9b3107c32ff46a8890818d1f26ccf310ee6c
2016-08-02 20:02:42 +02:00
Robin Lee
232f057df0
Futureproof trusted credentials for multiple profiles
...
Made use of the shiny LayoutTransition.CHANGING animations. Now it's a
little more obvious where things are going when tapping a header.
Future work: maybe show the usernames / user icons in there too? This
could get complicated, and it'll need to be done everywhere at once.
Change-Id: Id7396235abe6218d591d16db91af0f56a83a7bcd
Fix: 28310002
2016-08-02 12:12:14 +01:00
Maurice Lam
ef48fcaf8d
Update fingerprint strings am: fcd3abd244
am: 0c4bf475b3
...
am: aecf1e79f2
Change-Id: Ifd982ed2f383d56828af57ff850ca0874ed9969d
2016-07-28 03:54:05 +00:00
Maurice Lam
0c4bf475b3
Update fingerprint strings
...
am: fcd3abd244
Change-Id: If605afa35dd4256f1b1374e3908842d10925a727
2016-07-28 03:44:34 +00:00
Maurice Lam
3edc1645a5
Merge "Update fingerprint strings" into nyc-mr1-dev
2016-07-28 03:37:19 +00:00
Maurice Lam
fcd3abd244
Update fingerprint strings
...
Bug: 30443091
Change-Id: I1634a97090147cd19dd3fd65eef06ebc401ddd1b
2016-07-28 01:16:09 +00:00
Justin Klaassen
fb08eec56b
Night display settings UI v2 am: 7335b6505d
am: 2902f61b16
...
am: c1fcbbe51c
Change-Id: I5e37c64ad46a10f0671730bf85f14bc6e24be7ae
2016-07-28 00:24:57 +00:00
Justin Klaassen
7335b6505d
Night display settings UI v2
...
Bug: 30155646
Change-Id: I912e90e5ec5e8d7426c68484da8396219a40c5ad
2016-07-27 12:10:51 -07:00
Daniel Nishi
83c895549d
Merge "Add a dropdown for changing the days of retained downloads."
2016-07-27 16:52:58 +00:00
Jeff Sharkey
fa35b19603
Offer trampoline to help articles. am: 4f425c890b
...
am: aaaf41d982
Change-Id: Ib10ccc2348f1fa9d5687941c38ca7f28fcb0465e
2016-07-26 22:16:03 +00:00
Jeff Sharkey
aaaf41d982
Offer trampoline to help articles.
...
am: 4f425c890b
Change-Id: I142124d64548bbd5c4dda19fab59e9a337c90226
2016-07-26 22:10:44 +00:00
Jeff Sharkey
fc86ca6f0d
Merge "Offer trampoline to help articles." into nyc-mr1-dev
2016-07-26 21:52:06 +00:00
Jeff Sharkey
4f425c890b
Offer trampoline to help articles.
...
This allows other parts of the system internals to re-use common
logic for building help links, and it allows all help links to live
in a single common overlay.
Adds a help link slot for "Android is upgrading" notification.
Bug: 30033319, 30122837
Change-Id: I7dec3e63cfb8c7a8ee9a562cc61cb70f3f99fdae
2016-07-25 16:45:15 -06:00
Svetoslav Ganov
0c9f05fe26
Merge "Add Bluetooth toggle prompts - settings"
2016-07-25 18:43:40 +00:00
Makoto Onuki
a6a4dc70d2
Improve string comment am: 8e8bcb6900
...
am: 282e662b4e
Change-Id: I91ca85dba7dc1aba8645d66f0db7c49aa8fbb122
2016-07-25 18:36:22 +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
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
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
Makoto Onuki
8e8bcb6900
Improve string comment
...
Bug 30210359
Bug 30207992
Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
2016-07-21 10:35:47 -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
Change-Id: Iff841d790e9c840a5b24c82740b802d538c930e1
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
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
.
Change-Id: Ie57507b0d6ca76ba9b77836bc4e133f27a3664c7
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
Change-Id: I7c6719cbaf70bf9ff92e7880020d977dbcdd685b
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
.
Change-Id: I2d3069eb5b23aa7df3fc1efc2eb085b493b5564c
2016-07-21 00:55:21 +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
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
Change-Id: I76473c677d5b1be97ec78ac084325a6939b02e2e
2016-07-20 19:51:17 +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
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
Change-Id: I64c13bb813f12cff6786a1021647b65bc226e384
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
Change-Id: I87eac5dab4a2c1bb46a894e44fa1e75ba31ac49d
2016-07-20 02:54:20 +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
Fan Zhang
b4cdc90ec7
Merge \\"Clarify string translation.\\" into nyc-mr1-dev am: 677cf28f6d
...
am: f465a1b635
Change-Id: I85e0dcbc16915bfe3f2480078576113c31ac0626
2016-07-19 19:37:51 +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
Jeff Sharkey
99d9a1d34d
Merge \\"Preemptively add string for direct boot dialogs.\\" into nyc-mr1-dev am: 93cbd71610
...
am: 1a16dd8e0f
Change-Id: I9d8b91d4328a081a82402c85a3a911a32263496b
2016-07-14 04:36:09 +00:00
Jeff Sharkey
93cbd71610
Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev
2016-07-14 04:31:36 +00:00