OSDN Git Service
jackqdyulei [Fri, 21 Apr 2017 00:54:30 +0000 (00:54 +0000)]
Merge "Change "Cell standby" to "Mobile network standby"" into oc-dev am:
746eb9e14c
am:
31eb8cb3d1
Change-Id: Iccf0f71f027d378982fb0f604f9c4d2b2534144e
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:32:59 +0000 (00:32 +0000)]
Merge "Update security status icons." into oc-dev am:
52064f63f0
am:
9fbc10ada8
Change-Id: I952d7bab8a5f567aac8b8c62ef7aae4ed6066c84
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
jackqdyulei [Fri, 21 Apr 2017 00:24:04 +0000 (00:24 +0000)]
Merge "Add connect string for bluetooth page" into oc-dev am:
b172a9a1d9
am:
c5196a2066
Change-Id: I04cc53d4578d1905e401a8d5ef4d4982da3c1601
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
Xiangyu/Malcolm Chen [Fri, 21 Apr 2017 00:07:32 +0000 (00:07 +0000)]
Merge "Reset APN when doing network reset."
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:28:00 +0000 (23:28 +0000)]
Merge "Settings: PreviewPagerAdapter: copy the full theme" am:
b6bbbc91ca am:
aaf9fdc5cf am:
bffc5230f7
am:
cf5053a31f
Change-Id: I4d6ad57c0d469b445b5b1e8311ea5eda73f0cc5d
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"
TreeHugger Robot [Thu, 20 Apr 2017 21:21:53 +0000 (21:21 +0000)]
Merge "Import translations. DO NOT MERGE"
Sundeep Ghuman [Thu, 20 Apr 2017 20:58:13 +0000 (20:58 +0000)]
Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev am:
76ed3e5344
am:
e4d80f99a1
Change-Id: Ia6908c4211e3c4c872436bca7fdf0a7522db38a6
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
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
Bill Yi [Thu, 20 Apr 2017 19:33:03 +0000 (12:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
37353209
Change-Id: I74ac083b61ca01dc00b2f2a5a8a442f8accb6f14
Daniel Nishi [Thu, 20 Apr 2017 18:54:28 +0000 (18:54 +0000)]
Merge "Gracefully handle null volumes after forgetting." into oc-dev am:
d6d6185167
am:
8f68658aef
Change-Id: I1033e51c837c9ed51e424435e8b49cac7eca51dc
Daniel Nishi [Thu, 20 Apr 2017 18:53:59 +0000 (18:53 +0000)]
Merge "Don't show warning dialog on opening ASM settings." into oc-dev am:
81f98a8fd5
am:
c7734f589e
Change-Id: Idc4760b31fa82f2e5387225f3da7c621a8decf4c
Phil Weaver [Thu, 20 Apr 2017 18:53:23 +0000 (18:53 +0000)]
Merge "Fix default for a11y shortcut setting" into oc-dev am:
5ef1135b9f
am:
bffd5636ff
Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce
Malcolm Chen [Wed, 19 Apr 2017 23:12:45 +0000 (16:12 -0700)]
Reset APN when doing network reset.
Bug:
35956245
Test: Manual test
Change-Id: Iadb00c55d41a51204be1678bb77c2367e1bcb775
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:37:22 +0000 (16:37 +0000)]
Merge "Remove WebView MultiProcess Developer Option." into oc-dev am:
ae72f1eeef
am:
b54f96015f
Change-Id: I6dc23db7a2043310860e56d7f5aa0f591f2813ce
Lenka Trochtova [Thu, 20 Apr 2017 16:36:46 +0000 (16:36 +0000)]
Check for user restrictions disallowing BT in BluetoothEnabler. am:
363b3303c0
am:
33707767be
Change-Id: I102ee434e7d8f2931f3cdedffdbb6955b0b8d897
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)
TreeHugger Robot [Thu, 20 Apr 2017 10:23:09 +0000 (10:23 +0000)]
Merge "Check for user restrictions disallowing BT in BluetoothEnabler."
Sundeep Ghuman [Thu, 20 Apr 2017 01:16:57 +0000 (01:16 +0000)]
Merge "Fix scanning settings link clickability in Talkback mode." into oc-dev am:
2ba8f10717
am:
638a864cd5
Change-Id: I3a58f97a7a43902b90af33c265f079c756eead51
Daniel Nishi [Thu, 20 Apr 2017 00:58:05 +0000 (00:58 +0000)]
Merge "Change how we calculate system size." into oc-dev am:
0b75d39312
am:
aebda427d8
Change-Id: I7a0efbf7745fe52d9dbefe94ead07be603b6f96e
Fan Zhang [Thu, 20 Apr 2017 00:57:30 +0000 (00:57 +0000)]
Merge "Display and parse numbers properly in all locales" into oc-dev am:
28e5271c61
am:
feea41f6cc
Change-Id: I3d9ffaa6f13a1d2859c6d591dfcb1c573c7cd11e
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:45:44 +0000 (23:45 +0000)]
Merge "Prevent search crashes from uninstalled apps"
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
TreeHugger Robot [Wed, 19 Apr 2017 23:05:02 +0000 (23:05 +0000)]
Merge "Remove duplicates between battery and display settings"
Matthew Fritze [Wed, 19 Apr 2017 22:57:44 +0000 (22:57 +0000)]
Merge "Revert "Listen to brigtness updates to update brightness summary."" into oc-dev am:
552fc2922a
am:
af89d062b4 -s ours
Change-Id: I81e66724eff9c907d3494d8388ce2ca22b0ae03b
TreeHugger Robot [Wed, 19 Apr 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Use the new OemLockService to get OEM lock state."
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 22:14:15 +0000 (22:14 +0000)]
Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am:
8025906b7c
am:
05f252ec53
Change-Id: I77d68fe604e84e16aa545b119be96241b855abf6
Fan Zhang [Wed, 19 Apr 2017 22:13:53 +0000 (22:13 +0000)]
Merge "Fix malformatted preference xml." into oc-dev am:
569a93b8bb
am:
0a9fddd631
Change-Id: I9aa9f77d224fdd63ec4c2222c510d1958e4f7166
Adrian Roos [Wed, 19 Apr 2017 22:13:21 +0000 (22:13 +0000)]
Merge "Revert "Changed the ambient display setting name"" into oc-dev am:
97d3709b25
am:
1b322f6283
Change-Id: Ia33ee063b87d2cc6951d6a85a88b45b14c67b229
Matthew Fritze [Wed, 22 Mar 2017 20:51:36 +0000 (13:51 -0700)]
Prevent search crashes from uninstalled apps
All search results are now refreshed when resuming the
search fragment, to prevent crashes from results that
no longer exist.
Bug:
34817357
Test: make RunSettingsRoboTests
Change-Id: I96a0cbfee711ab9dee49d56bfdc4e885202d9ecd
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
Matthew Fritze [Tue, 11 Apr 2017 20:22:40 +0000 (13:22 -0700)]
Remove duplicates between battery and display settings
Change preference keys of duplicate settings between
display and battery to avoid duplication in search.
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I56c82e9e7f163d345065ca478849de9b14c173fe
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
Andrew Scull [Tue, 18 Apr 2017 08:40:11 +0000 (09:40 +0100)]
Use the new OemLockService to get OEM lock state.
Previously, the PersistentDataBlockService but that is only one possible
implementation of the OEM lock. The new service abstracts the
implementation so is the API that should be used.
Test: Manual
Bug:
34766843
Change-Id: I5f9cb94996f84c4c082d152f05cd8aef566edc66
TreeHugger Robot [Wed, 19 Apr 2017 20:22:11 +0000 (20:22 +0000)]
Merge "Revert "Listen to brigtness updates to update brightness summary.""
Fan Zhang [Wed, 19 Apr 2017 19:45:50 +0000 (19:45 +0000)]
Merge "Fix action bar background not wide enough on tablets" into oc-dev am:
8cd4b4541d
am:
30dd978830
Change-Id: I2f63be40765bb8d2acd6c9c06809420f53eaa032
Fan Zhang [Wed, 19 Apr 2017 19:45:30 +0000 (19:45 +0000)]
Merge "Use AfW user handle when setting auto_sync for work" into oc-dev am:
4967646661
am:
3acabbdee9
Change-Id: If82d3bcee39eb0c14f1ffb05cb20051d341e2cba
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
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: I09fd9c843a4d32a131b87cd638785af552f81507
Test: None - revert
TreeHugger Robot [Wed, 19 Apr 2017 18:16:58 +0000 (18:16 +0000)]
Merge "Only show headers in Master Clear when there are multiple profiles"
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:16:14 +0000 (16:16 +0000)]
Merge "Respect user's choice on a11y shortcut dialog" into oc-dev am:
d4ce883c64
am:
8a3d606a60
Change-Id: Id39f650645400b4e5076ea0a9cd86925244e76d5
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
Bartosz Fabianowski [Wed, 19 Apr 2017 09:51:43 +0000 (11:51 +0200)]
Only show headers in Master Clear when there are multiple profiles
The Master Clear dialog lists the accounts whose data will be lost by
a factory reset. The list contains the headings "Personal" and "Work"
to distinguish accounts in the main user and the work profile. When
there is no work profile, the header (only "Personal" would be shown in
this case) is superfluous and misleading (as the user may be using the
device for work).
Bug:
30132270
Test: Manual :(
Change-Id: Id493652fc331d4500c4d772a9abcc716995565b3
Kevin Chyn [Wed, 19 Apr 2017 08:15:20 +0000 (08:15 +0000)]
Merge "FP name shouldn't be allowed to allow/display non-null names" into oc-dev am:
eb62407114
am:
98a7794b13
Change-Id: I11f9e5996109f7f5698c389f3a1b0cac63cf2ef6
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 03:03:50 +0000 (03:03 +0000)]
Merge "Using a common class for loading drawables and handling various badging" into oc-dev am:
d2561263a8
am:
77fca989a0
Change-Id: I402e3924400d60c56ee2af2f78b365c5090cccf2
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:24:29 +0000 (02:24 +0000)]
Merge "Remove animations in WifiSettings." into oc-dev am:
36a3579c61
am:
56de2b521a
Change-Id: I17c5421fc80d5a888355d5e1f69f30cea09dc0fd
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
OSDN Git Service
