Commit Graph

15043 Commits

Author SHA1 Message Date
jackqdyulei
2532438693 Add connect string for bluetooth page
Bug: 37365660
Test: Build
Change-Id: I964b9d25e892666c51dbd98e499be23fe93007ec
2017-04-20 10:30:50 -07:00
Daniel Sheng
5e6708cdee Added suggestion category for camera lift gesture
Bug: 37154489
Test: Robolectric tests run during make

Change-Id: I3528e3d954f872732f55dfa8bdc42fdc15f27d12
2017-04-20 10:28:10 -07:00
jackqdyulei
0a8e081855 Change "Cell standby" to "Mobile network standby"
Bug: 37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
2017-04-20 10:03:21 -07:00
Gustav Sennton
cad1d15586 Merge "Remove WebView MultiProcess Developer Option." into oc-dev am: ae72f1eeef
am: b54f96015f

Change-Id: I6dc23db7a2043310860e56d7f5aa0f591f2813ce
2017-04-20 16:37:22 +00:00
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
William Luh
b03f19991f Update security status icons.
Bug: 36847800
Test: make RunSettingsRoboTests

Also tested manually in app.

Change-Id: I5b7c043ed6af4c5a888710b582e8e69c6e3974c3
2017-04-19 17:06:46 -07:00
TreeHugger Robot
8968e61b95 Merge "Remove duplicates between battery and display settings" 2017-04-19 23:05:03 +00:00
Fan Zhang
41b5a55175 Merge "Fix malformatted preference xml." into oc-dev am: 569a93b8bb
am: 0a9fddd631

Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166
2017-04-19 22:13:53 +00:00
Adrian Roos
478dcb35d6 Merge "Revert "Changed the ambient display setting name"" into oc-dev am: 97d3709b25
am: 1b322f6283

Change-Id: Ia33ee063b87d2cc6951d6a85a88b45b14c67b229
2017-04-19 22:13:21 +00: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
Matthew Fritze
c6f2638009 Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
2017-04-19 14:34:13 -07: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
91f6cad742 Merge "Using a common class for loading drawables and handling various badging" into oc-dev am: d2561263a8
am: 77fca989a0

Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2
2017-04-19 03:03:50 +00: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
c83b8de6a7 Merge "Conditionally reposition experimental preferences." into oc-dev am: b18e31bc5a
am: f869788eb8

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

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

Change-Id: I2e1a87c187bf9182b028402ae01d3504e5a637de
2017-04-18 19:48:03 +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
Julia Reynolds
90f49214d0 Merge "Consolidate notification settings." into oc-dev am: 6adf04c741
am: bcaa8ecb24

Change-Id: Id632a07d66080acb4368c1789ce829ff8898b378
2017-04-18 02:03:01 +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
Fan Zhang
b0c2ca7c07 Merge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
am: d96ce57713

Change-Id: I50bb90a53c74960465c73aafc8ae5ee0e8021b50
2017-04-17 22:33:08 +00:00
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
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
TreeHugger Robot
ee4e9a7fe8 Merge "Finalize the string for eSIM factory reset." 2017-04-17 19:50:16 +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