André Lago
6ecc414e77
Merge "[Settings] Set different ringtones at work profile"
2016-08-19 17:02:03 +00:00
Doris Ling
706071126a
Add scrollbar to Settings app.
...
Overlay PreferenceTheme to add scrollbar to the view, and also add
scrollbar to the dashboard.
Change-Id: I2273b0825b200048bd1914923b551a593aa1e16d
Fixes: 30204662
Test: manual - Launch Settings and different sub-settings, and verify
that scrollbar is shown for screen that can be scrolled.
2016-08-18 15:58:21 -07:00
Adam Lesinski
701af87a68
Build with AAPT2
...
Change-Id: Ib0b4a597efae178785c308451b882196c2fb807a
2016-08-17 10:19:00 -07:00
Andre Lago
3e398c87f2
[Settings] Set different ringtones at work profile
...
Updated the Settings app to allow setting different default system
ringtones for work profile apps
Bug: 30658854
Change-Id: I7461be070bd4e8d86bf1fd724039e53d500094ad
2016-08-15 11:11:56 +01:00
Adrian Roos
cbd67e87de
resolve merge conflicts of 523ec54 to master
...
Change-Id: I2f31db207be03a01be7786a0c93abdbb6b84fbf6
2016-08-12 18:05:57 -07:00
Fan Zhang
26bc658a6f
Strings in a diclaimer dialog when turning on NFC. am: 9c9cadd991 am: d9f35ed984
...
am: 96f37df6d9
2016-08-12 21:14:32 +00:00
Adrian Roos
cea8891d5a
Assist: Allow disabling the disclosure animation
...
am: fff9fd87bf
2016-08-12 20:35:30 +00:00
Fan Zhang
d9f35ed984
Strings in a diclaimer dialog when turning on NFC.
...
am: 9c9cadd991
2016-08-12 20:21:30 +00:00
Fan Zhang
9c9cadd991
Strings in a diclaimer dialog when turning on NFC.
...
Bug: 30834503
Change-Id: If18fe3ae075d96fbac20751d91d10a03d3396a53
2016-08-12 11:29:16 -07:00
Adrian Roos
fff9fd87bf
Assist: Allow disabling the disclosure animation
...
Change-Id: I18a2e4144c762a0833d2384c51f916b841dfc8b3
Fixes: 30809067
2016-08-11 15:48:13 -07:00
Maurice Lam
445678f678
Merge "Remove duplicate string for fingerprint enroll"
2016-08-10 21:35:04 +00:00
TreeHugger Robot
6db9a13209
Merge "Add WiFi toggle prompts - settings"
2016-08-10 21:09:01 +00:00
Maurice Lam
56093f6f4f
Remove duplicate string for fingerprint enroll
...
Bug: 30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
2016-08-10 12:27:29 -07:00
Doris Ling
5590359376
Update Jump to Camera gesture settings description text.
...
Change "double-tap" to "press twice" as action is performed on a button.
Fixes: 30766938
Change-Id: Idc2573e1aff3f7a38b1cb6740f68c0c086fa48da
2016-08-10 10:44:33 -07:00
Matthew Fritze
5aea91c4b5
Update support tab strings. am: 4bb7854d04 am: 7233ce37ee
...
am: 7f385e2deb
2016-08-09 22:45:07 +00:00
Matthew Fritze
7233ce37ee
Update support tab strings.
...
am: 4bb7854d04
2016-08-09 22:38:49 +00:00
Matthew Fritze
4bb7854d04
Update support tab strings.
...
Bug: 30757866
Change-Id: Ia0df640e548b57ed034e97a34c396f55eb850e73
2016-08-09 22:31:56 +00:00
Geoffrey Pitsch
5faccbaa56
Boot Sounds setting in OtherSoundSettings am: 7f6d27b1ce am: 56aa7785ae
...
am: eaf998a65e
2016-08-09 20:04:27 +00:00
Geoffrey Pitsch
7f6d27b1ce
Boot Sounds setting in OtherSoundSettings
...
Uses a persistent system property so it can be accessed by bootanim.
BUG:30690353
Change-Id: Iffb7e140074b8bf4b0faabdecbbf163b14360655
2016-08-09 13:57:01 -04:00
Jorge Gil
be89e726d2
Merge "Add switch to enable downloads backup."
2016-08-09 16:40:18 +00:00
Jorge Gil
6f44493338
Add switch to enable downloads backup.
...
Bug: 30503075
Change-Id: I011d88d16ab8677b63b73e059f0edf823cc82389
2016-08-08 21:11:27 -07:00
Svetoslav Ganov
871078e91b
Add WiFi toggle prompts - settings
...
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a 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: I10d1231ea0c47eec5993dbe367cc0c245cba9385
2016-08-09 01:55:26 +00:00
Esteban Talavera
155541ee57
Update OEM unlock summary string am: 63f791a1e9 am: e3d32bb291
...
am: 6de5a2a35b
2016-08-08 21:23:51 +00:00
Esteban Talavera
e3d32bb291
Update OEM unlock summary string
...
am: 63f791a1e9
2016-08-08 20:49:24 +00:00
TreeHugger Robot
2de8fd95a3
Merge "Update OEM unlock summary string" into nyc-mr1-dev
2016-08-08 19:51:33 +00:00
Esteban Talavera
63f791a1e9
Update OEM unlock summary string
...
Bug: 30661116
Bug: 29047618
Change-Id: I4f747e29c595453d9d0263ce7fc90d37b81aa251
2016-08-08 17:29:53 +01:00
Maurice Lam
6897fe7f8f
Use different text in fingeprint intro for SUW am: a3397cbbcc am: cdedff01cb
...
am: 9743eab0c5
2016-08-05 22:18:06 +00:00
Maurice Lam
cdedff01cb
Use different text in fingeprint intro for SUW
...
am: a3397cbbcc
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
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
2016-07-28 03:54:05 +00:00
Maurice Lam
0c4bf475b3
Update fingerprint strings
...
am: fcd3abd244
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
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
2016-07-26 22:16:03 +00:00
Jeff Sharkey
aaaf41d982
Offer trampoline to help articles.
...
am: 4f425c890b
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
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
