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
Fan Zhang
06ee0e932f
Add test to verify regulatory info launches properly
...
Test: runtest --path tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
Change-Id: I531a05bde858790819ac11c8ffcea2f6d1942ec2
Fix: 34370866
2017-04-18 12:53:24 -07:00
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
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
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
b5dafb6c10
Merge "Hide User category if only one user in device" into oc-dev
...
am: 55a3944dbf
2017-04-18 03:31:44 +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
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
Casey Burkhardt
65523b9cb0
Merge "Hide "Magnify with button" if no navbar is shown" into oc-dev
2017-04-18 00:06:53 +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
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
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
Daniel Nishi
4f2f6bcad9
Merge "Fix a bug where options menu was not showing." into oc-dev
2017-04-17 22:25:53 +00:00
jackqdyulei
d5178f2bf0
Merge "Make battery status refresh in SettingsActivity" into oc-dev
...
am: 3a156f5509
2017-04-17 22:00:25 +00:00
TreeHugger Robot
3a156f5509
Merge "Make battery status refresh in SettingsActivity" into oc-dev
2017-04-17 21:53:56 +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
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
Sundeep Ghuman
60c1d4ec64
Fix startup jank in the Wifi Picker.
...
Synchronously fetch the latest APs during onResume and show these before
displaying the other wifi preferences. This fixes a visibile shuffling
issue. Additional Setting preferences are now programatically added
during onStart and hidden during onStop in order to avoid the animation
delay which causes a shuffling effect.
Bug: b/36406983
Test: Visual inspection. Animation jank is difficult to programatically
test.
Change-Id: I34b2d737a8e72e1dc296c170f753975fafce7a3e
2017-04-17 13:36:35 -07:00
Jeff Sharkey
b80f1ddaf0
Follow storage API polishing.
...
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
2017-04-17 14:29:15 -06:00
Sarah Fortune
9827007c5e
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev
...
am: f7896f491a
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
Maurice Lam
cd22ea50ca
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
...
am: 3265c25861
2017-04-17 19:46:44 +00:00
TreeHugger Robot
3265c25861
Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
2017-04-17 19:43:14 +00:00
Doris Ling
edbcea5a14
Merge "Add summary to special app access." into oc-dev
...
am: 43458f0249
2017-04-17 19:42:15 +00:00
TreeHugger Robot
43458f0249
Merge "Add summary to special app access." into oc-dev
2017-04-17 19:37:07 +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
jackqdyulei
8648873e91
Don't show Screen as Apps in advanced battery page
...
Bug: 37293020
Test: RunSettngsRoboTests
Change-Id: I9a6259e1eb3a2d3451b0479bfe20be735825cd64
2017-04-17 12:12:30 -07:00
