OSDN Git Service
TreeHugger Robot [Fri, 15 Mar 2019 16:19:14 +0000 (16:19 +0000)]
Merge "Remove parameter from uri when get slice"
TreeHugger Robot [Fri, 15 Mar 2019 16:15:40 +0000 (16:15 +0000)]
Merge "Update api usage for rename"
hughchen [Fri, 15 Mar 2019 07:14:16 +0000 (15:14 +0800)]
Remove parameter from uri when get slice
Slice may added parameter in their uri.
When get slice through uri, removed parameter from uri to get correct slice.
Bug:
128651940
Test: make -j42 RunSettingsRoboTests
Change-Id: Id3cb7b91026384ce4e22c157a2908a5e18bc7993
Kevin Chyn [Fri, 15 Mar 2019 04:43:27 +0000 (04:43 +0000)]
Merge "Update icon"
Kevin Chyn [Fri, 15 Mar 2019 04:22:58 +0000 (04:22 +0000)]
Merge "Update toggle logic"
TreeHugger Robot [Fri, 15 Mar 2019 03:52:46 +0000 (03:52 +0000)]
Merge "Add links to app location permission page"
Amit Mahajan [Fri, 15 Mar 2019 01:55:13 +0000 (18:55 -0700)]
Merge "Move SMS raw db deletion to phone process." am:
479ec92c27 am:
f784db5cae
am:
1285b12980
Change-Id: I349002ff9a72b08056a8af47361de4914afb2b3d
Amit Mahajan [Fri, 15 Mar 2019 01:49:59 +0000 (18:49 -0700)]
Merge "Move SMS raw db deletion to phone process." am:
479ec92c27
am:
f784db5cae
Change-Id: Ib90080a6fad7ad8914390df8e4aa92749669f1a9
Amit Mahajan [Fri, 15 Mar 2019 01:45:50 +0000 (18:45 -0700)]
Merge "Move SMS raw db deletion to phone process."
am:
479ec92c27
Change-Id: I38689f5f833825eae230706b536c4ad1ded847bd
Kevin Chyn [Fri, 15 Mar 2019 00:13:17 +0000 (17:13 -0700)]
Update icon
Bug:
111548033
Test: Builds
Change-Id: I68fd1f0b24a46b762baa1acb1087313ddaaf815b
Kevin Chyn [Fri, 15 Mar 2019 01:25:29 +0000 (18:25 -0700)]
Update toggle logic
Bug:
111548033
Test: Builds
Change-Id: I591297940b48cffe61ca0279ff835ccacd2a625f
Treehugger Robot [Fri, 15 Mar 2019 01:25:28 +0000 (01:25 +0000)]
Merge "Move SMS raw db deletion to phone process."
TreeHugger Robot [Fri, 15 Mar 2019 01:20:19 +0000 (01:20 +0000)]
Merge "Make Panel accept TitleItem for first row"
Lifu Tang [Thu, 14 Mar 2019 22:55:52 +0000 (15:55 -0700)]
Add links to app location permission page
Bug:
121271387
Test: build, flash, and test manually
Change-Id: I188b7113c2421c66b03e8330f141f514991450fe
TreeHugger Robot [Thu, 14 Mar 2019 21:48:23 +0000 (21:48 +0000)]
Merge "Use CustomSliceRegistry directly when possible."
Brad Ebinger [Thu, 14 Mar 2019 21:23:55 +0000 (21:23 +0000)]
Merge "Do not show Provisioning items for IMS if it is not enabled."
Fan Zhang [Wed, 13 Mar 2019 22:58:18 +0000 (15:58 -0700)]
Use CustomSliceRegistry directly when possible.
This is one step closer to (un)make CustomSliceManager an singleton.
Bug:
123937830
Test: manual
Change-Id: I844d0fb798c73e2af1945ecb667ba73fac9edf72
Oscar Shu [Thu, 14 Mar 2019 20:12:41 +0000 (20:12 +0000)]
Merge "Change feature flag to correct flag"
TreeHugger Robot [Thu, 14 Mar 2019 19:15:49 +0000 (19:15 +0000)]
Merge "Reduce scope for some methods in SliceFeatureProvider"
jackqdyulei [Thu, 14 Mar 2019 17:58:35 +0000 (10:58 -0700)]
Make Panel accept TitleItem for first row
Fixes:
128611750
Test: Manual
Change-Id: If1604f293d9fa7d538750a07cdbb729f5cc099dc
TreeHugger Robot [Thu, 14 Mar 2019 16:59:59 +0000 (16:59 +0000)]
Merge "Disable avatar and contextual cards on low ram devices."
Cosmo Hsieh [Thu, 14 Mar 2019 10:10:54 +0000 (10:10 +0000)]
Merge "[Passpointv2] Implement DataUsage header for Wi-Fi detail fragment"
cosmohsieh [Thu, 7 Mar 2019 03:51:39 +0000 (11:51 +0800)]
[Passpointv2] Implement DataUsage header for Wi-Fi detail fragment
Change header to a data usage chart of the specified Wi-Fi network.
Bug:
124700353
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings
Change-Id: Ide08ffd5e97ced5fe54707562690155414598dac
Amit Mahajan [Thu, 14 Mar 2019 00:32:39 +0000 (17:32 -0700)]
Move SMS raw db deletion to phone process.
Test: manual
Bug:
127929687
Change-Id: Ib23efc647fbd4b3007197932b9493393dc5b4d5b
xshu [Wed, 13 Mar 2019 23:37:25 +0000 (16:37 -0700)]
Change feature flag to correct flag
Sorry, I provided the wrong flag that was supposed to be fore p2p MAC
randomization. Changing to the correct flag now.
Bug:
127817791
Test: compile
Change-Id: I46828e17411372c5e347b4fd17d853fe95f024a4
Fan Zhang [Wed, 13 Mar 2019 22:19:51 +0000 (15:19 -0700)]
Reduce scope for some methods in SliceFeatureProvider
Bug:
123937830
Test: rebuild
Change-Id: I62db60e8313fc94324b476642fe27a215b76b33d
TreeHugger Robot [Wed, 13 Mar 2019 22:15:29 +0000 (22:15 +0000)]
Merge "Rename accessibility services to apps."
Fan Zhang [Wed, 13 Mar 2019 21:57:09 +0000 (21:57 +0000)]
Merge "Fix robotests"
TreeHugger Robot [Wed, 13 Mar 2019 21:40:30 +0000 (21:40 +0000)]
Merge "Fix dynamic pref summary for IMEI."
Fan Zhang [Wed, 13 Mar 2019 21:32:51 +0000 (21:32 +0000)]
Merge "Refactor CustomSliceManager."
Fan Zhang [Wed, 13 Mar 2019 21:26:26 +0000 (14:26 -0700)]
Fix robotests
Fixes:
128536554
Test: rerun robotests
Change-Id: Ife81f9d161fc416a63a9b2f04ce2ae4f9a1e74db
Fan Zhang [Wed, 13 Mar 2019 20:07:52 +0000 (13:07 -0700)]
Disable avatar and contextual cards on low ram devices.
Fixes:
124127763
Test: robotest & manually inspected hprof
Change-Id: I8d328b782a9b1871b76edf433d2378d06face14a
TreeHugger Robot [Wed, 13 Mar 2019 19:45:25 +0000 (19:45 +0000)]
Merge "Align layouts between single and two target preferences."
Joel Galenson [Wed, 13 Mar 2019 19:36:58 +0000 (12:36 -0700)]
Rename accessibility services to apps.
Fixes:
127657530
Test: View strings.
Change-Id: I56ab9b5f12808e5af0d9fe2afa64629805c02f1c
Fan Zhang [Wed, 13 Mar 2019 19:21:20 +0000 (12:21 -0700)]
Fix dynamic pref summary for IMEI.
Fixes:
128468762
Test: reindex
Change-Id: I8c7cb385a877b656515872507b2c64d14bae638d
Matthew Fritze [Thu, 28 Feb 2019 18:42:56 +0000 (10:42 -0800)]
Disable Moblie Data Slice in AP mode
When airplane mode is enabled, users should not be able to
change the value of mobile data. Thus, when airplane mode is enabled,
replace the Slice with a no-op slice explaining why it cannot be
changed.
Fixes:
119411534
Fixes:
126726036
Test: robotests
Change-Id: I991fe05ad8f18004f77fbf1c87403de602d3a267
Chandan Nath [Wed, 13 Mar 2019 11:09:21 +0000 (11:09 +0000)]
Merge "[Multi-user] Show Backup only if Backup is activated"
Kiyoung Kim [Wed, 13 Mar 2019 05:31:41 +0000 (22:31 -0700)]
[automerger skipped] Merge "Schematize Crypto state system property" am:
6c38df5eff am:
7dc288a899
am:
8b8bf4c39e -s ours
am skip reason: change_id I957a8e37a88f7bb6d5007a36c02952d3539580fe with SHA1
4d7bd6d85e is in history
Change-Id: I4df0425e2b933347ad52ec50f67db55428be5185
Kiyoung Kim [Wed, 13 Mar 2019 05:09:21 +0000 (22:09 -0700)]
Merge "Schematize Crypto state system property" am:
6c38df5eff
am:
7dc288a899
Change-Id: I865d37316469126cf1cd1bf93bd7427882042c3d
Kiyoung Kim [Wed, 13 Mar 2019 04:34:09 +0000 (21:34 -0700)]
Merge "Schematize Crypto state system property"
am:
6c38df5eff
Change-Id: I3ef29bc153839fd18b1144c8128ddf4dbc1e4f60
Salvador Martinez [Wed, 13 Mar 2019 02:25:39 +0000 (02:25 +0000)]
Merge "Remove unneeded airplane mode strings"
Treehugger Robot [Wed, 13 Mar 2019 01:30:58 +0000 (01:30 +0000)]
Merge "Schematize Crypto state system property"
TreeHugger Robot [Wed, 13 Mar 2019 01:10:04 +0000 (01:10 +0000)]
Merge "Suppress search from one of the build number prefs."
TreeHugger Robot [Wed, 13 Mar 2019 00:32:38 +0000 (00:32 +0000)]
Merge "Update battery string"
TreeHugger Robot [Wed, 13 Mar 2019 00:16:47 +0000 (00:16 +0000)]
Merge "Revert battery info string to be about percentage"
TreeHugger Robot [Wed, 13 Mar 2019 00:01:07 +0000 (00:01 +0000)]
Merge "Move dark theme above advanced"
Fan Zhang [Tue, 12 Mar 2019 23:51:32 +0000 (23:51 +0000)]
Merge "Fix robotests"
Fan Zhang [Tue, 12 Mar 2019 18:00:09 +0000 (11:00 -0700)]
Fix robotests
This is related to settings_network_and_internet_v2 flag turn on. Some
tests were assuming old flag behavior.
Fixes:
128356137
Test: robotests
Change-Id: I4eca49f24ad5a10a0fb40f2c02a2d139ba4cb1a4
Fan Zhang [Tue, 12 Mar 2019 22:46:12 +0000 (15:46 -0700)]
Refactor CustomSliceManager.
- Make everything that can be static, static.
- Also removed a unused slice for battery info.
Next step - going to make CustomSliceManager into a regular class
instead of getting it from FeatureProvider. This way it's no longer an
application level singleton, then we can do things like attaching
lifecycle to it. It will be easier to deal with "session" based use case
after the refactor
Bug:
123937830
Test: manual
Change-Id: I384761a6894fa907f72a3610437835c4dd4d1944
Salvador Martinez [Tue, 12 Mar 2019 19:59:29 +0000 (12:59 -0700)]
Remove unneeded airplane mode strings
Wifi tether doesn't care about airplane more anymore so we don't
need these.
Test: robotests pass
Bug:
111681176
Change-Id: Icf2cc8c944dc9e2c6f7bdf11478a2772292ea913
Hall Liu [Tue, 12 Mar 2019 23:15:34 +0000 (16:15 -0700)]
[automerger skipped] Merge "Add description for Wi-Fi calling mode" am:
13e02af2ad am:
a10d7031c3
am:
6e28351779 -s ours
am skip reason: change_id If9792b0a35c59c1260176b4b2c62107861de73b5 with SHA1
c449048ac1 is in history
Change-Id: Ibfeb4b2bf490ce272de8559e9f08c70d4322c73b
Fan Zhang [Tue, 12 Mar 2019 19:50:20 +0000 (12:50 -0700)]
Suppress search from one of the build number prefs.
And make the search-enabled one copyable.
Fixes:
127962713
Test: search
Change-Id: I0867ea8a376e3aac5e94cd70245833b516bb154d
Hall Liu [Tue, 12 Mar 2019 22:52:22 +0000 (15:52 -0700)]
Merge "Add description for Wi-Fi calling mode" am:
13e02af2ad
am:
a10d7031c3
Change-Id: I18deb6cc090f077ed6d49decdadf7d642075ec5a
TreeHugger Robot [Tue, 12 Mar 2019 22:10:39 +0000 (22:10 +0000)]
Merge "Hide network & internet top level entry for demo users."
Salvador Martinez [Mon, 11 Mar 2019 22:15:45 +0000 (15:15 -0700)]
Revert battery info string to be about percentage
This was originally going to do something new, but we decided
it should just control percentage in the status bar after all.
Test: robotests pass
Bug:
127518748
Change-Id: I073a19c27de43cba35031f073c2e606b483a69fd
jackqdyulei [Tue, 12 Mar 2019 21:24:35 +0000 (14:24 -0700)]
Update battery string
Fixes:
128318092
Test: Build
Change-Id: Ib38a3f84c6029e84b2a189fb5cffc0ea9cac33d6
Hall Liu [Tue, 12 Mar 2019 21:06:12 +0000 (14:06 -0700)]
Merge "Add description for Wi-Fi calling mode"
am:
13e02af2ad
Change-Id: Iff0a3e6f814a8fbd7b3910589c5e712cd9dc9b26
Hall Liu [Tue, 12 Mar 2019 20:49:21 +0000 (20:49 +0000)]
Merge "Add description for Wi-Fi calling mode"
Fan Zhang [Tue, 12 Mar 2019 18:13:03 +0000 (11:13 -0700)]
Hide network & internet top level entry for demo users.
Fixes:
113705941
Test: robotest
Change-Id: I72fdc4c7221963ae61e037c709b5158c207bd3e4
Salvador Martinez [Tue, 12 Mar 2019 18:27:36 +0000 (18:27 +0000)]
Merge "Remove airplane mode restriction on hotspot"
TreeHugger Robot [Tue, 12 Mar 2019 16:22:11 +0000 (16:22 +0000)]
Merge "Update screen lock complexity permission to password complexity"
Chandan Nath [Tue, 12 Mar 2019 10:52:53 +0000 (10:52 +0000)]
[Multi-user] Show Backup only if Backup is activated
This almost reverts the change to SettingsActivity#doUpdateTilesList in ag/
6140694
except that instead of setting enabled to true, we set it to whether
backup is activated for this user.
Bug:
124114084
Test: 1a) Set up secondary user
1b) See that there is no Backup option in Settings Homepage - System
1c) adb shell bmgr --user 10 activate true
1d) Backup option is now present
1e) adb shell bmgr --user 10 activate false
1f) Backup option isnt there again
Change-Id: I3f17aabee92bedc91386444c2f0aede696d0fd13
timhypeng [Mon, 4 Mar 2019 08:32:47 +0000 (16:32 +0800)]
Sound + Output Switcher on Sound Setting
1. Show "play media to" item when Previously Connected device is available
2. Click "Play media to" to launch output slice
3. Update test case
Bug:
126475101
Test: make -j50 RunSettingsRoboTests
Change-Id: Id8afd1a2407acb78c11e81d2420ae8c16130a321
TreeHugger Robot [Tue, 12 Mar 2019 02:50:02 +0000 (02:50 +0000)]
Merge "Update output switcher behavior and UI design"
Kazuya Ohshiro [Mon, 29 Aug 2016 09:29:35 +0000 (18:29 +0900)]
Add description for Wi-Fi calling mode
Replace the view of dialog with custom view that adds description
as summary.
Test: manual
Bug:
34793636
Change-Id: If9792b0a35c59c1260176b4b2c62107861de73b5
Merged-In: If9792b0a35c59c1260176b4b2c62107861de73b5
Hall Liu [Tue, 12 Mar 2019 01:40:43 +0000 (01:40 +0000)]
Merge "Add description for Wi-Fi calling mode"
TreeHugger Robot [Tue, 12 Mar 2019 01:37:54 +0000 (01:37 +0000)]
Merge "Revert "Disable Moblie Data Slice in AP mode""
TreeHugger Robot [Tue, 12 Mar 2019 01:17:33 +0000 (01:17 +0000)]
Merge "Make settings do nothing if ranking for a card is invalid"
TreeHugger Robot [Tue, 12 Mar 2019 01:11:09 +0000 (01:11 +0000)]
Merge "Add new strings for Wi-Fi Connectivity"
TreeHugger Robot [Tue, 12 Mar 2019 01:05:10 +0000 (01:05 +0000)]
Merge "Update the color of the expand icon as accent color"
Brad Ebinger [Tue, 12 Mar 2019 00:33:53 +0000 (17:33 -0700)]
Do not show Provisioning items for IMS if it is not enabled.
Do not show IMS related items if FEATURE_TELEPHONY_IMS
is not defined for this device.
Bug:
118823723
Test: manual
Change-Id: I9624535fe766cd79eadb30502c1a0574650a02ef
TreeHugger Robot [Tue, 12 Mar 2019 00:42:40 +0000 (00:42 +0000)]
Merge changes I54a3f033,I2e894501
* changes:
Fix [a11y] Wi-Fi Easy Connect Talkback issues
Support to share Wi-Fi hotspot via QR code
Matthew Fritze [Mon, 11 Mar 2019 23:58:41 +0000 (23:58 +0000)]
Revert "Disable Moblie Data Slice in AP mode"
This reverts commit
6b065caf7ebf7c6311ae067e7ed6c840e651cb31.
Reason for revert: flaky test: b/
128355821
Change-Id: I4fccac1bf7978c5743bde9dd9bb0b76ea4733d2b
Fan Zhang [Mon, 11 Mar 2019 23:17:58 +0000 (16:17 -0700)]
Make settings do nothing if ranking for a card is invalid
Fixes:
124386997
Test: robotests
Change-Id: Ib01c75ec0490cdc034255300a09e8099e05fc389
Salvador Martinez [Mon, 11 Mar 2019 22:49:59 +0000 (15:49 -0700)]
Move dark theme above advanced
This CL simply adds an extra child count to show above the
advanced toggle in display settings and moves dark theme up
so it shows by default.
Test: robotests pass
Fixes:
123995869
Change-Id: I15a33d558dc5f1eb0e972bc708d565fcdb7734d5
Chris.CC Lee [Wed, 6 Mar 2019 11:49:15 +0000 (19:49 +0800)]
Align layouts between single and two target preferences.
Change the layout to align view components with TwoTargetPreference.
Fixes:
124084391
Test: Visual
Change-Id: I417a8e442bd80c51be04e3f33514a6605c9b45f8
Kazuya Ohshiro [Mon, 29 Aug 2016 09:29:35 +0000 (18:29 +0900)]
Add description for Wi-Fi calling mode
Replace the view of dialog with custom view that adds description
as summary.
Test: manual
Bug:
34793636
Change-Id: If9792b0a35c59c1260176b4b2c62107861de73b5
Quang Luong [Mon, 11 Mar 2019 19:46:03 +0000 (19:46 +0000)]
Merge "Use getTitle() for AccessPoint display name"
Salvador Martinez [Mon, 11 Mar 2019 18:15:31 +0000 (11:15 -0700)]
Update api usage for rename
setPowerSaverMode -> setPowerSaverModeEnabled
Test: phone boots, tests pass
Bug:
117154042
Change-Id: I7bf5f9e7898b766a798b0af19d17554cd2fce62d
TreeHugger Robot [Mon, 11 Mar 2019 17:22:39 +0000 (17:22 +0000)]
Merge "Use a boolean Consumer instead of RoleManagerCallback."
bernardchau [Mon, 11 Mar 2019 16:39:08 +0000 (16:39 +0000)]
Update screen lock complexity permission to password complexity
This is to match the method name "getPasswordComplexity" as requested by API review feedback
Bug:
128030136
Test: N/A
Change-Id: Ia4ce1b0ceb581608615364b41a05ca71142ef2b7
Kevin Chang [Mon, 11 Mar 2019 08:21:13 +0000 (08:21 +0000)]
Merge "Add test cases for BalanceSeekBar"
hughchen [Wed, 6 Mar 2019 08:55:21 +0000 (16:55 +0800)]
Update output switcher behavior and UI design
- Remove media stream stuff, use active device info as header.
- Show the sub title of media device.
- Add new requirement, when user click disconnected bluetooth device,
will auto connceted it.
- When bluetooth state is off, do not showing content of slice.
Bug:
127201385
Test: make -j42 RunSettingsRoboTests
Change-Id: Ie1880ba3ef9910a42caf0cca2b6502e54787f5a0
Kevin Chang [Sat, 23 Feb 2019 00:46:34 +0000 (08:46 +0800)]
Add test cases for BalanceSeekBar
Bug:
123722274
Test: Manual
make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBar
Change-Id: Ie6b560b2f92d78a0d3bd7ddb0e0d0a85c7803827
Fan Zhang [Sat, 9 Mar 2019 16:36:41 +0000 (08:36 -0800)]
[automerger skipped] [automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444 am:
9366d11e6d am:
657f8713ff am:
1b29c28aef
am:
0ee2857d0a -s ours
am skip reason: change_id I4be265565678302fad207839216d5cd65dcb6e94 with SHA1
9d46e1fdfe is in history
Change-Id: Ie84c7488db95a1693b8f6bf3ceaf7033dc3acc75
Chalard Jean [Sat, 9 Mar 2019 12:20:32 +0000 (04:20 -0800)]
Merge "Support VPN Proxy(2/2)" am:
2a695c4b7b am:
e2f74af063
am:
aa5d185d7b
Change-Id: Ifa4ac76f78e24296a29f99f5733075651bed9072
TreeHugger Robot [Sat, 9 Mar 2019 07:00:48 +0000 (07:00 +0000)]
Merge "Bluetooth slice polish"
TreeHugger Robot [Sat, 9 Mar 2019 05:09:59 +0000 (05:09 +0000)]
Merge "Fix Face auth header icon"
TreeHugger Robot [Sat, 9 Mar 2019 04:16:41 +0000 (04:16 +0000)]
Merge "Implemented Settings.ACTION_REQUEST_ENABLE_CONTENT_CAPTURE"
TreeHugger Robot [Sat, 9 Mar 2019 02:51:17 +0000 (02:51 +0000)]
Merge "Make Face enroll left button "Skip" during SUW"
Maurice Lam [Sat, 9 Mar 2019 01:15:42 +0000 (17:15 -0800)]
Fix Face auth header icon
Like the fingerprint enroll flow, the icon should be blue and have
size 32dp
Test: Manual
Bug:
127985682
Change-Id: I22e1b0c3294b4eedc7359c611c9b1c2c5a09c439
Raff Tsai [Sat, 9 Mar 2019 01:53:35 +0000 (01:53 +0000)]
Merge "Fix Settings crash"
Salvador Martinez [Fri, 8 Mar 2019 22:38:21 +0000 (14:38 -0800)]
Remove airplane mode restriction on hotspot
This isn't needed anymore since we support this now.
Test: robotests
Bug:
111681176
Change-Id: I0292f0a38347e4fa3414170e0351a53f5997a192
TreeHugger Robot [Sat, 9 Mar 2019 00:25:44 +0000 (00:25 +0000)]
Merge "[MAC Randomization] Align feature flag to global flag as framework"
TreeHugger Robot [Fri, 8 Mar 2019 23:42:39 +0000 (23:42 +0000)]
Merge "Remove "add another fingerprint" suggestion"
Fan Zhang [Fri, 8 Mar 2019 23:27:25 +0000 (15:27 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444 am:
9366d11e6d am:
657f8713ff
am:
1b29c28aef
Change-Id: I549324f01db9afe19e21c6c01f02ce3f2a444c33
Maurice Lam [Fri, 8 Mar 2019 21:07:39 +0000 (13:07 -0800)]
Make Face enroll left button "Skip" during SUW
Test: Manual
Bug:
120797018
Change-Id: I5539fc3e3fa9f5ffc7413f8bd44504ee1e5c4c86
TreeHugger Robot [Fri, 8 Mar 2019 23:20:29 +0000 (23:20 +0000)]
Merge "Fix unit test problems in MobileNetworkSummaryController"
Fan Zhang [Fri, 8 Mar 2019 23:07:53 +0000 (15:07 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444 am:
9366d11e6d
am:
657f8713ff
Change-Id: I501ba68b3f6691a627a8828aeca16d495ee52126
Fan Zhang [Fri, 8 Mar 2019 23:01:41 +0000 (15:01 -0800)]
[automerger] Do not allow draw on top for default sms picker. am:
95d0fb7f49 am:
b810aee20f am:
7a58589114 am:
7926131837 am:
d6bde3f5b8 am:
ba87cf7444
am:
9366d11e6d
Change-Id: Icd4cf6000dd9d72f486417f1d11dde008d49c513