Commit Graph

4016 Commits

Author SHA1 Message Date
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
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
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
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