Commit Graph

35180 Commits

Author SHA1 Message Date
Sundeep Ghuman
bd1b217da7 Merge "IPv6 addresses should not be selectable." into oc-dev am: 4ae52fc7f0
am: 1e04aa912e

Change-Id: I18c6a34b45138e348cb67cc2500cdf662d712784
2017-04-19 01:11:46 +00:00
Sundeep Ghuman
1e04aa912e Merge "IPv6 addresses should not be selectable." into oc-dev
am: 4ae52fc7f0

Change-Id: Ia5943ec8c4c1630ea35b99c1057c0b50cde1d581
2017-04-19 01:05:34 +00:00
TreeHugger Robot
4ae52fc7f0 Merge "IPv6 addresses should not be selectable." into oc-dev 2017-04-19 00:54:33 +00:00
Sundeep Ghuman
6347e1b4b8 IPv6 addresses should not be selectable.
Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.

Bug: b/37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
2017-04-18 15:05:17 -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
Doris Ling
0ba2b618dd Merge "Listen to brigtness updates to update brightness summary." into oc-dev am: a88635f5a3
am: 96840d4010  -s ours

Change-Id: I1511f985e8e06a1496a1070404808b59ac14d4a4
2017-04-18 22:00:34 +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
Doris Ling
96840d4010 Merge "Listen to brigtness updates to update brightness summary." into oc-dev
am: a88635f5a3

Change-Id: Ida6ea12152be71e3319479ea73116c68082652b1
2017-04-18 21:54:23 +00:00
Saige McVea
b18e31bc5a Merge "Conditionally reposition experimental preferences." into oc-dev 2017-04-18 21:47:25 +00:00
TreeHugger Robot
a88635f5a3 Merge "Listen to brigtness updates to update brightness summary." into oc-dev 2017-04-18 21:47:05 +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
Doris Ling
4b95879634 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Merged-In: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
Change-Id: Ice549ffd708c2dad311a87b6a92bf1c8db426456
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-18 20:01:16 +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
TreeHugger Robot
eb9e5be803 Merge "Listen to brigtness updates to update brightness summary." 2017-04-18 19:47:36 +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
Doris Ling
83e2741bd7 Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Bug: 37227609
Test: make RunSettingsRoboTests
Change-Id: I895d251e1dc12cb114ef00328eb8aa0075d77ab1
2017-04-18 11:05:16 -07:00
Matthew Fritze
f0b8ffeb98 Merge "Revert "Add summary to special app access."" into oc-dev am: 4fa0a617ec
am: d9997261dd

Change-Id: Ie13c5b63e82edff9f0d442a29ebcc626c7e37f79
2017-04-18 17:51:26 +00:00
Matthew Fritze
d9997261dd Merge "Revert "Add summary to special app access."" into oc-dev
am: 4fa0a617ec

Change-Id: I7353685f51f4ff287b58e382bd87e9ad22f16783
2017-04-18 17:44:57 +00:00
Matthew Fritze
4fa0a617ec Merge "Revert "Add summary to special app access."" into oc-dev 2017-04-18 17:39:13 +00:00
Matthew Fritze
13e5af06b8 Revert "Add summary to special app access."
This reverts commit 0e1b53fa6f.

Change-Id: Ica5a9f7f40be3a4c2ae0e999d9832717dc44f3b5
2017-04-18 17:35:07 +00:00
Julia Reynolds
564c74b8b2 Merge "Channel settings updates" into oc-dev am: 526185c89b
am: 41b21fd2d5

Change-Id: I6199301c1de2fb0f4e2229a9dcc745b4efe3a576
2017-04-18 15:16:56 +00:00
Julia Reynolds
41b21fd2d5 Merge "Channel settings updates" into oc-dev
am: 526185c89b

Change-Id: Ibb9cb726d26579ce94f26e18d00bcca73061b9e6
2017-04-18 15:11:27 +00:00
TreeHugger Robot
526185c89b Merge "Channel settings updates" into oc-dev 2017-04-18 15:03:55 +00:00
jackqdyulei
4e0bdb37fb Merge "Hide User category if only one user in device" into oc-dev am: 55a3944dbf
am: b5dafb6c10

Change-Id: I9dd993c03395565cf5b3355e60a568eed08c7857
2017-04-18 03:37:20 +00:00
jackqdyulei
b5dafb6c10 Merge "Hide User category if only one user in device" into oc-dev
am: 55a3944dbf

Change-Id: I8a799188f0fe64952386c178eb3f303615fa13ef
2017-04-18 03:31:44 +00:00
Lei Yu
445961d073 Merge "Don't show Screen as Apps in advanced battery page" into oc-dev am: 89bc5b2bff
am: 4f016eeb6b

Change-Id: I6524ea22d71d4d7acd6186ebdb62de3cdd89a87d
2017-04-18 03:31:34 +00:00
Maurice Lam
8d9cc84f53 Sticky footer for GLIF theme am: 667d694220
am: 1b852af477

Change-Id: I7f0803649ff42bba2edbf606f69e935662674b31
2017-04-18 03:31:16 +00:00
Maurice Lam
ef82b552e0 Merge "Use buttons for EncryptionInterstitial" into oc-dev am: b6a0360a92
am: 62c5a2c357  -s ours

Change-Id: I37dc909344499be84f5cd3018e2aee092547066c
2017-04-18 03:30:59 +00:00
TreeHugger Robot
55a3944dbf Merge "Hide User category if only one user in device" into oc-dev 2017-04-18 03:21:55 +00:00
Casey Burkhardt
1a63f973e9 Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev am: 65523b9cb0
am: 855391b66f

Change-Id: Id976a6a4c502dbe8624e810587555869588f3264
2017-04-18 02:50:09 +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
Lei Yu
4f016eeb6b Merge "Don't show Screen as Apps in advanced battery page" into oc-dev
am: 89bc5b2bff

Change-Id: I1058418e9df7965046a6387594c60fb3e8fad629
2017-04-18 01:08:19 +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
jackqdyulei
cdba2e7266 Hide User category if only one user in device
Fix: 37293124
Test: RunSettingsRoboTests
Change-Id: If50548396614672b05811d37a719f8f08df3165d
2017-04-17 17:58:38 -07:00
Lei Yu
89bc5b2bff Merge "Don't show Screen as Apps in advanced battery page" into oc-dev 2017-04-18 00:56:11 +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
Casey Burkhardt
855391b66f Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
am: 65523b9cb0

Change-Id: I981cbc677a5b1b000c6734fc8f12d4af681f4268
2017-04-18 00:21:04 +00:00
Sundeep Ghuman
01a18eff6f Merge "Fix startup jank in the Wifi Picker." into oc-dev am: ceedf2b9bf
am: 8b8f65828b

Change-Id: I19dcf41102818c59c1976b48082e02c1f57099e7
2017-04-18 00:13:51 +00:00
Casey Burkhardt
65523b9cb0 Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev 2017-04-18 00:06:53 +00:00
Jeff Sharkey
5d9ccedc59 Merge "Follow storage API polishing." into oc-dev am: e398a84199
am: 4ecbc32b48

Change-Id: Ie47474e46fa6ebfffdddad04ab8c99b332c4f8cc
2017-04-17 23:58:17 +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
TreeHugger Robot
6adf04c741 Merge "Consolidate notification settings." into oc-dev 2017-04-17 23:16:38 +00:00
Sundeep Ghuman
8b8f65828b Merge "Fix startup jank in the Wifi Picker." into oc-dev
am: ceedf2b9bf

Change-Id: I231adc5f06c20bf6b95db63a8e2ee145d23b9403
2017-04-17 22:52:47 +00:00
Daniel Nishi
9db2a27a37 Merge "Update the old Storage view to look better." into oc-dev am: 427f976ff4
am: c99803bba4

Change-Id: Ibe8619a285effba38e89e2fada0887c57be54108
2017-04-17 22:50:07 +00:00