OSDN Git Service
Arc Wang [Wed, 27 Feb 2019 03:33:43 +0000 (11:33 +0800)]
Fix Settings crash after clicking 'Share Wi-Fi' button
When connecting to an open network, Settings crash after
scanning Wi-Fi DPP QR code and clicking 'Share Wi-Fi' button.
When choosing default network for configurator usage, should
make sure if it supports Wi-Fi DPP or not.
Bug:
126456582
Test: manual test
atest WifiQrCodeTest
WifiDppConfiguratorActivityTest
WifiDppEnrolleeActivityTest
WifiDppQrCodeGeneratorFragmentTest
WifiDppQrCodeScannerFragmentTest
WifiNetworkListFragmentTest
WifiDppChooseSavedWifiNetworkFragmentTest
Change-Id: I66ee9b01314b84213ecb3016e6e72ff71af8dfc7
TreeHugger Robot [Mon, 25 Feb 2019 02:22:39 +0000 (02:22 +0000)]
Merge "Remove hardcoded Uri to get slice settings"
Lei Yu [Mon, 25 Feb 2019 01:15:26 +0000 (01:15 +0000)]
Merge "Fix issues in BT detail header"
TreeHugger Robot [Sun, 24 Feb 2019 18:31:16 +0000 (18:31 +0000)]
Merge "Do not trigger card loader reloading upon screen rotation."
TreeHugger Robot [Sat, 23 Feb 2019 08:47:15 +0000 (08:47 +0000)]
Merge "Fix no result for "Privacy" keyword"
TreeHugger Robot [Sat, 23 Feb 2019 08:44:18 +0000 (08:44 +0000)]
Merge "Replace Banner with App Title Text"
TreeHugger Robot [Sat, 23 Feb 2019 08:31:36 +0000 (08:31 +0000)]
Merge "Fix crash on AppBarLayout"
tmfang [Tue, 12 Feb 2019 05:06:24 +0000 (13:06 +0800)]
Fix no result for "Privacy" keyword
We can't have same title string at the same time.
Test: search again, and see result.
Fixes:
123775284
Change-Id: I53afa64e723a0b1d6b8fefe0dbded64b7cd8f0de
tmfang [Sat, 23 Feb 2019 05:28:00 +0000 (13:28 +0800)]
Fix crash on AppBarLayout
We removed some theme attribute in ag/
6501484,
so we need to add it back to avoid crash on App info page.
Fixes:
125987673
Test: Build again, and go to "App info" page.
Change-Id: I2fda899ecd2db48c7ace5069ef59a49883200dff
TreeHugger Robot [Sat, 23 Feb 2019 04:30:23 +0000 (04:30 +0000)]
Merge "Create settings screen for Notification Assistant"
Yi-Ling Chuang [Wed, 20 Feb 2019 12:00:26 +0000 (20:00 +0800)]
Do not trigger card loader reloading upon screen rotation.
Use the cached loaded results when it is not the first launch.
Fixes:
123941365
Test: robotests
Change-Id: Ib6de1142b12196e997a8c19122617e9215d23655
TreeHugger Robot [Sat, 23 Feb 2019 03:07:19 +0000 (03:07 +0000)]
Merge "Remove feature flag for contextual home."
TreeHugger Robot [Sat, 23 Feb 2019 02:15:26 +0000 (02:15 +0000)]
Merge "Add app entities widget for recently opened apps"
TreeHugger Robot [Sat, 23 Feb 2019 01:38:21 +0000 (01:38 +0000)]
Merge "Update BT pairing dialog"
Fan Zhang [Fri, 22 Feb 2019 21:53:09 +0000 (13:53 -0800)]
Remove feature flag for contextual home.
Fixes:
118444000
Test: rebuild
Change-Id: I4b42e22bd93c2d79bacbd40b28912b4e6808325a
jackqdyulei [Fri, 22 Feb 2019 23:31:35 +0000 (15:31 -0800)]
Update BT pairing dialog
1. Remove hardcoded color
2. Add taskAffinity for activity
Fixes:
124953564
Fixes:
124958778
Test: Manual
Change-Id: Id57fadc02e3c4fa3683632c0ad6a451117b732f1
Fan Zhang [Fri, 22 Feb 2019 22:51:18 +0000 (22:51 +0000)]
Merge "Add fancy animation for IA fragment"
jackqdyulei [Fri, 22 Feb 2019 21:19:36 +0000 (13:19 -0800)]
Remove hardcoded Uri to get slice settings
Now we get it from BluetoothDevice.getMetaData()
Bug:
124121451
Test: RunSettingsRoboTests
Change-Id: Id96480f257b93dd03bb290c954e01cde9dcf30ad
jackqdyulei [Fri, 22 Feb 2019 20:42:07 +0000 (12:42 -0800)]
Fix issues in BT detail header
1. Update isAvailable() in controller
2. Update method to get fast pair icon
Bug:
124455912
Test: RunSettingsRoboTests
Change-Id: I24a04c8c91d74e9b8b7e8746ad6279fafa37f0a9
Doris Ling [Fri, 22 Feb 2019 22:17:38 +0000 (22:17 +0000)]
Merge "Disable App data usage preference if there's no usage data."
Lei Yu [Fri, 22 Feb 2019 21:50:04 +0000 (21:50 +0000)]
Merge "Update advanced bt header"
Pavel Grafov [Fri, 22 Feb 2019 20:11:43 +0000 (20:11 +0000)]
Merge "Don't hide "Add user" when disallowed by admin"
Lei Yu [Fri, 22 Feb 2019 19:21:24 +0000 (19:21 +0000)]
Merge "Fix alignment of wifi dialog"
Doris Ling [Thu, 21 Feb 2019 23:56:19 +0000 (15:56 -0800)]
Disable App data usage preference if there's no usage data.
- when there is no usage data at all, launching the app data usage page
will show something blank, as there's no cycle with available usage
data. Check the overall historic usage to make sure that there's
usage data to be shown, otherwise, disable the preference.
Fixes:
123518021
Test: make RunSettingsRoboTests
Change-Id: I2d19f85e8618c41e2c31b9e4259cdc522f69e371
Fabian Kozynski [Wed, 20 Feb 2019 17:55:10 +0000 (12:55 -0500)]
Create settings screen for Notification Assistant
Test: this atest
Test: manual: change assistant and "adb shell dumpsys notification"
Test: manual: verify persistance through reboot (including none)
Fixes:
120852765
Change-Id: Ie4516c3339246d66d7b6719ac5dd1d65c4d03b57
Fan Zhang [Fri, 22 Feb 2019 17:49:00 +0000 (17:49 +0000)]
Merge "Update subTitle of NotificationChannelSlice"
TreeHugger Robot [Fri, 22 Feb 2019 17:30:39 +0000 (17:30 +0000)]
Merge "Set the timeout limit of contextual card loading back to 1 second."
Fan Zhang [Fri, 22 Feb 2019 17:22:51 +0000 (17:22 +0000)]
Merge "Fix some test cases fail"
TreeHugger Robot [Fri, 22 Feb 2019 16:30:34 +0000 (16:30 +0000)]
Merge "Add onPreferenceClickListener to dnd schedule"
TreeHugger Robot [Fri, 22 Feb 2019 11:28:23 +0000 (11:28 +0000)]
Merge "Fix testcase error"
Yi-Ling Chuang [Fri, 22 Feb 2019 10:05:13 +0000 (18:05 +0800)]
Set the timeout limit of contextual card loading back to 1 second.
After making card pre binding work in paralell, the loading time is now
less than 1 second.
Bug:
124366297
Test: robotests
Change-Id: Ib5daececa73ed9e9cf62a18971c6042d9150aad7
tmfang [Fri, 22 Feb 2019 07:46:38 +0000 (15:46 +0800)]
Fix some test cases fail
Test: robo test
Fixes:
125599276
Change-Id: I4b1b15f69ff3021e4330bed49ac95ea871b98e92
Kevin Chyn [Fri, 22 Feb 2019 09:21:53 +0000 (09:21 +0000)]
Merge "Add placeholder animation for face enrolling"
Raff Tsai [Fri, 22 Feb 2019 08:59:37 +0000 (16:59 +0800)]
Fix testcase error
Fixes:
125604750
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.wifi.AddNetworkFragmentTest"
Change-Id: Id787c5715d0f60491f123fab58e2b0ca3093bcd9
Mill Chen [Wed, 20 Feb 2019 09:12:49 +0000 (17:12 +0800)]
Add fancy animation for IA fragment
The animation of IA fragment is very choppy on expanding or collapsing
conditionals. So adding LayoutTransition for IA fragment makes the
animation more smoothly.
Bug:
123536786
Bug:
123537499
Test: visual, robotests
Change-Id: I731db8556ac392c9ab98bd292498ccf6c87295fb
TreeHugger Robot [Fri, 22 Feb 2019 08:06:25 +0000 (08:06 +0000)]
Merge "[Passpointv2] Implement Wi-Fi detail page for saved network"
cosmohsieh [Wed, 20 Feb 2019 05:26:08 +0000 (13:26 +0800)]
[Passpointv2] Implement Wi-Fi detail page for saved network
Will show a Wi-Fi status detail page when clicking a saved network.
Bug:
124695272
Test: Manual
Change-Id: I5f32cf63f369593ad49c93ceeaace9fb623888e5
TreeHugger Robot [Fri, 22 Feb 2019 05:31:33 +0000 (05:31 +0000)]
Merge "Add progress bar for Wi-Fi DPP handshaking"
TreeHugger Robot [Fri, 22 Feb 2019 04:17:52 +0000 (04:17 +0000)]
Merge "Update name of app permissions."
Kevin Chyn [Fri, 22 Feb 2019 01:52:17 +0000 (17:52 -0800)]
Add placeholder animation for face enrolling
Bug:
111548033
Test: Builds
Change-Id: I0c8af1c24cc7c11f9d2c2a98b23d11b21b63547e
Arc Wang [Wed, 20 Feb 2019 09:17:59 +0000 (17:17 +0800)]
Add progress bar for Wi-Fi DPP handshaking
Bug:
124127483
Test: manual test
Change-Id: I1c3da5bab98da57ca8cf10509f339e99b01ebdbf
TreeHugger Robot [Fri, 22 Feb 2019 03:28:20 +0000 (03:28 +0000)]
Merge "Remove all reference to settings_side_margin."
TreeHugger Robot [Fri, 22 Feb 2019 02:32:31 +0000 (02:32 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 22 Feb 2019 02:18:56 +0000 (18:18 -0800)]
[automerger skipped] Import translations. DO NOT MERGE am:
02681df33f -s ours
am:
1b7db3cb3e -s ours
am skip reason: subject contains skip directive
Change-Id: Ic70c8fb15bf6782a939c35d7a55a636e6b7def60
Bill Yi [Fri, 22 Feb 2019 02:14:54 +0000 (18:14 -0800)]
[automerger skipped] Import translations. DO NOT MERGE
am:
02681df33f -s ours
am skip reason: subject contains skip directive
Change-Id: Ib86fee981b4acd47fa9dc91011fe8d88fd7230c8
Youming Ye [Fri, 22 Feb 2019 01:55:59 +0000 (01:55 +0000)]
Merge "Fix issue that the wifi calling text cannot be customized based on sim"
Bill Yi [Fri, 22 Feb 2019 00:40:33 +0000 (16:40 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibed56c778ac43fbfa0c4ca9973b894b9cf8e5f63
Bill Yi [Thu, 21 Feb 2019 23:23:35 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibd2044c3c61557678d3c1dad06570f8df1e5f1b6
Auto-generated-cl: translation import
jackqdyulei [Thu, 21 Feb 2019 21:25:21 +0000 (13:25 -0800)]
Fix alignment of wifi dialog
Use Start/End instead of Left/Right
Fixes:
124672866
Test: Manual
Change-Id: Ib75634b751f41e4999e4f8e3ffb014c191c517f0
Michele Berionne [Thu, 21 Feb 2019 21:24:44 +0000 (21:24 +0000)]
Merge "Add checks on multisim capabilities."
Joel Galenson [Thu, 21 Feb 2019 20:44:15 +0000 (12:44 -0800)]
Update name of app permissions.
Bug:
125018087
Test: See new name.
Change-Id: I036fec254bca3c0ce15843375e632fcb359898db
jackqdyulei [Thu, 14 Feb 2019 23:56:52 +0000 (15:56 -0800)]
Update advanced bt header
1. Add callback to listen to device update
2. Add charging support for bt battery icon
3. When disconnected, only show main icon
Follow CL will update battery icon to show exclamation when it is
low.
Bug:
124455912
Test: RunSettingsRoboTests
Change-Id: I03fb3bf4c4b77711e14b1f2f53733771b525fe4b
Hongming Jin [Thu, 21 Feb 2019 20:37:53 +0000 (20:37 +0000)]
Merge "Migrate emegency default app to role manager."
TreeHugger Robot [Thu, 21 Feb 2019 19:31:32 +0000 (19:31 +0000)]
Merge "Fix test cases for Privacy package"
TreeHugger Robot [Thu, 21 Feb 2019 18:55:40 +0000 (18:55 +0000)]
Merge "Dynamically return the uri of WifiSlice."
Doris Ling [Thu, 21 Feb 2019 00:33:24 +0000 (16:33 -0800)]
Remove all reference to settings_side_margin.
- since the overlay of the value for bigger screen has been removed,
the side margin is now always 0dp. Remove this dimen value and all
reference to it.
Fixes:
124526984
Test: rebuild and visual
Change-Id: I68ff42513a379111042cab9b34594822544e246e
TreeHugger Robot [Thu, 21 Feb 2019 18:00:23 +0000 (18:00 +0000)]
Merge "developer-options: avoid oem-unlock preference controller crash"
TreeHugger Robot [Thu, 21 Feb 2019 17:38:15 +0000 (17:38 +0000)]
Merge "Enlarge the touch area of the avatar"
TreeHugger Robot [Thu, 21 Feb 2019 17:23:35 +0000 (17:23 +0000)]
Merge "Fix Talkback issue"
Beverly [Thu, 21 Feb 2019 15:52:27 +0000 (10:52 -0500)]
Add onPreferenceClickListener to dnd schedule
- Talkback says the preference is clickable
Test: manual
Bug:
124827588
Change-Id: I1cf5ae564eb0a7ddfa60e1c307f00194f9338a13
bohu [Thu, 14 Feb 2019 16:23:25 +0000 (08:23 -0800)]
developer-options: avoid oem-unlock preference controller crash
If there is no FEATURE_TELEPHONY_CARRIERLOCK.
BUG:
123583878
Test: lunch sdk_phone_x86-eng
make -j
emulator
the Settings->System->Developer options should not crash
Test:
make RunSettingsRoboTests ROBOTEST_FILTER=OemUnlockPreferenceControllerTest
should all pass (12 tests: 11 existing and 1 new)
Change-Id: I18c08c1ff1a7860616b0081ede4eb19dcfa8814b
Yanting Yang [Thu, 21 Feb 2019 15:12:15 +0000 (23:12 +0800)]
Update subTitle of NotificationChannelSlice
If there are <=3 channels, should not have the "Tap to manage all".
Fixes:
124461104
Test: visual, robotests
Change-Id: Iebb957c65b8ca53f4c5d482041837338b7b3bbf2
Pavel Grafov [Wed, 20 Feb 2019 18:03:13 +0000 (18:03 +0000)]
Don't hide "Add user" when disallowed by admin
Bug:
125226170
Test: atest tests/robotests/src/com/android/settings/users/UserSettingsTest.java
Test: manual, with TestDPC
Change-Id: I347fae04030e04325a5ee5c634f782e554ece263
TreeHugger Robot [Thu, 21 Feb 2019 10:10:39 +0000 (10:10 +0000)]
Merge changes from topic "homepage_latency"
* changes:
Make slices precheck executes in parallel.
Use a better way to bind slice for slice precheck.
Raff Tsai [Thu, 21 Feb 2019 09:24:15 +0000 (17:24 +0800)]
Fix Talkback issue
It is a button without text. Talkback will focus on this item.
We hide this item from layout so that Talkback will not find it.
Fixes:
125065965
Test: Test it with Talkback
Change-Id: I143c02b13b9f888fa5837dd2c472cf69bd00edcf
Sunny Shao [Wed, 20 Feb 2019 10:06:37 +0000 (18:06 +0800)]
Enlarge the touch area of the avatar
Use the padding to enlarge touch area.
Fixes:
124797089
Test: manual
Change-Id: Ief2296f015f021ca4d7e4cba0ca14ac0eada972b
tmfang [Wed, 30 Jan 2019 07:57:13 +0000 (15:57 +0800)]
Add app entities widget for recently opened apps
If there is no recently opened app should be shown,
just show up an "All apps" preference.
If there are some recently opened apps, we show up
result with app entites controller.
- Clean up some useless ui. (category)
- User BasePreferenceController
- Modify test cases.
Test: robotest, visual
Change-Id: I411f61ed32eaaed97921941fd5026f1d65308d00
Fixes:
123538183
Yi-Ling Chuang [Mon, 18 Feb 2019 09:39:05 +0000 (17:39 +0800)]
Dynamically return the uri of WifiSlice.
WifiSlice is used by both ContextualWifiSlice and WifiSlice itself.
In contextual homepage, we provide contextual_wifi slice for the
homepage. So in our slice pre-check, contextual_wifi slice will gets
pinned and bound. But when it comes to the state where wifi is on but
not connected, it actually returns wifi slice instead of contextual_wifi
slice, which will hit slice not pinned exception as wifi slice never
gets pinned.
Thus, we have to dynamically return the corresponding uri to avoid this.
Fixes:
124627340
Test: robotests
Change-Id: I54ba255871628bb8eb814442f990a5d1149461e0
Yanting Yang [Thu, 21 Feb 2019 07:36:53 +0000 (07:36 +0000)]
Merge "Fix preferences ordering issue in AccountSyncSettings"
Yi-Ling Chuang [Thu, 14 Feb 2019 13:31:11 +0000 (21:31 +0800)]
Make slices precheck executes in parallel.
Slice binding takes up sometime which may cause latency.
Thus, making it run in parallel instead of sequentially to improve the
performance and avoid hitting the timeout problem.
Bug:
124366297
Fixes:
123668403
Test: robotests, unit tests
Change-Id: I5d9fa4605f59e2acef65aadf6fce85df36d8fff1
tmfang [Thu, 21 Feb 2019 06:52:39 +0000 (14:52 +0800)]
Fix test cases for Privacy package
Test: robotest
Fixes:
124970652
Change-Id: I165a1658a4a40499e0b9ec6dd03ada86b9631b06
Yi-Ling Chuang [Thu, 14 Feb 2019 12:36:20 +0000 (20:36 +0800)]
Use a better way to bind slice for slice precheck.
Calling Slice.bindSlice() directly will cause the exception stating that
slices are not pinned, which sometimes leads to crash. Hence, change the
way we bind slices which handles pinSlice() for us before onBindSlice().
Bug:
120552892
Test: robotests, unit tests
Change-Id: I3e65c6b79876dbee5db6f19387bc6b675f734161
TreeHugger Robot [Thu, 21 Feb 2019 05:35:44 +0000 (05:35 +0000)]
Merge "String change for Permissions Dashboard"
TreeHugger Robot [Thu, 21 Feb 2019 03:05:02 +0000 (03:05 +0000)]
Merge "Replace deprecated KeyguardManager API with new BiometricPrompt one"
tmfang [Thu, 21 Feb 2019 02:23:05 +0000 (10:23 +0800)]
String change for Permissions Dashboard
Test: visual
Bug:
125018087
Change-Id: I02bd34347eb78531e754295262a1a08b47c6402e
Kiyoung Kim [Thu, 21 Feb 2019 01:29:45 +0000 (17:29 -0800)]
[automerger skipped] Merge "Schematize Crypto system properties" am:
b837a44716 am:
a078a02c42
am:
9602f7eb0b -s ours
am skip reason: change_id I65a6ce1a682687702f4c8b5c2e054eaaf91c389b with SHA1
3737da3ae6 is in history
Change-Id: I1bfc2de7781bb2036c68daae22d45b3738c4b30e
Kiyoung Kim [Thu, 21 Feb 2019 01:07:08 +0000 (17:07 -0800)]
Merge "Schematize Crypto system properties" am:
b837a44716
am:
a078a02c42
Change-Id: Ie498a453d85651904d98b0501d895e15cabfb317
Kiyoung Kim [Thu, 21 Feb 2019 00:34:01 +0000 (16:34 -0800)]
Merge "Schematize Crypto system properties"
am:
b837a44716
Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264
Kiyoung Kim [Thu, 21 Feb 2019 00:16:45 +0000 (00:16 +0000)]
Merge "Schematize Crypto system properties"
Fan Zhang [Wed, 20 Feb 2019 23:10:17 +0000 (23:10 +0000)]
Merge "Update char limit"
Fan Zhang [Wed, 20 Feb 2019 23:07:28 +0000 (15:07 -0800)]
Update char limit
Fixes:
124535061
Test: manual
Change-Id: I17a3c7b93b09f6f6d02ab36df3dd9a16bebd7294
TreeHugger Robot [Wed, 20 Feb 2019 22:56:29 +0000 (22:56 +0000)]
Merge "Add event logging for changing SmsDefaultDialog window attr"
TreeHugger Robot [Wed, 20 Feb 2019 21:31:21 +0000 (21:31 +0000)]
Merge "Use MATCH_ALL to query available browsers."
Fan Zhang [Wed, 20 Feb 2019 21:13:41 +0000 (13:13 -0800)]
Add event logging for changing SmsDefaultDialog window attr
Bug:
120484087
Test: manual
Change-Id: Ia5b00f79f2e54cb40377abb18c1ac07891020ae2
Xin Li [Wed, 20 Feb 2019 20:16:32 +0000 (12:16 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am:
d4716c1a62 -s ours am:
92fc138524 -s ours
am:
b637de1cb8 -s ours
am skip reason: subject contains skip directive
Change-Id: I23b85158470a5d10ddb6a559c8f2d2fcd0154de6
Xin Li [Wed, 20 Feb 2019 19:47:29 +0000 (11:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am:
d4716c1a62 -s ours
am:
92fc138524 -s ours
am skip reason: subject contains skip directive
Change-Id: I1e1a98a476c0fcda84f8d5c1d245e296b0354708
Hongming Jin [Wed, 23 Jan 2019 19:56:18 +0000 (11:56 -0800)]
Migrate emegency default app to role manager.
Bug:
123293861
Test: atest DefaultEmergencyPickerTest
Change-Id: I7bd9e2655b22a35fc3268091d38c6770911d4046
Hai Zhang [Wed, 20 Feb 2019 19:23:15 +0000 (11:23 -0800)]
Use MATCH_ALL to query available browsers.
Browser intent resolution has been special for a long time, and we
need to pass MATCH_ALL to get all the candidates, then do manual
filtering later.
Bug:
116216651
Test: manual
Change-Id: I5e9b7b907005f73b7c54c3253c872d85ef7c4863
TreeHugger Robot [Wed, 20 Feb 2019 19:06:42 +0000 (19:06 +0000)]
Merge "Add pref for notification swipe direction"
Xin Li [Wed, 20 Feb 2019 19:06:41 +0000 (11:06 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
am:
d4716c1a62 -s ours
am skip reason: subject contains skip directive
Change-Id: If29e30a1516d869c647bb9634eb8c1d3b4b9b3f9
Xin Li [Wed, 20 Feb 2019 18:16:18 +0000 (10:16 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
9d8c2cc2c6 -s ours am:
a99376f647 -s ours
am:
3003b4b39c -s ours
am skip reason: subject contains skip directive
Change-Id: I3d5eeea407f925dbc342ff8c059555c76c05fa86
Xin Li [Wed, 20 Feb 2019 17:29:00 +0000 (09:29 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
9d8c2cc2c6 -s ours
am:
a99376f647 -s ours
am skip reason: subject contains skip directive
Change-Id: I70f7a0afed0ff3124670ac7da3a5a4d643b07970
Xin Li [Wed, 20 Feb 2019 16:52:26 +0000 (08:52 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am:
9d8c2cc2c6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic2e84fd1810cf9eb661c2c4b4b32755821cf17e3
Xin Li [Wed, 20 Feb 2019 16:25:59 +0000 (16:25 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
Julia Reynolds [Wed, 20 Feb 2019 15:33:15 +0000 (10:33 -0500)]
Add pref for notification swipe direction
And move that and other settings under an 'advanced' category
Test: robotests
Fixes:
124099692
Change-Id: I89df276a8bc1cd56ce8530239ca02b2c4b43fa65
Yanting Yang [Wed, 20 Feb 2019 12:26:51 +0000 (20:26 +0800)]
Fix preferences ordering issue in AccountSyncSettings
In Pie, it's alphabetical ordering in Accounts > Account sync detail page.
But Q doesn't follow it, intend to keep the same behavior.
Fixes:
124382857
Test: visual, robotests
Change-Id: I593a4cc919daa0018d3874d84978e876198aae23
TreeHugger Robot [Wed, 20 Feb 2019 12:45:26 +0000 (12:45 +0000)]
Merge changes from topic "Wi-Fi DPP error code handling"
* changes:
Fix camera stop forever after error occurs while sharing or adding network
Handle different error codes in DPP
TreeHugger Robot [Wed, 20 Feb 2019 10:48:35 +0000 (10:48 +0000)]
Merge "Update char limit for DND conditional"
Mill Chen [Wed, 20 Feb 2019 08:16:35 +0000 (16:16 +0800)]
Update char limit for DND conditional
Increasing the character limit for the "Phone muted" to 38 in the DND
condition.
Bug:
124784648
Test: rebuild
Change-Id: I46496ee60f6757f477b0d0bbd021c43234f83222
Arc Wang [Fri, 15 Feb 2019 06:21:26 +0000 (14:21 +0800)]
Fix camera stop forever after error occurs while sharing or adding network
Restart QrCamera decoding task after Wi-Fi DPP handshake fail or
Wi-Fi connection fail.
Bug:
124128539
Test: manual test
Change-Id: I6d916ed1378f50038089e2c1e2870915ca083d68