Commit Graph

3871 Commits

Author SHA1 Message Date
TreeHugger Robot
d1f38f302e Merge "Changed information string about model" into nyc-mr1-dev 2016-09-14 20:27:54 +00:00
Salvador Martinez
d92ce3ef0c Changed information string about model
The string which contained the device
model information in settings was changed
to be more general. That way the model
information provided by the phone can be
more than just a number.

Test: Manual Inspection
Bug: 31108285
Change-Id: I7caf0a874983579b0e74240661b0d9b4df68bd74
2016-09-14 11:31:43 -07:00
Rubin Xu
ae093e2428 Show approprate text when enrolling fingerprint
Inform the user that unlocking device by fingerprint is disabled if the
device admin has disallowed it.

Bug: 27201226
Change-Id: Id1694f07a9421ebfe3c777f2a6b624a836bff2d5
2016-09-14 13:53:03 +01:00
TreeHugger Robot
c88805713d Merge "Add string for set data warning." into nyc-mr1-dev 2016-09-13 23:19:46 +00:00
Fan Zhang
d10686ff4f Add string for set data warning.
Bug: 26934313
Test: make Settings
Change-Id: I97dde849d9f0785c536b01471ab243aaccc85400
2016-09-13 12:59:22 -07:00
Felipe Leme
7358b7802f Improved storage accounting:
- Removed duplicated entry for DIRECTORY_MOVIES.
- Added DIRECTORY_DOWNLOADS to Other.
- Added unaccounted data to Other.
- Changed Other description so it mention non-visible items.

Often sub-directories of /data are populated with data that Settings
doesn't have control of (for example, on /data/ramdump), so they're more
suitable to be displayed in the "Other" section.

BUG: 31091863
Fixes: 30952263

Change-Id: Ibf54f9dd96456575109e2e281f3780da84f70d92
2016-09-13 10:49:34 -07:00
Justin Klaassen
ed765a4817 Update Night Light summary strings
Bug: 30771506
Test: Verified new strings show up in Night Light settings.
Change-Id: I36cc92d2644016f8f417daf9c06bccbe9fbd2d8c
2016-09-12 11:43:14 -07:00
Salvador Martinez
b706d4e956 Fixed Sound Settings summary text
The summary for Sound settings was not
descriptive enough when the volume was set
to 0% so additional strings were added. Now
it will change let you know the status
of the ringer and vibration settings when
at 0% volume. Espresso tests added to test
that text is properly updated in each of
these states.

Test: make SettingsTests
Bug: 31099179
Change-Id: Id49e2d0c4b7ac0f17efcdaf31de48d5eb678ca46
2016-09-06 17:23:50 -07:00
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