Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,933 Commits 1 Branch 0 Tags
8b91ae0caab1ddd9da1b3bd4d2b010d391afa59e
Commit Graph

3115 Commits

Author SHA1 Message Date
Jeff Sharkey
99d9a1d34d Merge \\"Preemptively add string for direct boot dialogs.\\" into nyc-mr1-dev am: 93cbd71610 
am: 1a16dd8e0f

Change-Id: I9d8b91d4328a081a82402c85a3a911a32263496b
 2016-07-14 04:36:09 +00: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
Fan Zhang
810a21843e Merge \\"Add content description to escalation card title.\\" into nyc-mr1-dev am: 31e5d5bb4b 
am: 458024f52e

Change-Id: Iddab902a2077e4aece42c3536f2dbb537febdd4c
 2016-07-14 00:01:21 +00:00
Mike Tsao
3191dbe334 Merge \\"Change \\"ringer volume\\" to \\"ring volume\\"\\" into nyc-mr1-dev am: bb15f3d14f 
am: 0311342bc8

Change-Id: I23928c43b7fd8a74f8bfc049958fed54658fc24e
 2016-07-14 00:01:20 +00:00
Mike Tsao
e572577acf Merge \\"Rename Night display to Night Light\\" into nyc-mr1-dev am: 6d0ed88746 
am: 28ca7419c9

Change-Id: I3b473ec764e35fa248ae21a0996272a5b1556522
 2016-07-14 00:01:19 +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
TreeHugger Robot
6d0ed88746 Merge "Rename Night display to Night Light" into nyc-mr1-dev 2016-07-13 22:01:19 +00:00
Matthew Fritze
40b1de8f52 Merge \\"Update summary and title strings for Settings Suggestions\\" into nyc-mr1-dev am: 5d8b432137 
am: a2f07b0475

Change-Id: I1e5b49528839a66ba9c1f9c52553f6a579cf61e5
 2016-07-13 21:24:45 +00:00
Matthew Fritze
5d8b432137 Merge "Update summary and title strings for Settings Suggestions" into nyc-mr1-dev 2016-07-13 21:03:34 +00:00
Matthew Fritze
d50ff42d86 Merge \\"Update Safety & Regulatory Information link text\\" into nyc-mr1-dev am: 38415ff361 
am: 989a536667

Change-Id: I907c7f5aa7519aab4e8f6b1030ca7d24929ff90f
 2016-07-13 20:59:35 +00:00
Matthew Fritze
38415ff361 Merge "Update Safety & Regulatory Information link text" into nyc-mr1-dev 2016-07-13 20:52:45 +00:00
Fan Zhang
0bd87d71b8 Add content description to escalation card title. 
Bug: 30079904

In strings like "We're here for you 24/7", to avoid talkback read 24/7
as 24/7ths, we need to provide a custom content description.

Change-Id: If51586d97a376e7a859658d7a6dc48108094ddc2
 2016-07-13 13:47:04 -07:00
Mike Tsao
a49178a487 Change "ringer volume" to "ring volume" 
Bug: 29565896

Changes all occurrences of "ringer volume" to "ring volume" in
Settings string file, including in comments.

Change-Id: Iad197dbbbbec16120fcd3ac835c1647a7f4c0c32
 2016-07-13 12:52:32 -07:00
Mike Tsao
36dc6a8b28 Rename Night display to Night Light 
Bug: 30069874
Bug: 29584858

Renames generic "Night display" to "Night Light." Also changes feature
description to emphasize suitability for reading at night.

Change-Id: Ib54a22d7683853d7aadf4fe48795aaaa990b0333
 2016-07-13 12:31:38 -07:00
TreeHugger Robot
a4e3c14848 Update summary and title strings for Settings Suggestions 
Setting Suggestion messages have new strings for NDR.

Change-Id: I5e76e669fac91b61a2207bb2937c107c952768c0
Fixes: 30067406
 2016-07-12 18:39:19 -07:00
Doris Ling
336d5bfaa4 Merge \\"Update preference ordering in Gestures settings.\\" into nyc-mr1-dev am: 22176641b2 
am: cd82ff3092

Change-Id: I605de86a2a218a40598e29c0ae050274e0ed1278
 2016-07-12 23:51:03 +00:00
Doris Ling
e95c01705c Merge \\"Update resource string for gestures settings.\\" into nyc-mr1-dev am: 4410b6b663 
am: 0a86720e19

Change-Id: I790175513041954dad3583ca1f1d40566e617ebc
 2016-07-12 23:51:02 +00:00
Doris Ling
22176641b2 Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev 2016-07-12 23:38:02 +00:00
Doris Ling
4410b6b663 Merge "Update resource string for gestures settings." into nyc-mr1-dev 2016-07-12 23:37:38 +00:00
Doris Ling
1093b24c1b Update preference ordering in Gestures settings. 
Swapped the fingerprint swipe and ambient display preference in
Settings->Gestures, and updated the summary text in Display->Ambient
display

Bug: 30073941
Change-Id: Ifc386b4ab9b0e7317f1ee0e477f9670e8a49b0f9
 2016-07-12 11:25:47 -07:00
Matthew Fritze
d21e0e914c Update Safety & Regulatory Information link text 
The link to Safety & Regulatory Information now reads:
Safety & regulatory manual

Bug: 30037999
Change-Id: Ib72efba96b8a9a9f38bcf9686e2563d1877620a8
 2016-07-12 09:47:33 -07:00
Tony Mak
872933b55b Visualize password requirements and their fulfillment am: 0bbcdccdbf 
am: 83f3117749

Change-Id: Ifbebb87d524899d35a69de538920b46c324dc86f
 2016-07-12 13:55:55 +00:00
Tony Mak
0bbcdccdbf Visualize password requirements and their fulfillment 
1. Aggregate policies and generate the requirements
2. When user modifies the password, check is each requirement fulfilled
   Update the view accordingly.

Change-Id: I962ed3b81ce844006be1024a493e94ce52a3fdec
Fix: 24900754
 2016-07-12 11:19:45 +01:00
Tony Mak
13ad7d4078 Update work challenge strings am: 9a8e5a7f25 
am: df0dffe527

Change-Id: I6cd3f076c95e4f5548cb46b10ce06408cbd754bd
 2016-07-12 07:07:45 +00:00
Tony Mak
9a8e5a7f25 Update work challenge strings 
Change-Id: I9c938c9a9547ec92d7ba7b452861db174e421068
Fix: 29358023
 2016-07-12 06:59:11 +00:00
Makoto Onuki
8fd3c226e0 Merge \\"Restore \\"reset ShortcutManager rate limiting\\" dev option\\" into nyc-mr1-dev am: ed9aed1878 
am: 5922902ab3

Change-Id: I6452514f23d954db0d965b8b71cc03f710c30791
 2016-07-12 02:44:18 +00:00
Doris Ling
a2946481c9 Update resource string for gestures settings. 
Update the summary text for the gestures settings.

Bug: 30074265
Change-Id: I5e4313f2764aa64af8bd7b984189f2d0782a0a70
 2016-07-11 18:38:08 -07:00
Makoto Onuki
ed9aed1878 Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev 2016-07-11 17:54:27 +00:00
Doris Ling
96167c75c5 Merge \\"Change gesture settings for Ambient Display from nudge to double tap.\\" into nyc-mr1-dev am: 8ba6e6a792 
am: 67d4b38cc1

Change-Id: I7e7a0833e8cf9dfc5c2727c65a57d29e48d3974c
 2016-07-08 23:42:15 +00:00
Doris Ling
8ba6e6a792 Merge "Change gesture settings for Ambient Display from nudge to double tap." into nyc-mr1-dev 2016-07-08 23:16:36 +00:00
Doris Ling
37d247b1af Merge \\"Add summary for Settings->Gestures.\\" into nyc-mr1-dev am: f46dabcf0f 
am: 4dd0373203

Change-Id: Ib0a7afc22ef73bb3cec8f8bb44da73b9487256eb
 2016-07-08 23:11:51 +00:00
Doris Ling
f46dabcf0f Merge "Add summary for Settings->Gestures." into nyc-mr1-dev 2016-07-08 22:56:45 +00:00
Justin Klaassen
1863ffc982 resolve merge conflicts of 67b3a94 to master 
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
 2016-07-08 14:40:55 -07:00
Doris Ling
6607d49202 Change gesture settings for Ambient Display from nudge to double tap. 
Change the description text and animation video to double tap the device
instead of nudge movement. Also update the summary text in
Display->Ambient Display to match the gesture description.

Bug: 30034987
Change-Id: If95e7a417b472dd677174a8187a83594e06e0eee
 2016-07-08 14:24:42 -07:00
Doris Ling
6ae44a03e0 Add summary for Settings->Gestures. 
Add summary text for gesture settings.

Bug: 30034888
Change-Id: I15128b6e533b279ca5da98bf4f0e042dd93a0d02
 2016-07-08 14:14:35 -07:00
Justin Klaassen
c7cd2982cd Add Night display settings 
Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
 2016-07-08 11:48:02 -07:00
Makoto Onuki
0651701930 Restore "reset ShortcutManager rate limiting" dev option 
Bug 30031093

Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
 2016-07-08 09:37:48 -07:00
TreeHugger Robot
9298f8c604 Merge "Announce user credential deletions" 2016-07-07 16:54:31 +00:00
Fan Zhang
fb4c548b78 Fix strings for support tab. am: 4178710f3d 
am: caf4498597

Change-Id: Id1269070341ab353e981a640aaadecf9ee58aa34
 2016-07-07 15:40:16 +00:00
Fan Zhang
4178710f3d Fix strings for support tab. 
Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
 2016-07-07 08:27:25 -07:00
Fan Zhang
bfed632c6e Merge \\"Update escalation cards layout and data binding.\\" into nyc-mr1-dev am: eef9dbcdb9 
am: 0e2e738400

Change-Id: Iff273a832ffa46deda85223a0b627cbc5e015caf
 2016-07-01 18:36:19 +00:00
Fan Zhang
eef9dbcdb9 Merge "Update escalation cards layout and data binding." into nyc-mr1-dev 2016-07-01 18:17:38 +00:00
Daniel Nishi
53027997ff Merge \\"Update strings to match the latest mocks.\\" into nyc-mr1-dev am: 7a23b48266 
am: b582e1c7de

Change-Id: Ib45c94ed413c4e096c69c18c2125fbb67b22f2f2
 2016-07-01 00:35:51 +00:00
Daniel Nishi
7a23b48266 Merge "Update strings to match the latest mocks." into nyc-mr1-dev 2016-06-30 23:50:47 +00:00
Daniel Nishi
1fde957be1 Merge \\"Add text to the Manage Settings page to show freed storage.\\" into nyc-mr1-dev am: 8c8791a807 
am: 55f2a8a8b5

Change-Id: I7b25f572d4e10da89b29dcc339e695637f716958
 2016-06-30 21:31:57 +00:00
Daniel Nishi
8c8791a807 Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev 2016-06-30 21:17:19 +00:00
Daniel Nishi
9a761788b0 Update strings to match the latest mocks. 
Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba
 2016-06-30 14:05:22 -07:00
Fan Zhang
016bd60491 Update escalation cards layout and data binding. 
Bug: 29397123

- Updated the UI for support escalation cards so different state have
  the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
  UI between escalation cards and support tiles are different enough
  that it no longer makes sense to share the same data object.

Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c
 2016-06-30 13:57:22 -07:00