Anna Galusza
86d10d65ab
Merge "Update Setup Wizard Vision Settings colors." into oc-dev
...
am: 221f9245d6
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
Daniel Nishi
edafa44c7e
Don't crash on opening ejecting USB.
...
This crash occurs because, even if you finish an Activity during
onCreate, the other lifecycle methods occur. In this case,
onActivityCreated assumes that onCreate ran properly.
By exiting early from onActivityCreated, we can ensure the activity
is finished properly.
Change-Id: Ia354341bf82d295c7dd042668fb11d588ddfebc0
Fixes: 37334861
Test: Instrumentation test
2017-04-18 12:19:36 -07: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
2017-04-18 17:51:26 +00:00
Matthew Fritze
d9997261dd
Merge "Revert "Add summary to special app access."" into oc-dev
...
am: 4fa0a617ec
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
2017-04-18 17:35:07 +00:00
Julia Reynolds
564c74b8b2
Merge "Channel settings updates" into oc-dev am: 526185c89b
...
am: 41b21fd2d5
2017-04-18 15:16:56 +00:00
Julia Reynolds
41b21fd2d5
Merge "Channel settings updates" into oc-dev
...
am: 526185c89b
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
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
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
2017-04-18 03:31:34 +00:00
Maurice Lam
8d9cc84f53
Sticky footer for GLIF theme am: 667d694220
...
am: 1b852af477
2017-04-18 03:31:16 +00:00
Maurice Lam
ef82b552e0
Merge "Use buttons for EncryptionInterstitial" into oc-dev am: b6a0360a92
...
am: 62c5a2c357
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
2017-04-18 02:50:09 +00:00
Julia Reynolds
90f49214d0
Merge "Consolidate notification settings." into oc-dev am: 6adf04c741
...
am: bcaa8ecb24
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
2017-04-18 01:08:19 +00:00
jackqdyulei
47006d7794
Include type service as type system
...
Bug: 37293081
Test: RunSettingsRoboTests
Change-Id: Id9259a1a516fdf368d41f1b7205a1515d0989aab
2017-04-17 18:05:05 -07:00
Maurice Lam
1b852af477
Sticky footer for GLIF theme
...
am: 667d694220
2017-04-18 01:02:00 +00:00
Maurice Lam
62c5a2c357
Merge "Use buttons for EncryptionInterstitial" into oc-dev
...
am: b6a0360a92
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
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
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
2017-04-17 23:58:17 +00:00
Julia Reynolds
bcaa8ecb24
Merge "Consolidate notification settings." into oc-dev
...
am: 6adf04c741
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
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
2017-04-17 22:50:07 +00:00
Daniel Nishi
79eb7e4848
Merge "Fix a bug where options menu was not showing." into oc-dev am: 4f2f6bcad9
...
am: e69e9d74c5
2017-04-17 22:49:45 +00:00
TreeHugger Robot
ceedf2b9bf
Merge "Fix startup jank in the Wifi Picker." into oc-dev
2017-04-17 22:47:29 +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
Jeff Sharkey
4ecbc32b48
Merge "Follow storage API polishing." into oc-dev
...
am: e398a84199
2017-04-17 22:40:20 +00:00
Daniel Nishi
c99803bba4
Merge "Update the old Storage view to look better." into oc-dev
...
am: 427f976ff4
2017-04-17 22:39:52 +00:00
Daniel Nishi
e69e9d74c5
Merge "Fix a bug where options menu was not showing." into oc-dev
...
am: 4f2f6bcad9
2017-04-17 22:39:31 +00:00
jackqdyulei
7e957fbe1f
Merge "Make battery status refresh in SettingsActivity" into oc-dev am: 3a156f5509
...
am: d5178f2bf0
2017-04-17 22:33:26 +00:00
Fan Zhang
b0c2ca7c07
Merge "Use standard preference layout for wallpaper picker" into oc-dev am: 8e1d588cdf
...
am: d96ce57713
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
2017-04-17 22:32:52 +00:00
Maurice Lam
e2fbd710e9
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev am: 3265c25861
...
am: cd22ea50ca
2017-04-17 22:32:35 +00:00
Doris Ling
991a741918
Merge "Add summary to special app access." into oc-dev am: 43458f0249
...
am: edbcea5a14
2017-04-17 22:32:18 +00:00
Christine Franks
8e1202b54e
Merge "Add test for Settings#ACTION_NIGHT_DISPLAY_SETTINGS" into oc-dev am: c2d56691fe
...
am: f0320dd7aa
2017-04-17 22:32:01 +00:00
Jeff Sharkey
e398a84199
Merge "Follow storage API polishing." into oc-dev
2017-04-17 22:26:44 +00:00
Daniel Nishi
427f976ff4
Merge "Update the old Storage view to look better." into oc-dev
2017-04-17 22:26:11 +00:00
