Commit Graph

11672 Commits

Author SHA1 Message Date
Gustav Sennton
b54f96015f Merge "Remove WebView MultiProcess Developer Option." into oc-dev
am: ae72f1eeef

Change-Id: I93b5db79f458b8808935f0d005e3a5631d96e496
2017-04-20 16:04:02 +00:00
TreeHugger Robot
ae72f1eeef Merge "Remove WebView MultiProcess Developer Option." into oc-dev 2017-04-20 12:59:34 +00:00
Gustav Sennton
c14e09bde0 Remove WebView MultiProcess Developer Option.
Now that MultiProcess WebView is enabled by default we can remove the
Developer Option that lets users choose whether to enable MultiProcess
for WebView.

Bug: 36513859
Test: Ensure the WebView MultiProcess Dev Setting no longer exists.
Change-Id: Ib2eab3831b5d8b56daeaf4c7a06337075804a1d4
2017-04-20 11:51:46 +01:00
Fan Zhang
0a9fddd631 Merge "Fix malformatted preference xml." into oc-dev
am: 569a93b8bb

Change-Id: Ida4d8631bf7f36d68c9022b9ff72cd2ef3cd4995
2017-04-19 21:54:01 +00:00
Adrian Roos
1b322f6283 Merge "Revert "Changed the ambient display setting name"" into oc-dev
am: 97d3709b25

Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191
2017-04-19 21:53:40 +00:00
TreeHugger Robot
569a93b8bb Merge "Fix malformatted preference xml." into oc-dev 2017-04-19 21:42:36 +00:00
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
Sunny Goyal
77fca989a0 Merge "Using a common class for loading drawables and handling various badging" into oc-dev
am: d2561263a8

Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96
2017-04-19 02:53:17 +00: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
f869788eb8 Merge "Conditionally reposition experimental preferences." into oc-dev
am: b18e31bc5a

Change-Id: I072311948f0ff2abac3569330ae678da5b5d5ce0
2017-04-18 21:54:38 +00: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
2d8a676b47 Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
am: cf172040a9

Change-Id: I590ad5b3f2ef6fd5b578e9bdc37d1999d3091a77
2017-04-18 20:49:52 +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
86d10d65ab Merge "Update Setup Wizard Vision Settings colors." into oc-dev
am: 221f9245d6

Change-Id: If4075343e65cf000452324ad04ed6fb5f26ab774
2017-04-18 19:42:39 +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
1b852af477 Sticky footer for GLIF theme
am: 667d694220

Change-Id: I9c91b27cc38fbb9839f62cac91901dac2dd2698d
2017-04-18 01:02:00 +00:00
Maurice Lam
62c5a2c357 Merge "Use buttons for EncryptionInterstitial" into oc-dev
am: b6a0360a92

Change-Id: I07ac891f736ba3707b01b629732df4a963ab64cc
2017-04-18 01:01:43 +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
Julia Reynolds
bcaa8ecb24 Merge "Consolidate notification settings." into oc-dev
am: 6adf04c741

Change-Id: I255c258c6defed91fea42ab70ed8ff2019f271f1
2017-04-17 23:24:54 +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
Fan Zhang
d96ce57713 Merge "Use standard preference layout for wallpaper picker" into oc-dev
am: 8e1d588cdf

Change-Id: If8d1c3c3f8dd318e5c85393bf430a22fc07a8a89
2017-04-17 21:18:14 +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
9827007c5e Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
am: f7896f491a

Change-Id: I66a108fd9b767a9060c22feb39c928a196fdfe07
2017-04-17 20:15:45 +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
Fan Zhang
00a0978293 Update action bar style in app header UI.
am: be6fab0135

Change-Id: I51f4b7900fb1be6631b686915e02333db2df2e9f
2017-04-17 18:38:01 +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
Daniel Nishi
e90e746046 Merge "Jostle the elements around in app storage settings." into oc-dev
am: bea96cfb65

Change-Id: Ib4a8bf827266d5fbb015fb5d4c71cd7a7f19b617
2017-04-15 00:04:52 +00: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
b783b2775d Merge "Update some battery string comments" into oc-dev
am: 2721c8aa03

Change-Id: I4332f53b0c60367c832e68f95ee69f261b54c92f
2017-04-14 20:33:48 +00:00
Lei Yu
2721c8aa03 Merge "Update some battery string comments" into oc-dev 2017-04-14 20:26:27 +00:00
Daniel Nishi
ae3305e7bd Merge "Shrink the progress bar on storage items." into oc-dev
am: 53ea5701f4

Change-Id: Ibd0a426630929dc3c5de7eb98fce692bd30d7729
2017-04-14 20:22:46 +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
b6afa7575a Merge "Use the music note icon for the music files pref." into oc-dev
am: fbaa29a4b1

Change-Id: Ic1b0ad7ec4e260703a2cdafcefdc4209957e2561
2017-04-14 19:56:45 +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
Fan Zhang
b7c880a709 Merge "Get rid of the extra divider lines in memory usage UI" into oc-dev
am: c8c066dedf

Change-Id: Icf250ff46ddfd48d3d213c86f0c5001547a1a4ec
2017-04-14 18:43:09 +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
jackqdyulei
3fd3a348d3 Merge "Update summary when toggle background activity" into oc-dev
am: 8d519f8281

Change-Id: I5e135d0cb4d4d6457e05b8c91ef69323cab57a33
2017-04-14 01:25:47 +00: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
Jesse Evans
ec9090782c Merge "Instant apps show supported links not open default" into oc-dev
am: 0f34680fe0

Change-Id: Ib3df529beea9d610bc79512f6f50df5a4c41a640
2017-04-14 00:48:56 +00:00