OSDN Git Service
Marie Janssen [Fri, 21 Apr 2017 18:54:11 +0000 (18:54 +0000)]
Merge "Bluetooth: Make pairing notification cancellable" am:
6c142b35b4 am:
28bbd5bacb
am:
c7ad828691
Change-Id: I1b6a63bdca7a104f993b9114f7c0da18c5e8df22
Marie Janssen [Fri, 21 Apr 2017 18:41:41 +0000 (18:41 +0000)]
Merge "Bluetooth: Make pairing notification cancellable" am:
6c142b35b4
am:
28bbd5bacb
Change-Id: I3669fab18c0cf2abffeba566580a04a8135ee7fc
Marie Janssen [Fri, 21 Apr 2017 18:38:40 +0000 (18:38 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
am:
6c142b35b4
Change-Id: If7266819da387d53d768e29511c184419a2f8fa5
Treehugger Robot [Fri, 21 Apr 2017 18:31:44 +0000 (18:31 +0000)]
Merge "Bluetooth: Make pairing notification cancellable"
Daniel Nishi [Fri, 21 Apr 2017 17:22:07 +0000 (17:22 +0000)]
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
am:
bad8171d05
Change-Id: I63dde23276126e7d246b5b36bf201acb24e2f9af
Daniel Nishi [Fri, 21 Apr 2017 17:18:04 +0000 (17:18 +0000)]
Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev
Ajay Nadathur [Fri, 21 Apr 2017 02:23:13 +0000 (02:23 +0000)]
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
am:
9e89d528f6
Change-Id: I1ee72cec3e831652d1bae451b8c43d9d8032c74d
TreeHugger Robot [Fri, 21 Apr 2017 01:56:57 +0000 (01:56 +0000)]
Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev
jackqdyulei [Fri, 21 Apr 2017 01:54:11 +0000 (01:54 +0000)]
Merge "Include type service as type system" into oc-dev
am:
72ca5b0bb2
Change-Id: I74a9883ada03f26ea3e2d22c053958bacae87a2e
TreeHugger Robot [Fri, 21 Apr 2017 01:45:28 +0000 (01:45 +0000)]
Merge "Include type service as type system" into oc-dev
Fan Zhang [Fri, 21 Apr 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Remove deep link to app store from app header." into oc-dev
am:
8d01d48672
Change-Id: I984df5f918fd0f5cafb5fc73c7edc3ca054c4dc9
TreeHugger Robot [Fri, 21 Apr 2017 01:36:19 +0000 (01:36 +0000)]
Merge "Remove deep link to app store from app header." into oc-dev
Fan Zhang [Fri, 21 Apr 2017 01:06:16 +0000 (01:06 +0000)]
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
am:
b8d6222e23
Change-Id: I46d9cc46789d193d13cdb64f0cccd65dbb1e727f
TreeHugger Robot [Fri, 21 Apr 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Bidi wrap keyboard names before displaying them." into oc-dev
jackqdyulei [Fri, 21 Apr 2017 00:53:01 +0000 (00:53 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
am:
746eb9e14c
Change-Id: I91366082ac7d86e9b74f22a5689682874c718f91
TreeHugger Robot [Fri, 21 Apr 2017 00:45:15 +0000 (00:45 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev
William Luh [Fri, 21 Apr 2017 00:26:18 +0000 (00:26 +0000)]
Merge "Update security status icons." into oc-dev
am:
52064f63f0
Change-Id: I25c89c9f24428be537ec5d754be3710491e01b81
TreeHugger Robot [Fri, 21 Apr 2017 00:16:29 +0000 (00:16 +0000)]
Merge "Update security status icons." into oc-dev
jackqdyulei [Fri, 21 Apr 2017 00:11:49 +0000 (00:11 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev
am:
b172a9a1d9
Change-Id: I132704765b2f85d3c93557111167a0e5dbf6d8e6
TreeHugger Robot [Thu, 20 Apr 2017 23:47:00 +0000 (23:47 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev
Anas Karbila [Thu, 20 Apr 2017 23:25:28 +0000 (23:25 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca am:
aaf9fdc5cf
am:
bffc5230f7
Change-Id: I545673221d7218cbc8d8196ebb8714c6d822d51a
Anas Karbila [Thu, 20 Apr 2017 23:22:27 +0000 (23:22 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca
am:
aaf9fdc5cf
Change-Id: I5d28e158cd1159ad7074cf596752f8cbe54fab1b
Anas Karbila [Thu, 20 Apr 2017 23:19:55 +0000 (23:19 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
am:
b6bbbc91ca
Change-Id: I083114a9c4658e8c02be0445bc0b54ba3b225217
Treehugger Robot [Thu, 20 Apr 2017 23:14:18 +0000 (23:14 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme"
Marie Janssen [Wed, 19 Apr 2017 20:47:07 +0000 (13:47 -0700)]
Bluetooth: Make pairing notification cancellable
Add actions to the pairing service notification so the user can dismiss
the pairing request if they want to.
Add some more information to logs when the user takes an action.
Reformat the file to match android style.
Test: pair from a remote device, dismiss using the new actions
Bug:
36036358
Change-Id: Ie110044bd4caf465f454452737000f01e7430925
Daniel Nishi [Thu, 20 Apr 2017 21:46:28 +0000 (14:46 -0700)]
Add EXTRA_FROM_STORAGE to photos gallery intent.
Change-Id: I050149f558df0de83e7139354ac54176d7ced162
Fixes:
36991234
Test: Settings robotest
Sundeep Ghuman [Thu, 20 Apr 2017 20:52:45 +0000 (20:52 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
am:
76ed3e5344
Change-Id: I7541a423acd06f69fa944a9044a4768e62e76d68
Sundeep Ghuman [Thu, 20 Apr 2017 20:45:32 +0000 (20:45 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev
Fan Zhang [Thu, 20 Apr 2017 20:45:23 +0000 (13:45 -0700)]
Remove deep link to app store from app header.
The link doesn't actually work and uses wrong icon. There is a working
version at the app info screen already.
Change-Id: I16890bd66e095c3185e12d604d8daba5036ab24c
Fix:
37544209
Test: robotests
Anas Karbila [Thu, 20 Apr 2017 12:44:13 +0000 (21:44 +0900)]
Settings: PreviewPagerAdapter: copy the full theme
getThemeResId() returns the theme resource id which is defined inside AndroidManifest.xml.
If you set a theme via code (or add extra attributes using applyStyle method), the new theme will not be carried over.
Fix this by using setTo method with the context theme as argument.
Issue: https://issuetracker.google.com/
37543358
Test: set new theme via code (or add extra attributes using applyStyle method) and check if they are carried over to the configContext context
Change-Id: I82739fe47b2d5b2d05da4cb3759b630b10dc8c8f
Ajay Nadathur [Thu, 13 Apr 2017 23:06:28 +0000 (16:06 -0700)]
Fingerprint suggestion should not be dismissed until fingerprint added
- Do not dismiss fingerprint suggestion until atleast one fingerprint is
added.
bug:
36578142
Test: robotest & manually verified.
Change-Id: I3151c9ae971666a0964be007103a9b7ad41de5ce
(cherry picked from commit
51ef801b3245f37680e1513d7f2b22aea02754ba)
Fan Zhang [Thu, 20 Apr 2017 18:01:32 +0000 (11:01 -0700)]
Bidi wrap keyboard names before displaying them.
This is needed because keyboard names can contain characters from mixed
locale. Without Bidi wrapping the labels will be garbled and not
readable.
Change-Id: I47668a65d7bef8828ad0424097834929ec12700d
Fix:
37353900
Test: make RunSettingsRoboTests
Sundeep Ghuman [Thu, 20 Apr 2017 17:49:20 +0000 (17:49 +0000)]
Revert "Force update APs when enabling wifi in WifiSettings."
This reverts commit
1c231d32b125f368e29fc30b6edebc81b9db7623.
Reason for revert: b/
37530557 - ANR in Settings due to deadlock
Change-Id: I85d70aa957dca76189b7600d7b39cb9a09437e91
jackqdyulei [Thu, 20 Apr 2017 17:30:50 +0000 (10:30 -0700)]
Add connect string for bluetooth page
Bug:
37365660
Test: Build
Change-Id: I964b9d25e892666c51dbd98e499be23fe93007ec
Daniel Nishi [Thu, 20 Apr 2017 17:18:27 +0000 (17:18 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev
am:
d6d6185167
Change-Id: I55411a233e2dfb6239d4d2f8e17f32dc2c9fdc73
Daniel Nishi [Thu, 20 Apr 2017 17:05:28 +0000 (17:05 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev
Daniel Nishi [Thu, 20 Apr 2017 17:04:50 +0000 (17:04 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
am:
81f98a8fd5
Change-Id: I70516ed0b6bbc7720d3da33461fed52a0aa8adda
Phil Weaver [Thu, 20 Apr 2017 17:04:28 +0000 (17:04 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev
am:
5ef1135b9f
Change-Id: Ifd07d03a81c62e6f82afec9cb964bc9bc007a54e
jackqdyulei [Thu, 20 Apr 2017 16:59:28 +0000 (09:59 -0700)]
Change "Cell standby" to "Mobile network standby"
Bug:
37356060
Test: Build
Change-Id: I2c726a7f31ae37cf0a31b76e2a99d9c5735692fe
Daniel Nishi [Thu, 20 Apr 2017 16:55:28 +0000 (16:55 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev
Gustav Sennton [Thu, 20 Apr 2017 16:04:02 +0000 (16:04 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
am:
ae72f1eeef
Change-Id: I93b5db79f458b8808935f0d005e3a5631d96e496
Lenka Trochtova [Thu, 20 Apr 2017 16:03:26 +0000 (16:03 +0000)]
Check for user restrictions disallowing BT in BluetoothEnabler.
am:
363b3303c0
Change-Id: I6c85b31a44930e174a8caff04696d70884fc1dbc
Phil Weaver [Thu, 20 Apr 2017 14:52:22 +0000 (14:52 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 12:59:31 +0000 (12:59 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev
Gustav Sennton [Fri, 7 Apr 2017 13:20:42 +0000 (14:20 +0100)]
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
Lenka Trochtova [Tue, 11 Apr 2017 18:29:21 +0000 (20:29 +0200)]
Check for user restrictions disallowing BT in BluetoothEnabler.
Test: make RunSettingsRoboTests -j40
Test: manual
BUG:
35596982
BUG:
32895313
Change-Id: Ie8f53b665a4aad4e6b17b20602cbe5502998d7a2
(cherry picked from commit
479d1971962ea79985535f00a323cd9a1597a553)
Sundeep Ghuman [Thu, 20 Apr 2017 00:18:05 +0000 (00:18 +0000)]
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev
am:
2ba8f10717
Change-Id: If7d84b22d7f232e80b2ad43db828c2566d9145a5
William Luh [Wed, 19 Apr 2017 17:02:31 +0000 (10:02 -0700)]
Update security status icons.
Bug:
36847800
Test: make RunSettingsRoboTests
Also tested manually in app.
Change-Id: I5b7c043ed6af4c5a888710b582e8e69c6e3974c3
Daniel Nishi [Wed, 19 Apr 2017 23:56:54 +0000 (23:56 +0000)]
Merge "Change how we calculate system size." into oc-dev
am:
0b75d39312
Change-Id: Icaf7f87f280cd60ed37e02608821ab07815abbad
Fan Zhang [Wed, 19 Apr 2017 23:56:32 +0000 (23:56 +0000)]
Merge "Display and parse numbers properly in all locales" into oc-dev
am:
28e5271c61
Change-Id: I209c67664d3713609cdc10bde9598f796b167139
TreeHugger Robot [Wed, 19 Apr 2017 23:49:02 +0000 (23:49 +0000)]
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 23:33:56 +0000 (23:33 +0000)]
Merge "Change how we calculate system size." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 23:30:07 +0000 (23:30 +0000)]
Merge "Display and parse numbers properly in all locales" into oc-dev
Matthew Fritze [Wed, 19 Apr 2017 22:36:11 +0000 (22:36 +0000)]
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
am:
552fc2922a
Change-Id: I535dbb31e1951869220b50b4f822c068f9cea0f3
TreeHugger Robot [Wed, 19 Apr 2017 22:29:24 +0000 (22:29 +0000)]
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 21:54:21 +0000 (21:54 +0000)]
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
am:
8025906b7c
Change-Id: Icfe7abd987ad1f4b6a0475904759cc87eb61a00a
Fan Zhang [Wed, 19 Apr 2017 21:54:01 +0000 (21:54 +0000)]
Merge "Fix malformatted preference xml." into oc-dev
am:
569a93b8bb
Change-Id: Ida4d8631bf7f36d68c9022b9ff72cd2ef3cd4995
Adrian Roos [Wed, 19 Apr 2017 21:53:40 +0000 (21:53 +0000)]
Merge "Revert "Changed the ambient display setting name"" into oc-dev
am:
97d3709b25
Change-Id: I6383e11eeba2470bb98822bb393dab909a0c9191
TreeHugger Robot [Wed, 19 Apr 2017 21:48:19 +0000 (21:48 +0000)]
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 21:42:35 +0000 (21:42 +0000)]
Merge "Fix malformatted preference xml." into oc-dev
Fan Zhang [Mon, 17 Apr 2017 23:58:25 +0000 (16:58 -0700)]
Display and parse numbers properly in all locales
Change-Id: Iddf74fd6ed3139eede27733b69a31ce2fa7d1a92
Fix:
37311645
Test: make RunSettingsRoboTests
Sundeep Ghuman [Wed, 19 Apr 2017 00:16:00 +0000 (17:16 -0700)]
Fix scanning settings link clickability in Talkback mode.
Bug: b/
37431709
Test: make RunSettingsRoboTests
Change-Id: I0dc0a524a3c4abd1743748ebc8ebf20937018047
Daniel Nishi [Tue, 18 Apr 2017 21:12:54 +0000 (14:12 -0700)]
Don't show warning dialog on opening ASM settings.
On older devices, the activation warning dialog would show upon the
switchbar changing to On. This was occurring when the page opens
because the status was changing onResume. By shuffling the switchbar
changes into the ASMSwitchBarController, we can register our listener
after the initialization of the switch bar's first status.
Change-Id: I3610d07345684d1e66444981a8059d1c2965e955
Fixes:
37472724
Test: Settings robotests
Adrian Roos [Wed, 19 Apr 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Revert "Changed the ambient display setting name"" into oc-dev
Matthew Fritze [Wed, 19 Apr 2017 15:35:54 +0000 (15:35 +0000)]
Revert "Listen to brigtness updates to update brightness summary."
This reverts commit
4b95879634639e9d3ff81262a87478f081866ca9.
Change-Id: I13de29b0e42a09f6b3618826d7eb2a9ed00a54d8
Merged-In: I09fd9c843a4d32a131b87cd638785af552f81507
Fan Zhang [Wed, 19 Apr 2017 19:41:26 +0000 (12:41 -0700)]
Fix malformatted preference xml.
Change-Id: I48273492bebb280f422b97ad0d5cbe23ff667a53
Fix:
37343765
Test: instrumentation test
Fan Zhang [Wed, 19 Apr 2017 19:39:03 +0000 (19:39 +0000)]
Merge "Fix action bar background not wide enough on tablets" into oc-dev
am:
8cd4b4541d
Change-Id: I226818d439c7351331ff356e4bc25906a6601b9f
Fan Zhang [Wed, 19 Apr 2017 19:38:30 +0000 (19:38 +0000)]
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
am:
4967646661
Change-Id: I6548247f2eb2f4946fd51e109bccfb0ea3bfcfb9
TreeHugger Robot [Wed, 19 Apr 2017 19:36:24 +0000 (19:36 +0000)]
Merge "Fix action bar background not wide enough on tablets" into oc-dev
TreeHugger Robot [Wed, 19 Apr 2017 19:32:54 +0000 (19:32 +0000)]
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev
Daniel Nishi [Tue, 18 Apr 2017 00:25:06 +0000 (17:25 -0700)]
Change how we calculate system size.
As per storage discussions, the best way to calculate storage for the
System is to just take all known data and subtract it from the used
bytes. There is more to the system than just the /system partition and,
even if we ignore the partitions and use the underlying block device
method of calculating it, we run into the problem of it not adding up to
the actual device size.
Change-Id: I6e1f775ea3f3b8b2cc78d734623934651e2fb7b4
Fixes:
37166310
Test: Robotests
Phil Weaver [Wed, 19 Apr 2017 18:09:23 +0000 (11:09 -0700)]
Fix default for a11y shortcut setting
Settings thought the default for "Allow from lock screen" was
on. It's really off.
Bug:
37158451
Test: Manually confirmed that a fresh device now shows off.
Change-Id: I38dc4f6d2bfec5e0c8562c0d2c6e034db461aa98
Fan Zhang [Tue, 18 Apr 2017 23:29:05 +0000 (16:29 -0700)]
Use AfW user handle when setting auto_sync for work
Change-Id: Ib1aa576a0083282dc59d8fe0d5c4784233eef024
Fix:
36675513
Test: make RunSettingsRoboTests
Phil Weaver [Wed, 19 Apr 2017 16:14:47 +0000 (16:14 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
am:
d4ce883c64
Change-Id: I82abeb908dee28948443c05adadc96ba2ca2bea6
Phil Weaver [Wed, 19 Apr 2017 16:09:15 +0000 (16:09 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev
Kevin Chyn [Wed, 19 Apr 2017 08:13:20 +0000 (08:13 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
am:
eb62407114
Change-Id: I720cf3554c54cedfb674e93c552f45ab368734a9
TreeHugger Robot [Wed, 19 Apr 2017 08:07:53 +0000 (08:07 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 02:17:22 +0000 (19:17 -0700)]
Force update APs when enabling wifi in WifiSettings.
Bug: b/
37324736
Test: See bug for repro steps.
Change-Id: I2a789e13781c64d2cc72b059685c5f3dfb9ff2ad
Sunny Goyal [Wed, 19 Apr 2017 02:53:17 +0000 (02:53 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
am:
d2561263a8
Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96
TreeHugger Robot [Wed, 19 Apr 2017 02:43:40 +0000 (02:43 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 02:22:28 +0000 (02:22 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev
am:
36a3579c61
Change-Id: I9c0a79d1caed78275e728fc454a97b4124f1da1e
TreeHugger Robot [Wed, 19 Apr 2017 02:17:31 +0000 (02:17 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev
Fan Zhang [Wed, 19 Apr 2017 01:52:26 +0000 (01:52 +0000)]
Merge "Add test to verify regulatory info launches properly" into oc-dev
am:
4766183336
Change-Id: Idac77bcc7377dd55169f817d39eea52fc757f135
TreeHugger Robot [Wed, 19 Apr 2017 01:48:39 +0000 (01:48 +0000)]
Merge "Add test to verify regulatory info launches properly" into oc-dev
Sundeep Ghuman [Wed, 19 Apr 2017 01:05:34 +0000 (01:05 +0000)]
Merge "IPv6 addresses should not be selectable." into oc-dev
am:
4ae52fc7f0
Change-Id: Ia5943ec8c4c1630ea35b99c1057c0b50cde1d581
TreeHugger Robot [Wed, 19 Apr 2017 00:54:32 +0000 (00:54 +0000)]
Merge "IPv6 addresses should not be selectable." into oc-dev
Phil Weaver [Wed, 19 Apr 2017 00:53:14 +0000 (17:53 -0700)]
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
Sundeep Ghuman [Tue, 18 Apr 2017 22:41:38 +0000 (15:41 -0700)]
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
Adrian Roos [Tue, 18 Apr 2017 23:25:20 +0000 (16:25 -0700)]
Revert "Changed the ambient display setting name"
This reverts commit
8d164e659d492b9b9a380554c888722fa1e215e3.
Fixes:
36516811
Test: Settings > Display > More, observe that it says "Ambient Display" there again.
Change-Id: I2831bc89e430d08f875c05a1441e1b0556df97e5
Sundeep Ghuman [Mon, 17 Apr 2017 21:42:21 +0000 (14:42 -0700)]
IPv6 addresses should not be selectable.
Disable selectable when adding ipv6 addresses to the
WifiNetworkDetailsPage.
Bug: b/
37351354
Test: make RunSettingsRoboTests
Change-Id: I79bc3dcab7339df96598aa1a6505f0148f8844b0
Daniel Nishi [Tue, 18 Apr 2017 21:57:54 +0000 (14:57 -0700)]
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
Saige McVea [Tue, 18 Apr 2017 21:54:38 +0000 (21:54 +0000)]
Merge "Conditionally reposition experimental preferences." into oc-dev
am:
b18e31bc5a
Change-Id: I072311948f0ff2abac3569330ae678da5b5d5ce0
Doris Ling [Tue, 18 Apr 2017 21:54:23 +0000 (21:54 +0000)]
Merge "Listen to brigtness updates to update brightness summary." into oc-dev
am:
a88635f5a3
Change-Id: Ida6ea12152be71e3319479ea73116c68082652b1
Saige McVea [Tue, 18 Apr 2017 21:47:25 +0000 (21:47 +0000)]
Merge "Conditionally reposition experimental preferences." into oc-dev
TreeHugger Robot [Tue, 18 Apr 2017 21:47:05 +0000 (21:47 +0000)]
Merge "Listen to brigtness updates to update brightness summary." into oc-dev
Fan Zhang [Tue, 18 Apr 2017 21:29:51 +0000 (14:29 -0700)]
Fix action bar background not wide enough on tablets
Change-Id: I82e444dc913429c77c768afada24e10c12c79160
Fix:
37475599
Test: make RunSettingsRoboTests
Sunny Goyal [Wed, 12 Apr 2017 22:53:30 +0000 (15:53 -0700)]
Using a common class for loading drawables and handling various badging
Test: make RunSettingsRoboTests -j31
Bug:
36591157
Change-Id: I4cb1d313920d5d8604fd79ff65b40e2dda180e2e
Alison Cichowlas [Tue, 18 Apr 2017 20:49:52 +0000 (20:49 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
am:
cf172040a9
Change-Id: I590ad5b3f2ef6fd5b578e9bdc37d1999d3091a77
Alison Cichowlas [Tue, 18 Apr 2017 20:36:53 +0000 (20:36 +0000)]
Merge "In apps with no channels, provide settings for misc channel in top level." into oc-dev
Doris Ling [Thu, 13 Apr 2017 22:06:36 +0000 (15:06 -0700)]
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
OSDN Git Service
