Commit Graph

11849 Commits

Author SHA1 Message Date
Fan Zhang
a6f821c015 Tether screen cleanup
am: 20ae31e87c

Change-Id: I5294531666526a05d07db15ff208eedec3504970
2017-05-24 22:48:55 +00:00
Fan Zhang
20ae31e87c Tether screen cleanup
- Add a summary placeholder reserving 2 lines for wifi tether pref
- Replace DividerPreference with regular Preference

Change-Id: I2e0c36f27abe2c17625d00d80c816b526f59a6fd
Fix: 37518463
Test: visual
(cherry picked from commit d80117dcea)
2017-05-24 19:59:15 +00:00
Matthew Fritze
934a04509f Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev
am: ae0886c9f7

Change-Id: I29ca4bdf7ad579699283fe4adde2ad22439d7ce9
2017-05-24 17:16:01 +00:00
TreeHugger Robot
ae0886c9f7 Merge "Revert "Revert "Replace dynamic summary text for SettingPref""" into oc-dev 2017-05-24 17:12:35 +00:00
jackqdyulei
6870de6772 Merge "Update the strings for "show all apps"" into oc-dev
am: 4e0f69c10c

Change-Id: I86150368f09801e90263fc099d4e0a703029dac2
2017-05-24 00:54:40 +00:00
TreeHugger Robot
4e0f69c10c Merge "Update the strings for "show all apps"" into oc-dev 2017-05-24 00:49:50 +00:00
TreeHugger Robot
20748da300 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-24 00:10:59 +00:00
Matthew Fritze
c9f9961d8d Merge "Remove duplicates in Security Settings" into oc-dev
am: 96a8dffafb

Change-Id: I1e987af06d086fd971e2865d5fa854b58ce0e409
2017-05-23 22:21:18 +00:00
jackqdyulei
3b1a964629 Update the strings for "show all apps"
Bug: 38328724
Test: Screenshot
Change-Id: If48ff26f691795dcf206346af6a9a0be62bbf733
2017-05-23 15:17:41 -07:00
TreeHugger Robot
96a8dffafb Merge "Remove duplicates in Security Settings" into oc-dev 2017-05-23 22:13:38 +00:00
Bill Yi
e9b047e305 Import translations. DO NOT MERGE
Change-Id: I82f35157c3d1396be572d690b559ebfb6fa9910f
Auto-generated-cl: translation import
2017-05-23 15:05:15 -07:00
Matthew Fritze
c1e9f8787f Revert "Revert "Replace dynamic summary text for SettingPref""
This reverts commit 8061aaef62.
Test: make RunSettingsRoboTests
Fixes: 36101902
Change-Id: Ide74780153fc7f36d897f559c7a3c138190e3320
2017-05-23 22:04:58 +00:00
Matthew Fritze
3a50f5c290 Remove duplicates in Security Settings
Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6
2017-05-23 17:44:35 +00:00
Daniel Nishi
4525f9387a Merge "Fix storage summary background colors." into oc-dev
am: 8b8f27cd06

Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951
2017-05-23 17:41:21 +00:00
Daniel Nishi
8b8f27cd06 Merge "Fix storage summary background colors." into oc-dev 2017-05-23 17:35:19 +00:00
Geoffrey Pitsch
984dad4ac6 Merge "Developer setting to enable notification channel warnings" into oc-dev
am: 77bb0aaf96

Change-Id: I571de55e0b3d090ec2442e2019b2a460b0185283
2017-05-23 15:24:09 +00:00
Geoffrey Pitsch
e18fd90524 Developer setting to enable notification channel warnings
Defaults to enabled for debuggable builds

Fixes: 37945054
Fixes: 38380608
Test: manual
Change-Id: I5d2101feffa7cf4433264eefc82b1b80f294d9f0
2017-05-22 11:29:18 -04:00
Matthew Fritze
5569e3a33f Merge "Remove Language and Input duplicates" into oc-dev
am: 6f4a6a737d

Change-Id: Id6639a9dc08c1a27cf1bc4ed7969cc54a4bd2df2
2017-05-19 00:49:41 +00:00
TreeHugger Robot
6f4a6a737d Merge "Remove Language and Input duplicates" into oc-dev 2017-05-19 00:41:04 +00:00
Daniel Nishi
af1a66202f Merge "Make Storage settings title be "Storage"." into oc-dev
am: c7299663e7

Change-Id: I2873188fb073261695d79719c99617a355f17acc
2017-05-18 22:07:24 +00:00
Daniel Nishi
c7299663e7 Merge "Make Storage settings title be "Storage"." into oc-dev 2017-05-18 21:57:22 +00:00
TreeHugger Robot
6253e0710b Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-18 20:05:21 +00:00
jackqdyulei
3ab2ca5cc9 Merge "Add screen usage string for battery settings" into oc-dev
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f
2017-05-18 19:25:57 +00:00
TreeHugger Robot
28cf04d994 Merge "Add screen usage string for battery settings" into oc-dev 2017-05-18 19:10:16 +00:00
Daniel Nishi
12dbce00c1 Fix storage summary background colors.
This changes the donut background color to a lighter blue and changes
the overall background to be a grey. Both of these colors match the
Battery implementation.

Bug: 35245772
Test: Manual
Change-Id: I8e12afe4434a0e2428384fc496cab5c05dc998ee
2017-05-18 11:36:10 -07:00
Daniel Nishi
0d03b88e91 Make Storage settings title be "Storage".
This more closely reflects the idea that the top level setting title
should match the actual screen title.

Change-Id: Ie7ab1756d799c182cad74041995768037bba710f
Fixes: 37923462
Test: Manual
2017-05-18 11:02:10 -07:00
Matthew Fritze
b97a1bffa8 Remove Language and Input duplicates
Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: Ifeb2a2d34a3efded3f0a9ba02ac76fd6f8ffd087
Merged-In: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
2017-05-18 17:36:59 +00:00
Matthew Fritze
145c364479 Merge "Update no search results icon and move image to top of page" into oc-dev
am: fc4db3bd80

Change-Id: I6f387cf748a9e916e4ffd3312016b0a82e126ee2
2017-05-18 17:18:30 +00:00
TreeHugger Robot
fc4db3bd80 Merge "Update no search results icon and move image to top of page" into oc-dev 2017-05-18 17:11:29 +00:00
Bill Yi
63c87dabb6 Import translations. DO NOT MERGE
Change-Id: I79790dae43f96a35c56970f27acb47ba689f731e
Auto-generated-cl: translation import
2017-05-17 22:58:00 -07:00
Matthew Fritze
b4f2f81f27 Update no search results icon and move image to top of page
Change-Id: Ib57bdc49095091ff6e432be922da676806ee3e2f
Fixes: 36597112
Test: search for "aaa" and observe image
2017-05-17 16:24:27 -07:00
jackqdyulei
7548f1fa77 Add screen usage string for battery settings
In advanced battery page we still use "Used for"

Bug: 38328647
Test: Build & Screenshot
Change-Id: Ic194bfed45a76c811c431a13b5554f5bc978bca5
2017-05-17 13:14:45 -07:00
Matthew Fritze
a939959838 Merge "Remove duplicates from sound settings" into oc-dev
am: 3abeba07d3

Change-Id: Ief8e333082ef6d8064a51fc54b052e1476880a55
2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3 Merge "Remove duplicates from sound settings" into oc-dev 2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 2017-05-17 18:28:35 +00:00
Matthew Fritze
70db53a8d5 Merge "Remove Legal Information duplicate from Settings search" into oc-dev
am: 915f0cea5b

Change-Id: I508afeb3b832ffc444fa5dafe4836fc0ae202eb0
2017-05-17 17:26:07 +00:00
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +00:00
Matthew Fritze
f8b8ecebea Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
am: bcb2565e05

Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
2017-05-17 04:46:15 +00:00
TreeHugger Robot
bcb2565e05 Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref"
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
2017-05-17 02:56:28 +00:00
Matthew Fritze
06976317cb Remove duplicates from sound settings
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
2017-05-16 15:58:54 -07:00
Matthew Fritze
6fe35bb031 Remove Backup and Reset duplicates from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
2017-05-16 15:43:21 -07:00
Matthew Fritze
2e89758b01 Remove Legal Information duplicate from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
2017-05-16 15:39:03 -07:00
TreeHugger Robot
e11a4d4e86 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-16 18:29:40 +00:00
Bill Yi
dcdc60bab8 Import translations. DO NOT MERGE
Change-Id: Ia166bd3b3e8acd794f43e415b15edbb579c54573
Auto-generated-cl: translation import
2017-05-16 01:42:58 -07:00
Matthew Fritze
1f21e7f325 Merge "Replace dynamic summary text for SettingPref" into oc-dev
am: 49b86b5c6a

Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
2017-05-16 00:12:07 +00:00
TreeHugger Robot
49b86b5c6a Merge "Replace dynamic summary text for SettingPref" into oc-dev 2017-05-15 23:46:18 +00:00
Bill Yi
3b2d98c714 Import translations. DO NOT MERGE
Change-Id: I2906d6bf999dccdec191f285f73e04fe52f4c2a4
Auto-generated-cl: translation import
2017-05-12 17:11:09 -07:00
Julia Reynolds
237eb88434 Merge "Notification settings, importance and pre-O apps" into oc-dev
am: 6393e1752f

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
2017-05-12 12:20:36 +00:00