Commit Graph

4745 Commits

Author SHA1 Message Date
Svet Ganov
985741ea1c Merge "Update the strings for the autofill enable dialog" into oc-dev am: 0770f85cdc
am: 6fa685e4da

Change-Id: Iac9a8bf0430652396809784598ed75f947b75426
2017-04-13 02:10:31 +00:00
TreeHugger Robot
0770f85cdc Merge "Update the strings for the autofill enable dialog" into oc-dev 2017-04-13 01:56:06 +00:00
Svet Ganov
4fafa4e403 Update the strings for the autofill enable dialog
Test: manual

bug:37244333

Change-Id: I6dfac8826d5a817567116ef2f57d646d92b54b4e
2017-04-12 15:17:53 -07:00
Doris Ling
943b6af1fc Merge "Allow settings preference title to span over multiple lines." into oc-dev am: d09c7e61f4
am: c6f5261619

Change-Id: I388c45690f8eb59db2d1d590268319ee8b72b983
2017-04-12 18:41:50 +00:00
Christine Franks
594d15386c Merge "Use correct title when opening from notification" into oc-dev am: f61d4f38be
am: c783d634a3

Change-Id: I09962c3046fbb833cf08455593f73ab3ffa761d1
2017-04-12 18:04:59 +00:00
TreeHugger Robot
d09c7e61f4 Merge "Allow settings preference title to span over multiple lines." into oc-dev 2017-04-12 17:57:28 +00:00
Christine Franks
f61d4f38be Merge "Use correct title when opening from notification" into oc-dev 2017-04-12 17:19:40 +00:00
Amin Shaikh
27ea581cbe Merge "Wi-Fi network details page fixes." into oc-dev am: 52cf25d03d
am: 35caf331df

Change-Id: Ia1613cc4909e68cd1f1b40c70e9e1bfe6beecb72
2017-04-12 04:59:20 +00:00
TreeHugger Robot
52cf25d03d Merge "Wi-Fi network details page fixes." into oc-dev 2017-04-12 04:40:11 +00:00
Amin Shaikh
399e1a5810 Wi-Fi network details page fixes.
- Fix NPE in WifiDetailPreferenceController#setIpText
- Add MAC address preference in the details section
- Set subnet mask and gateway preferences
- Do not show IP information preferences if no information is available
- Fix string capitalization errors
- Only show IPv4 DNS servers under "Network details" section

Bug: 36483230
Bug: 37096448
Bug: 36482499
Bug: 37165860
Test: m RunSettingsRoboTests
Change-Id: I0e3f0ccfc4a8d802b51ed6b3be81c75e384dd06f
2017-04-11 16:25:53 -07:00
TreeHugger Robot
15f963bed9 Merge "Fixes instant apps on the Opening links screen" into oc-dev 2017-04-11 22:36:31 +00:00
Christine Franks
e12bf697b0 Use correct title when opening from notification
Bug: 36070413
Test: tap system alert window notification, which brings up Settings
with the correct title.

Change-Id: I6f346a7336a71c046cbc58b7291a851a7537d5ac
2017-04-11 14:57:33 -07:00
Doris Ling
aa805e70ed Allow settings preference title to span over multiple lines.
- add singleLineTitle=false to SettingsPreference style, so that it will
not confined the title to a single line.
- remove the custom multi line title from DividerPreference and
MasterSwitchPreference.

Change-Id: I5a78d2cd6ac00c4482e252b0789fd2d265bd9adf
Fix: 34886787
Test: manual
2017-04-11 13:17:38 -07:00
Hyunyoung Song
ad3843f4e4 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev am: 9234a34a80
am: 71ba393033

Change-Id: I656587f889bdc4694cf0e8805a1f32feef7b8078
2017-04-11 19:47:01 +00:00
Hyunyoung Song
9234a34a80 Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev 2017-04-11 18:11:49 +00:00
Fan Zhang
1d44df7ca0 Update string char limits am: d017f22372
am: 2700a3148f

Change-Id: I42c1e08c4c59c63b422749360333c168a2294096
2017-04-11 16:42:14 +00:00
Evan Laird
b8ddcd4fb4 Merge "Add "Current screen saver" string" into oc-dev am: 42a1cb9e12
am: 5c51987432

Change-Id: I93566c8e18f1607ab91a514d5f9f0a9dd384456a
2017-04-11 16:11:10 +00:00
Fan Zhang
d017f22372 Update string char limits
Fix: 36852178
Fix: 36851715
Fix: 36657781
Fix: 36700992
Fix: 36650008
Fix: 36657636
Test: builds and robotests
Change-Id: I14c21b2cb37b911c14dff40343fa094d7150f201
2017-04-11 09:09:23 -07:00
TreeHugger Robot
42a1cb9e12 Merge "Add "Current screen saver" string" into oc-dev 2017-04-11 15:44:30 +00:00
Doris Ling
759c9cb5ea Merge "Update text for security preference." into oc-dev am: 74eee7838c
am: 47a44f0fea

Change-Id: Ie01fe04fce64d10fa0b6fdc04a68ed8e1623fc3d
2017-04-11 15:36:44 +00:00
Doris Ling
74eee7838c Merge "Update text for security preference." into oc-dev 2017-04-11 15:24:44 +00:00
Esteban Talavera
3ff052c089 Merge "Show when work profile notifications are blocked for listener" 2017-04-11 13:32:30 +00:00
Paul Stewart
bc95b6ee68 Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev am: 6d7f210c0b
am: 14633029d2

Change-Id: I73e537e35502369ca54a0b00a790d562a397aec4
2017-04-11 08:03:48 +00:00
TreeHugger Robot
6d7f210c0b Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev 2017-04-11 07:22:52 +00:00
Sean Stout
79065d5a3c Merge "Remove Night Light suggestion. DO NOT MERGE" into oc-dev am: e4c73c24bc
am: 2fcca5a647

Change-Id: Iad30a04550e10682772174b490ca7085f5846418
2017-04-11 02:17:24 +00:00
Sean Stout
40067bee4d Remove Night Light suggestion. DO NOT MERGE
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Bug: 37207263
Change-Id: Ieeb660abdcbe07cb66f1ae3b6e86d8fd27a26478
2017-04-10 16:22:01 -07:00
Doris Ling
ca95a90c11 Update text for security preference.
Swap location to screen lock in title and summary.

Bug: 37161482
Test: builds
Change-Id: Ie95f1d8c984587bf3898a431edde0868b0e17fce
2017-04-10 15:21:18 -07:00
Hyunyoung Song
ebc17237c3 Add shadow to AdaptiveIconDrawables using View level shadow
Test: $ make RunSettingsRoboTests -j40
RunSettingsRoboTests: ......
RunSettingsRoboTests: Time: 151.394
RunSettingsRoboTests:
RunSettingsRoboTests: OK (1355 tests)
RunSettingsRoboTests:

Bug: 36088922

Change-Id: I5b5651d2305ab65e1358609a4110e248dee9eab2
2017-04-10 14:43:02 -07:00
Evan Laird
044001f991 Add "Current screen saver" string
This one was missed originally.

Test: none
Bug:35031991
Change-Id: I9b1bff9a9c834c306fe03e4405950bc1ac3ac3ac
2017-04-10 16:35:45 -04:00
Lei Yu
e57622d5a4 Merge "Extend the translation limit to 60" into oc-dev am: 2a3a92b513
am: 451964a124

Change-Id: I1aa65f1f4a9ec03ba61bfd981ec5386c5d38f631
2017-04-07 21:11:53 +00:00
Lei Yu
2a3a92b513 Merge "Extend the translation limit to 60" into oc-dev 2017-04-07 21:03:16 +00:00
Doris Ling
0ec7d2eb0d Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
am: f8dead2f40

Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
2017-04-07 20:12:28 +00:00
Andrew Sapperstein
11400c5e81 Merge "Increase char limit for adaptive brightness text." into oc-dev am: a9acbd924a
am: e6db78a2f1

Change-Id: I6123d1c36204bc87276d4170850a1c7d318c7eea
2017-04-07 20:06:36 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
TreeHugger Robot
0226581110 Merge "Fix encryption interstitial string" 2017-04-07 19:17:48 +00:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Maurice Lam
d034f261af Fix encryption interstitial string
Test: Manual
Bug: 36801908
Change-Id: Ib5a06cc557458a451a6aec645e8331e75850cb2e
2017-04-07 10:35:39 -07:00
jackqdyulei
145cb81c21 Extend the translation limit to 60
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07:00
Paul Stewart
9b26496d03 Allow user to specify EAP-SIM under PEAP
Allow the user to select EAP-SIM methods as a second phase after
an outer PEAP authentication.  This hides the "identity" and
"password" fields if one of these methods is selected.

Bug: 34835771
Test: Manual: Connect to PEAP/EAP-SIM AP
Change-Id: I7e448fbebd352a4b0facbfafa74afaff6b704386
2017-04-07 10:28:49 -07:00
Andrew Sapperstein
12bdb22400 Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change
2017-04-07 17:23:30 +00:00
Esteban Talavera
ee349792dd Show when work profile notifications are blocked for listener
Bug: 36657192
Test: m RunSettingsRoboTests

Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
2017-04-07 15:52:31 +01:00
Daniel Nishi
016a8d4768 Merge ""% used" instead of "% full" in storage donut." into oc-dev am: b52a341914
am: 11bd2c3084

Change-Id: Ia8ed6a3bbc62bc8ffdaa38d6d5decaf3ba4836a0
2017-04-06 23:46:03 +00:00
Daniel Nishi
b52a341914 Merge ""% used" instead of "% full" in storage donut." into oc-dev 2017-04-06 23:19:18 +00:00
Daniel Nishi
262e56c67f Merge "Move the app_info_storage_title string." 2017-04-06 23:18:12 +00:00
jackqdyulei
1949de3f14 Merge "Update foreground string in battery page" into oc-dev am: 020bb3bb99
am: 672a85aaa5

Change-Id: I99e7010a60fd220668cc26f33eefe8f31ea767cf
2017-04-06 23:04:13 +00:00
TreeHugger Robot
020bb3bb99 Merge "Update foreground string in battery page" into oc-dev 2017-04-06 22:25:55 +00:00
Maurice Lam
0ed1d928d4 Merge "Make GLIF v2 available to OEMs" 2017-04-06 18:42:38 +00:00
Jesse Evans
0bf40ff77c Fixes instant apps on the Opening links screen
Updates strings to the correct values.

Adds the Instant apps account preference, which launches the
instant apps accounts chooser.

Test: manual test of the settings screen.
Bug: 36514506
Change-Id: I876d0d242bf40a379a3737bc6422e2835fc17839
(cherry picked from commit 1c218c8368)
2017-04-06 16:34:35 +00:00
TreeHugger Robot
ab86bf8244 Merge "Fixes instant apps on the Opening links screen" 2017-04-06 15:33:40 +00:00
Amin Shaikh
ff3d3b45d3 Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev am: 0c4747401a
am: 0a361238d7

Change-Id: I00a3da90f3d5693ea76e1c10d89b1ad792f77b95
2017-04-06 03:09:06 +00:00