Commit Graph

4449 Commits

Author SHA1 Message Date
Doris Ling
124251d54e 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-23 10:46:06 -07:00
Doris Ling
8d9b89ed5c 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
(cherry picked from commit 5590359376)
2016-08-19 21:25:37 +00:00
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
Geoffrey Pitsch
fd351eaaf1 Only show BootSounds preference if has_boot_sounds is true.
Defaults to false, to be overridden in device values.

Bug:30888962
Change-Id: I563b15b793f1a214598bb7b5a3d9dc9cf3af0d10
2016-08-16 14:34:38 -04: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

Change-Id: I863f523633a9c3e5968aeb78f0239ea40db97718
2016-08-12 21:14:32 +00:00
Adrian Roos
cea8891d5a Assist: Allow disabling the disclosure animation
am: fff9fd87bf

Change-Id: I625b96295a9f39704f2016903f4cfc063613122f
2016-08-12 20:35:30 +00:00
TreeHugger Robot
404104a6a8 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev 2016-08-12 20:28:11 +00:00
Fan Zhang
d9f35ed984 Strings in a diclaimer dialog when turning on NFC.
am: 9c9cadd991

Change-Id: Ic71699bbc33fca59c29abd8c7e3804975ceca9db
2016-08-12 20:21:30 +00:00
TreeHugger Robot
f22f7e8b53 Merge "Strings in a diclaimer dialog when turning on NFC." into nyc-mr1-dev 2016-08-12 19:58:27 +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

Change-Id: Idb5d35bac7990f1bbb7fd4cfdebea1777d4c342c
2016-08-09 22:45:07 +00:00
Matthew Fritze
7233ce37ee Update support tab strings.
am: 4bb7854d04

Change-Id: Iac65f5356686c450a2b20db151fb39496b6a89ba
2016-08-09 22:38:49 +00:00
Matthew Fritze
623650c898 Merge "Update support tab strings." into nyc-mr1-dev 2016-08-09 22:35:26 +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

Change-Id: Ic9e9704c93d046f3babf76798b0a138acc1fbdc0
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

Change-Id: I73cb4e90e0dc902cbf92bbe7c37957f71425ff07
2016-08-08 21:23:51 +00:00
Esteban Talavera
e3d32bb291 Update OEM unlock summary string
am: 63f791a1e9

Change-Id: I8cc34021241e2abdb55aafb4c313e79d68d02ef2
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

Change-Id: Idbb29712eef9ff1f65f9e93b980c9cd4a67a5374
2016-08-05 22:18:06 +00:00
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