Phil Weaver
ed69e8a417
Respect user's choice on a11y shortcut dialog
...
Wasn't checking if the user actually agreed. Whoops.
Bug: 37123004
Test: Manually verified that canceling leaves the selection
unchanged.
Change-Id: I48a052eb74733d3d0105fc1e72c4bf77ce8be0c5
2017-04-18 17:53:14 -07:00
Sundeep Ghuman
bb46d23c8f
Remove animations in WifiSettings.
...
This addresses jank issues when first showing the WifiSettings. Given
the new loading bar, animated transitions seem less relevant. Based on
user feedback, animations may be readded after a delay in ODR.
Bug: b/37429702
Test: Visual
Change-Id: I9a44820bb354885d0ef31d50278aee6a47727701
2017-04-18 16:45:04 -07: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
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
Daniel Nishi
6b37d6341f
Gracefully handle null volumes after forgetting.
...
If a user tells a device to forget a storage volume and then
goes back to the PrivateVolumeForget activity from their Recents, it
attempts to re-initialize itself with a volume that it forgot.
And this makes Settings crash.
By gracefully killing the activity when we try to open
PrivateVolumeForget for a forgotten volume, we avoid this crash.
Change-Id: Ib4e881c10f0c872ce6b268b16a573960230ef99b
Fixes: 34856304
Test: Settings unit test
2017-04-18 14:59:20 -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
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
Fan Zhang
a006c6de81
Fix action bar background not wide enough on tablets
...
Change-Id: I82e444dc913429c77c768afada24e10c12c79160
Fix: 37475599
Test: make RunSettingsRoboTests
2017-04-18 14:40:25 -07: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
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
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
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
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
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
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
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
Change-Id: I1058418e9df7965046a6387594c60fb3e8fad629
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
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
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
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
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
Change-Id: Iad89fac67061de273b88f5d3e384de0349577e57
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
Change-Id: Ice0e3cb73a4d0b3ea81e83107f3f6084e83b5554
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
Change-Id: I9bfa738b7d7010955ea26b162573bdb68dbbcef5
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
Change-Id: I4706f49e9f8cce14fd98da167a8d05b4ba4a4519
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