Commit Graph

4762 Commits

Author SHA1 Message Date
Sarah Fortune
e6fbdee6e6 Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev am: f7896f491a
am: 9827007c5e

Change-Id: Ib5db637dd6a7a79f622a11f737bbae08a3d557e1
2017-04-17 22:32:52 +00:00
Fan Zhang
554ae02f68 Update action bar style in app header UI. am: be6fab0135
am: 00a0978293

Change-Id: I4d4029d732602dd515249d344e5edc597b858a54
2017-04-17 21:37:24 +00:00
Sarah Fortune
f7896f491a Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev 2017-04-17 20:07:32 +00:00
TreeHugger Robot
ee4e9a7fe8 Merge "Finalize the string for eSIM factory reset." 2017-04-17 19:50:16 +00:00
Sarah Fortune
15d1e2676c Disable the wifi wakeup preference when wifi scanning is disabled
Bug: 36033488
Test: Manual testing on the device, make RunSettingsRoboTests
Change-Id: I0abfe69a8a84dc9c5e78f1debce7748c92b47e04
2017-04-17 11:35:21 -07:00
Fan Zhang
be6fab0135 Update action bar style in app header UI.
- Update background color of actionbar
- Remove elevation of actionbar so it appears to be the same entity as
  app header.
- Add a shadow below app header view. We can't set elevation on app
  header unfortunately because that will add shadow all round the view,
  but we only want shadow below it.
- Updated app icon size/text size per to match UI spec.

Change-Id: I63d7fa42b859a008fa662aaf19848cd40529c2ff
Fix: 37207527
Fix: 37079248
Test: visual && make RunSettingsRoboTests
2017-04-17 09:30:40 -07:00
qingxi
a7b8b66fc5 Finalize the string for eSIM factory reset.
Bug: 37255419
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I6fe5d09bc58021fe196dc8ee739280d70f9d0017
2017-04-14 17:04:20 -07:00
Lei Yu
ce62cb0118 Merge "Update some battery string comments" into oc-dev am: 2721c8aa03
am: b783b2775d

Change-Id: I76d0efaae5ad72bd0bb38a2e3a5c710f18fb8de8
2017-04-14 20:41:17 +00:00
Jesse Evans
5d0c0fab8c Merge "Instant apps should not say App Installed by" into oc-dev am: 28371d9c9e
am: 774b759ef9

Change-Id: Id8e60764ee9e0dd20f73798b1cd8df706d1d70e9
2017-04-14 15:52:56 +00:00
TreeHugger Robot
4b1206b4b2 Merge "Add erase eSIMs choice into factory reset" 2017-04-14 02:03:57 +00:00
jackqdyulei
7c7654b401 Update some battery string comments
1. battery_detail_foreground
2. battery_detail_background

Fix: 36874567
Test: Build
Change-Id: I955023ff8919b7019d459bd75a8baccf69a46355
2017-04-13 17:54:48 -07:00
qingxi
072f28661d Add erase eSIMs choice into factory reset
This CL add a check box for eSIM enabled devices to reset eSIM data
during factory reset of the phone.

Bug: 37255419
Test: Included
Change-Id: Ic98974726a515b0a350b73a33093460a63c1fb8a
2017-04-13 15:28:45 -07:00
TreeHugger Robot
28371d9c9e Merge "Instant apps should not say App Installed by" into oc-dev 2017-04-13 19:36:53 +00:00
Julia Reynolds
1c98369d96 Merge "Notification sound field updates" into oc-dev am: b40a459031
am: cd8f4fb614

Change-Id: I8f8b5674339b044911ef6ed630c2d432cb7277cf
2017-04-13 13:20:46 +00:00
Julia Reynolds
b40a459031 Merge "Notification sound field updates" into oc-dev 2017-04-13 13:01:52 +00:00
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
Jesse Evans
de4e056449 Instant apps should not say App Installed by
Changes the text on the app installer details to say
"More info on {App Store Name}".

Test: make RunSettingsRoboTests
Bug: 36512295
Change-Id: I8629f840e9f4e5ce12ba91e9cb9def0db0471162
2017-04-12 07:02:19 -07: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
Julia Reynolds
18fcc05224 Notification sound field updates
- Show default and silent options
- Don't also update the default notification sound
- Display a better summary in case the sound isn't in media store

Change-Id: I42d537657a7bbddb8a1ce41fd03b8e5847899a82
Fixes: 36734113
Fixes: 36849670
Test: manual (silent sound, default sound, normal sound, private sound)
2017-04-11 16:57:57 -04: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