jackqdyulei
12ff3e2f40
Add the specific string for the tablet device am: ba28b26105 am: c41dff3a52
...
am: d6d1578184
2016-08-26 23:02:07 +00:00
jackqdyulei
c41dff3a52
Add the specific string for the tablet device
...
am: ba28b26105
2016-08-26 00:00:05 +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
2016-08-25 02:55:01 +00:00
Doris Ling
e9541147d2
Add tablet and device product version for the Moves description text.
...
am: fd87b198b1
2016-08-25 02:33:59 +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
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
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
Adam Lesinski
701af87a68
Build with AAPT2
...
Change-Id: Ib0b4a597efae178785c308451b882196c2fb807a
2016-08-17 10:19:00 -07: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
2016-08-12 21:14:32 +00:00
Adrian Roos
cea8891d5a
Assist: Allow disabling the disclosure animation
...
am: fff9fd87bf
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
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
2016-08-09 22:45:07 +00:00
Matthew Fritze
7233ce37ee
Update support tab strings.
...
am: 4bb7854d04
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
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
2016-08-08 21:23:51 +00:00
Esteban Talavera
e3d32bb291
Update OEM unlock summary string
...
am: 63f791a1e9
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
2016-08-05 22:18:06 +00:00
Maurice Lam
cdedff01cb
Use different text in fingeprint intro for SUW
...
am: a3397cbbcc
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
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
Maurice Lam
ef48fcaf8d
Update fingerprint strings am: fcd3abd244 am: 0c4bf475b3
...
am: aecf1e79f2
2016-07-28 03:54:05 +00:00
Maurice Lam
0c4bf475b3
Update fingerprint strings
...
am: fcd3abd244
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
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
