Commit Graph

11871 Commits

Author SHA1 Message Date
Matthew Fritze
6a50c4555c Merge "Remove dynamic summary from Security Patch info" into oc-dev
am: 564d90faf0

Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
2017-05-31 22:47:27 +00:00
TreeHugger Robot
564d90faf0 Merge "Remove dynamic summary from Security Patch info" into oc-dev 2017-05-31 22:41:28 +00:00
TreeHugger Robot
76e9bd72f9 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-31 18:18:05 +00:00
Matthew Fritze
2b562f84b6 Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes: 36101902
Test: builds :)
2017-05-31 09:53:07 -07:00
Bill Yi
ac0b0b8ae2 Import translations. DO NOT MERGE
Change-Id: I26a4e18c3186ee2388da40e2bf1232314f944813
Auto-generated-cl: translation import
2017-05-31 07:24:59 -07:00
Hugo Benichi
5716f6cc7e Merge "Wifi details page: sign-in uses primary color" into oc-dev
am: 0c5573a0e3

Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
2017-05-31 00:27:43 +00:00
Hugo Benichi
0c5573a0e3 Merge "Wifi details page: sign-in uses primary color" into oc-dev 2017-05-31 00:16:43 +00:00
Matthew Fritze
53c8d6c2b2 Merge "Location summary is no longer indexed" into oc-dev
am: fed6e817a5

Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
2017-05-30 20:38:57 +00:00
TreeHugger Robot
fed6e817a5 Merge "Location summary is no longer indexed" into oc-dev 2017-05-30 20:24:23 +00:00
Matthew Fritze
a223355c8f Location summary is no longer indexed
Change-Id: I794e52b2f18e6e79033fbdaf2643209714b88025
Fixes: 38254258
Test: Search "mode" -> no summary text
2017-05-30 09:58:55 -07:00
Hugo Benichi
484140ba6e Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug: 36203355
Bug: 36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
2017-05-29 22:22:27 +09:00
Christine Franks
f51db28428 Merge "Align settings seekbar to match other preferences" into oc-dev
am: 532a88dcd0

Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
2017-05-26 20:18:28 +00:00
Christine Franks
e85452fc7f Align settings seekbar to match other preferences
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.

Bug: 62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.

Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299
2017-05-26 10:50:06 -07:00
Suprabh Shukla
7f550afc37 Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev
am: 136a3da4a3

Change-Id: I82ce91a75cc84ef02ae6beead23195bfdec0234f
2017-05-26 01:18:05 +00:00
TreeHugger Robot
136a3da4a3 Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev 2017-05-25 23:18:01 +00:00
Fan Zhang
e8e23081fa Merge "Show setting for work profile lock screen notification" into oc-dev
am: 5bb87f9f34

Change-Id: Ie351c759cd700dc6d4ad28cee65d9106f491a59d
2017-05-25 23:16:54 +00:00
TreeHugger Robot
5bb87f9f34 Merge "Show setting for work profile lock screen notification" into oc-dev 2017-05-25 22:41:07 +00:00
Alison Cichowlas
a974b8c595 Merge "Update notification settings to match Notification Dot branding." into oc-dev
am: ed8b39fe60

Change-Id: I51475f91a6e2de11c909169ebc5280b1c0e768b5
2017-05-25 20:09:22 +00:00
TreeHugger Robot
ed8b39fe60 Merge "Update notification settings to match Notification Dot branding." into oc-dev 2017-05-25 20:06:28 +00:00
Fan Zhang
879f079e04 Show setting for work profile lock screen notification
- Add work profile notification setting to security_lockscreen_setting
- Modify the preference controller to stop hardcode preference keys.

Merged-In: I779590e34c1eca2dab5b62dda473cfa4371fc064
Change-Id: I5966d82f6373b3bf784385423b87fb4d26aecf0e
Fix: 62051309
Fix: 62045663
Test: make RunSettingsRoboTests
2017-05-25 11:49:56 -07:00
Alison Cichowlas
5fe7b7985c Update notification settings to match Notification Dot branding.
Bug: 38387970
Test: string changes only, manually verified

Change-Id: If4086c9c89bef07a6ce0bb1d2ea4259c6369e93b
2017-05-25 09:38:14 -04:00
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
Suprabh Shukla
21bb9b8c4a Revert "Adding SecureTouchListener to DeviceAdminAdd"
This reverts commit c1f10cb9c6.

Bug: 35056974,
     38306660
Change-Id: I42b8e60f05f57aad1d8851268a6b40dd295d219b
2017-05-24 00:26:05 +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