Commit Graph

11642 Commits

Author SHA1 Message Date
Adrian Roos
97d3709b25 Merge "Revert "Changed the ambient display setting name"" into oc-dev 2017-04-19 20:50:33 +00:00
Fan Zhang
a6006285b4 Fix malformatted preference xml.
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix: 37343765
Test: instrumentation test
2017-04-19 12:41:26 -07:00
TreeHugger Robot
d2561263a8 Merge "Using a common class for loading drawables and handling various badging" into oc-dev 2017-04-19 02:43:48 +00:00
Adrian Roos
f33fec4f90 Revert "Changed the ambient display setting name"
This reverts commit 8d164e659d.
Fixes: 36516811
Test: Settings > Display > More, observe that it says "Ambient Display" there again.
Change-Id: I2831bc89e430d08f875c05a1441e1b0556df97e5
2017-04-18 16:26:00 -07:00
Saige McVea
b18e31bc5a Merge "Conditionally reposition experimental preferences." into oc-dev 2017-04-18 21:47:25 +00:00
Sunny Goyal
3b172d7b89 Using a common class for loading drawables and handling various badging
Test: make RunSettingsRoboTests -j31
Bug: 36591157

Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
2017-04-18 21:34:13 +00:00
Alison Cichowlas
cf172040a9 Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev 2017-04-18 20:36:54 +00:00
Anna Galusza
221f9245d6 Merge "Update Setup Wizard Vision Settings colors." into oc-dev 2017-04-18 19:35:06 +00:00
Alison Cichowlas
7f431e3cd1 In apps with no channels, provide settings for misc channel in top level.
Test: robolectric tests pass, plus manual verification
Bug: 36561295

Change-Id: I58872a41fab562787d85bade0552c7735d716e5b
2017-04-18 18:49:24 +00:00
Maurice Lam
667d694220 Sticky footer for GLIF theme
For settings screens using GLIF theme, update to sticky footers.

Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
(cherry picked from commit a857c8da4f)
2017-04-18 00:33:44 +00:00
TreeHugger Robot
b6a0360a92 Merge "Use buttons for EncryptionInterstitial" into oc-dev 2017-04-18 00:32:55 +00:00
Maurice Lam
88df6f4407 Use buttons for EncryptionInterstitial
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb)
2017-04-17 15:42:21 -07:00
Julia Reynolds
8cf8bf0ae8 Consolidate notification settings.
App notifications now appears under configure notifications.

Bug: 36562211
Test: functional test, NotificationsSettingsTests
Change-Id: If6a5fd062b7983fc97621b9e7240e6bdad04ee86
2017-04-17 21:28:47 +00:00
TreeHugger Robot
8e1d588cdf Merge "Use standard preference layout for wallpaper picker" into oc-dev 2017-04-17 21:10:31 +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
Fan Zhang
1a4fea2b72 Use standard preference layout for wallpaper picker
Change-Id: I7c76a9af5e64af4ac8641227289a94ab00f923f2
Fix: 37351626
Test: visual
2017-04-17 12:23:52 -07:00
Saige McVea
6a6b97905f Conditionally reposition experimental preferences.
Specifically, move colour inversion and colour correction preferences
to the display category if device is color transform accelerated.

Test: Manual

Bug: 36603386

Change-Id: I4f7e4e569f5f358e6e3c705f9df02e0da473a081
2017-04-17 11:59:07 -07: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
Daniel Nishi
bea96cfb65 Merge "Jostle the elements around in app storage settings." into oc-dev 2017-04-14 23:52:08 +00:00
Lei Yu
2721c8aa03 Merge "Update some battery string comments" into oc-dev 2017-04-14 20:26:27 +00:00
Daniel Nishi
53ea5701f4 Merge "Shrink the progress bar on storage items." into oc-dev 2017-04-14 20:18:18 +00:00
Daniel Nishi
fbaa29a4b1 Merge "Use the music note icon for the music files pref." into oc-dev 2017-04-14 19:50:31 +00:00
TreeHugger Robot
c8c066dedf Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev 2017-04-14 18:30:13 +00:00
Daniel Nishi
c274a28660 Use the music note icon for the music files pref.
Change-Id: I0e688321d7697aa4ad5b4ae16e7ca03f60e582cd
Fixes: 36900603
Test: Manual
2017-04-14 10:29:14 -07:00
TreeHugger Robot
8d519f8281 Merge "Update summary when toggle background activity" into oc-dev 2017-04-14 01:13: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
TreeHugger Robot
0f34680fe0 Merge "Instant apps show supported links not open default" into oc-dev 2017-04-14 00:41:01 +00:00
jackqdyulei
60607da120 Update summary when toggle background activity
In previous code, it didn't update summary when preference is changed.
This cl adds it and also updates the title for Battery Optimization.

Bug: 37163617
Test: RunSettingsRoboTests
Change-Id: I276d9a267379104794998a605a8e258660dcf350
2017-04-13 16:23:45 -07:00
Jesse Evans
edc5099e89 Instant apps show supported links not open default
On the app info page, instant apps show only the supported links
dialog rather than Open by default which opens in a secondary page
where the user can control things that aren't relevant to instant
apps.
Test: make RunSettingsRoboTests
Bug: 36497697
Change-Id: If4eba7c11c5490cbda1ef617002121fe108c4085
2017-04-13 15:17:41 -07:00
Fan Zhang
2bc3e47953 Get rid of the extra divider lines in memory usage UI
Change-Id: I991f74ed3139f6119188a446fbf12bef23189988
Fix: 37211922
Test: visual
2017-04-13 14:46:00 -07:00
Lei Yu
c4f08120b1 Merge "Revamp battery Ui in low battery mode" into oc-dev 2017-04-13 21:43:38 +00:00
Daniel Nishi
0cce538bb0 Shrink the progress bar on storage items.
Change-Id: I4c9161de01236f7ac7ab633162a806888006fc1f
Fixes: 37283130
Test: Manual
2017-04-13 14:15:29 -07:00
Anna Galusza
cc7de0c36d Update Setup Wizard Vision Settings colors.
Bug: 34470898
Test: UI updates only.

Change-Id: I8693004637f31a433c6911a4c99d5dd1426d76f1
2017-04-13 20:29:45 +00:00
Daniel Nishi
e7202b5c3d Jostle the elements around in app storage settings.
This much more closely resembles the later mocks for
this page. The spacing, fonts, and colors are still off
and will be corrected once the final mocks land.

Bug: 34766830
Test: Manual
Change-Id: Ifbb8511d624cd06422025beee943fdead3faf53b
Merged-In: Id131e3596a0d08cb43c924a9f5cd9eb25329d7de
2017-04-13 13:14:35 -07:00
Jack He
ee720c000a Merge "Add developer menu entry to enable Bluetooth inband ringing" into oc-dev 2017-04-13 19:43:55 +00:00
TreeHugger Robot
28371d9c9e Merge "Instant apps should not say App Installed by" into oc-dev 2017-04-13 19:36:53 +00:00
Saige McVea
ba7a4751a0 Merge "Added generic icon and magnification icon to a11y Settings." into oc-dev 2017-04-13 19:07:33 +00:00
Daniel Nishi
c365a8735c Merge "Add a movies & tv apps category to storage settings." into oc-dev 2017-04-13 18:39:58 +00:00
TreeHugger Robot
43bd76d2d0 Merge "Update Wifi Preferences with custom icons." into oc-dev 2017-04-13 17:08:25 +00:00
TreeHugger Robot
20099035ef Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:24:25 +00:00
Julia Reynolds
b40a459031 Merge "Notification sound field updates" into oc-dev 2017-04-13 13:01:52 +00:00
Bill Yi
5ac8caee5d Import translations. DO NOT MERGE
Change-Id: Ia49d34f5f431aad5bed7ecbdbda5fed2adf95534
Auto-generated-cl: translation import
2017-04-13 05:36:35 -07:00
TreeHugger Robot
0770f85cdc Merge "Update the strings for the autofill enable dialog" into oc-dev 2017-04-13 01:56:06 +00:00
Sundeep Ghuman
6f22fb7dc1 Update Wifi Preferences with custom icons.
Bug: b/37281159
Test: Visual inspection of resource change only, see screenshot.
Change-Id: I1fb11667d9fe81873cc8e0a01db98890f106f1be
2017-04-12 17:17:49 -07:00
Jack He
37fb338cda Add developer menu entry to enable Bluetooth inband ringing
Bug: 19171297
Test: Make, HFP regression test, testplans/82144
Change-Id: Ib24463347323f83daf8b4d9f1d38bb9c3071fb95
(cherry picked from commit 8d64a93c6a)
2017-04-12 22:24:20 +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
TreeHugger Robot
de50fff3c2 Merge "Update "Open networks available" toggle to instead open notification channel preferences." into oc-dev 2017-04-12 20:24:22 +00:00
Saige McVea
672cb2edc6 Added generic icon and magnification icon to a11y Settings.
Test: Manual

Bug: 36895362

Change-Id: I85281c0904bd6f562f9ebd39dd35b1eeb79108e6
2017-04-12 12:52:21 -07:00
jackqdyulei
f8e6f43425 Revamp battery Ui in low battery mode
This cl refine battery icon ui in low battery mode:
1. Should show indicator(fixed in ag/2035178)
2. Show bolt icon when charging
3. When battery is low, set battery background as red and indicator
as white.

This cl also includes the field updates for battery.

Bug: 36862496
Test: RunSettingsRoboTests
Change-Id: Ifb2ed339742119bbff78712df09288b895756b1f
2017-04-12 12:47:52 -07:00