Commit Graph

6033 Commits

Author SHA1 Message Date
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
Fan Zhang
5a0ab072f0 Add string for set data warning.
am: d10686ff4f

Change-Id: I6b923a13339955e8c5a22da4258390e0a85ad2b5
2016-09-13 23:22:10 +00:00
TreeHugger Robot
c88805713d Merge "Add string for set data warning." into nyc-mr1-dev 2016-09-13 23:19:46 +00:00
Felipe Leme
3b0a9cb54f Improved storage accounting: am: 7358b7802f am: 49260969b7
am: 1469dde1a0

Change-Id: I2cb0e03aab3c79bde080ea3b73a1ad31c72d5cfa
2016-09-13 21:35:33 +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
e0f4cafe07 Update Night Light summary strings am: ed765a4817 am: 82926aebdf
am: aaf0bc56ab

Change-Id: I25da4ef00be6a5e9651073572ae51b6f2884f669
2016-09-12 22:00:00 +00: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
923534f641 resolve merge conflicts of 8ec7028 to master
Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630
2016-09-07 10:24:03 -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
cd3ba14277 Merge "Update Bluetooth toggle UI to UX spec - settings" 2016-09-02 03:37:14 +00:00
Svet Ganov
0cf1298a44 Update Bluetooth toggle UI to UX spec - settings
Change-Id: I171d3e55e8a480d304e4dc4e0debbd2f3ab27651
2016-09-01 16:47:09 -07:00
Andreas Gampe
ada98fb5b3 resolve merge conflicts of d30af7c to master
Change-Id: I3484e0e6c2a092f05539af569a9d9131f006ecf1
2016-08-30 20:36:50 -07:00
Todd Kennedy
1fc2e5dcb7 Implement Web Action settings
am: d5824967ee

Change-Id: Ibd54894d1c71d835931e0b0296add2b1a010cde5
2016-08-31 02:25:37 +00:00
TreeHugger Robot
1721e4510f Merge "Implement Web Action settings" into nyc-mr1-dev 2016-08-31 02:20:47 +00:00
Geoffrey Pitsch
75dc84c85e Only show BootSounds preference if has_boot_sounds is true. am: fd351eaaf1 am: de67bc9d68
am: 93352a4451

Change-Id: I6fe28d8c40bd254458121f1bea3c23b567f36b18
2016-08-29 13:39:23 +00:00
Geoffrey Pitsch
de67bc9d68 Only show BootSounds preference if has_boot_sounds is true.
am: fd351eaaf1

Change-Id: Iac1ce93f1c9cb063162c2eab14774b720b4eb4e8
2016-08-29 13:12:23 +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
d0c7de09f0 Re-enable Ambient Display double tab. am: fec320324c am: 6bc8858379
am: 5d4c701707

Change-Id: I01c2e3a4a207f0338744228171a0cee7ff6bfbab
2016-08-27 00:33:28 +00:00
jackqdyulei
12ff3e2f40 Add the specific string for the tablet device am: ba28b26105 am: c41dff3a52
am: d6d1578184

Change-Id: I54d02f3f3d580b95a1e1bed57a356b75ae5e6bb1
2016-08-26 23:02:07 +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
jackqdyulei
c41dff3a52 Add the specific string for the tablet device
am: ba28b26105

Change-Id: Id0060403b2b094f7033457b1426d8641f7e97ec9
2016-08-26 00:00:05 +00: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
André Lago
597e0d8c36 Merge "[Settings App] Fix char_limit of some strings" 2016-08-25 18:07:39 +00:00
Andre Lago
64d8fdf459 [Settings App] Fix char_limit of some strings
Fix: 31032014
Fix: 30999277
Fix: 31002562
Fix: 31001271
Fix: 30996418
Fix: 31000455
Change-Id: I0616b02087e05d7f5a4691ab0954bec67f25c84b
2016-08-25 15:02:41 +00:00
Doris Ling
f62a038834 Add tablet and device product version for the Moves description text. am: fd87b198b1 am: e9541147d2
am: 20322f4ec3

Change-Id: I7cc35952c11fc8ceb8dda5e7d801db8c0d01ffb8
2016-08-25 02:55:01 +00:00
Doris Ling
e9541147d2 Add tablet and device product version for the Moves description text.
am: fd87b198b1

Change-Id: Ia2a7efb92cde0d344c2ecd4b674794d362ef713a
2016-08-25 02:33:59 +00: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
e0c8fcf453 Remove duplicate string for fingerprint enroll
am: 64ac93ba40

Change-Id: Id49d79278ad68b0b49194576467b5e0714c55c89
2016-08-23 22:23:00 +00: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
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