Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,312 Commits 1 Branch 0 Tags
6a51dfdcf348518260d98c780dee9682e2d48814
Commit Graph

3863 Commits

Author SHA1 Message Date
TreeHugger Robot
1721e4510f Merge "Implement Web Action settings" into nyc-mr1-dev 2016-08-31 02:20:47 +00:00
Geoffrey Pitsch
1ff11c5ef0 Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev 2016-08-29 13:06:21 +00:00
Doris Ling
fec320324c Re-enable Ambient Display double tab. 
Restoring the changes to move Display->Ambient Display to Moves->Quick screen

This reverts commit 9b3000d8ac, except for
the removal of res/raw/gesture_ambient_move_lift.mp4

Test: Manual - Go to Settings->Display->Quick screen check and verify
the preference is restored.

Bug: 30595437
Change-Id: Ie50bcebd119714d49422b7139d0d0234f27584e2
 2016-08-26 14:46:03 -07:00
Lei Yu
5d825bc3f3 Merge "Add the specific string for the tablet device" into nyc-mr1-dev 2016-08-25 23:48:50 +00:00
jackqdyulei
ba28b26105 Add the specific string for the tablet device 
Bug: 30761670

Add "product=default" in support_disclaimer_content to prevent crash
when merging down to master branch.

Change-Id: Ib9ce94288ca4cf13514ba2af64031bd3ecafab7f
 2016-08-25 15:04:12 -07:00
Todd Kennedy
d5824967ee Implement Web Action settings 
Users can enable / disable Web Action from "Opening links" under
the apps setting.

Bug: 28140107
Change-Id: I4ed4b77953952a56316b780a54a482d0c564cbe4
Test: manual testing of the settings app
 2016-08-25 12:56:37 -07:00
TreeHugger Robot
a40300e753 Merge "Add tablet and device product version for the Moves description text." into nyc-mr1-dev 2016-08-25 02:27:14 +00:00
Doris Ling
fd87b198b1 Add tablet and device product version for the Moves description text. 
Provide corresponding version of the string device/phone/tablet
according to the product type.

Change-Id: I9f1e47b88ee0d72bb52b588f781470922ba572c2
Fixes: 30946424
 2016-08-24 17:52:56 -07:00
Maurice Lam
993d37749e Merge "Remove duplicate string for fingerprint enroll" into nyc-mr1-dev 2016-08-23 22:19:57 +00:00
Maurice Lam
64ac93ba40 Remove duplicate string for fingerprint enroll 
Bug: 30661068
Change-Id: Id8ba9eee04eded2c85535a577ac0f5a83034ce96
(cherry picked from commit 56093f6f4f)
 2016-08-23 20:57:28 +00:00
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
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
TreeHugger Robot
404104a6a8 Merge "Assist: Allow disabling the disclosure animation" into nyc-mr1-dev 2016-08-12 20:28:11 +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
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
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
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
297be6c350 Merge "Use different text in fingeprint intro for SUW" into nyc-mr1-dev 2016-08-05 22:06:30 +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
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
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
7335b6505d Night display settings UI v2 
Bug: 30155646
Change-Id: I912e90e5ec5e8d7426c68484da8396219a40c5ad
 2016-07-27 12:10:51 -07: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
Makoto Onuki
8e8bcb6900 Improve string comment 
Bug 30210359
Bug 30207992

Change-Id: I27f8166b4fbd8f3b3e01c71e1fcc114c2a713231
 2016-07-21 10:35:47 -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
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
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
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
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
93cbd71610 Merge "Preemptively add string for direct boot dialogs." into nyc-mr1-dev 2016-07-14 04:31:36 +00:00
Jeff Sharkey
10b6d4d220 Preemptively add string for direct boot dialogs. 
Bug: 27196876
Change-Id: Ieb65b4b7b4e075c1de2e502d0272f8f113c1c34b
 2016-07-14 04:31:08 +00:00
TreeHugger Robot
31e5d5bb4b Merge "Add content description to escalation card title." into nyc-mr1-dev 2016-07-13 23:29:46 +00:00
TreeHugger Robot
bb15f3d14f Merge "Change "ringer volume" to "ring volume"" into nyc-mr1-dev 2016-07-13 22:13:27 +00:00