Commit Graph

11437 Commits

Author SHA1 Message Date
TreeHugger Robot
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
2020-04-16 16:16:22 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +00:00
Tom Hsu
b22f5daf13 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" 2020-04-16 15:05:40 +00:00
Julia Reynolds
dbef46a5d5 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
2020-04-16 14:53:53 +00:00
Julia Reynolds
d2d8115ac9 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8
Change-Id: Iddf2bda7005bffe799b76f9a21d8937925fee693
2020-04-16 14:25:55 +00:00
Julia Reynolds
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
2020-04-16 14:12:43 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00
Tom Hsu
b3bc413443 Revert "Fix failures on com.android.settings.network.ApnEditorTest"
This reverts commit 66a530ec97.

Reason for revert: <have useless code>

Change-Id: Ic3190e168e74f196ef29a3af4e41fbb2ae129d17
2020-04-16 13:08:16 +00:00
TreeHugger Robot
6313dd37e9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 am: 3c290d9860
Change-Id: I27ec15f9f0e3c9a6902b1754177b4d93d6c6c655
2020-04-16 11:57:47 +00:00
TreeHugger Robot
30fdfef476 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35
Change-Id: I392761026ae6e0bd76b5612a2794063c3591ef18
2020-04-16 11:31:47 +00:00
TreeHugger Robot
3ca1b39596 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
Change-Id: I483ba72fa1243efd2822b778b1621a431df200e3
2020-04-16 11:15:56 +00:00
TreeHugger Robot
158bbe17f3 Merge "Support another new intent for mainline module intent" into rvc-dev 2020-04-16 11:03:19 +00:00
Tsung-Mao Fang
54150c9942 Support another new intent for mainline module intent
Mainline module team would like to create a new intent to support v2 UX.
In Settings side, if we found system supports this intent,
then we should navigate user to new place.

Test: Run robo test
Fix: 151189987
Change-Id: If4b437236b70c83a1f29a5c3d9e322178c8a6ec6
2020-04-16 17:35:38 +08:00
Tsung-Mao Fang
b3bb7a0237 Fallback to AOSP emergency info if the original intent is broken
If the variant of emergency info is broken, we should try to show
AOSP emergency info instead.

Test: Rebuilt rom and see the Ui. Run robo test
Fix: 154114259
Change-Id: I5bc3f6cbf9102a7b7299c3edf718a58101effbf8
2020-04-16 17:23:52 +08:00
jasonwshsu
e1eec16427 Use new setting key to maintain the list of user assigned shortcut targets.
* Framework changes to keep ACCESSIBILITY_BUTTON_TARGET_COMPONENT
contains only a single target, use ACCESSIBILITY_BUTTON_TARGETS to maintain the targets list.

Bug: 151295675
Test: manual test
Change-Id: I2218402fd122acc9a86c64127e9cfcf77a6e241e
2020-04-16 17:21:20 +08:00
tim peng
92275727ce Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 5c68b4a9a8 am: f693064f34
Change-Id: I00964ca1b5fc7e1dac0ad663d6776756749d08f8
2020-04-16 07:23:08 +00:00
tim peng
5c68b4a9a8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e
Change-Id: I24505a511d0932c2ea17baad7750c1701d247d5a
2020-04-16 06:52:38 +00:00
tim peng
93b092fff8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288
Change-Id: Ice66c6c264c880246dbeec4e072fa1f902294fcb
2020-04-16 06:37:19 +00:00
Tom Hsu
132526487f Merge "Fix failures on com.android.settings.network.ApnEditorTest" 2020-04-16 06:36:02 +00:00
tim peng
ea3a83e288 Merge "Incorrect panel layout after rotation" into rvc-dev 2020-04-16 06:10:15 +00:00
TreeHugger Robot
90e65e682b Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c am: 798bc7abd9 am: 8b2b488aa3
Change-Id: If30bc806dffe497f3db8152dc6398d627b3def89
2020-04-15 23:57:16 +00:00
Rubin Xu
ece83c3142 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da am: 2edcafc323 am: 5271685c19
Change-Id: I017ae5f940c9c4564a3da0ff88ac5500e58914e2
2020-04-15 23:54:05 +00:00
Julia Reynolds
e3cb4f094e Launch subscreens with the correct user
Test: atest
Fixes: 153556621
Change-Id: I5f3f0f408dc8e50db1762b1ce93f7748ea6332b0
2020-04-15 17:36:11 -04:00
TreeHugger Robot
8b2b488aa3 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe am: a37e523e2c am: 798bc7abd9
Change-Id: Id7b1c81f9964a17af8c003353569c397a514084e
2020-04-15 18:49:31 +00:00
Rubin Xu
5271685c19 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5 am: 715f9316da am: 2edcafc323
Change-Id: I5e335d87c5fde2423c6bfb3f3a0b8464fafb6def
2020-04-15 18:48:43 +00:00
TreeHugger Robot
c7107909ae Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f am: 7e00c8d28c am: 7763d89c45
Change-Id: I77207c5d0a6875a33f26217270ea7894b38980f6
2020-04-15 17:59:57 +00:00
TreeHugger Robot
de064c6c54 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf am: 65353e9dfe
Change-Id: I5bb6c994ccf6dca6d61f843fd1f8846875be2688
2020-04-15 17:49:09 +00:00
Rubin Xu
9e1c6293d1 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81 am: b87ed9fac5
Change-Id: I0114acce3b613d387049bcfe30918821637d7860
2020-04-15 17:48:22 +00:00
TreeHugger Robot
89e3b29558 Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev am: 82282b48cf
Change-Id: I52c901e432b8090433c81673475755f85bef9c12
2020-04-15 17:27:22 +00:00
Rubin Xu
d5a33f2a95 Merge "Improve work profile unification flow" into rvc-dev am: 81d8664d81
Change-Id: Iae4d6b732a6da338aa7e6488402d5b21150669ec
2020-04-15 17:25:30 +00:00
TreeHugger Robot
7e00c8d28c Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1 am: 9625a5ed1f
Change-Id: If6f8b0f6e9391c5fad747655f9707420c3308372
2020-04-15 17:14:48 +00:00
TreeHugger Robot
63536f8392 Merge "Refactor the OpenSupportedLinks" into rvc-dev am: ccb37bb8d1
Change-Id: I60fc8f0427b85a27599e29c3b5c62f66efe330c2
2020-04-15 17:01:22 +00:00
TreeHugger Robot
82282b48cf Merge "Fix breadcrumb for the search results of Custom restrictions page" into rvc-dev 2020-04-15 13:30:33 +00:00
Rubin Xu
81d8664d81 Merge "Improve work profile unification flow" into rvc-dev 2020-04-15 11:18:00 +00:00
tom hsu
66a530ec97 Fix failures on com.android.settings.network.ApnEditorTest
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: I0a6c542a19194ea065b5516cc9246e378dc7e53b
2020-04-15 16:59:55 +08:00
Tim Peng
e54e0296ca Incorrect panel layout after rotation
-Handle onConfigurationChanged and force to update layout
-Add test case

Bug: 144751509
Test: make -j42 RunSettingsRoboTests
Change-Id: Ic170d4f6f045299c0520e899e06b5b4e9f009643
2020-04-15 03:16:30 +00:00
Sunny Shao
44b74c9cfe Refactor the OpenSupportedLinks
- Use the AppInfoWithHeader to replace the DashboardFragment.
- It provide the AppHeader controller and handle the app update/remove event.

Fixes: 147996227
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications.OpenSupportedLinksTest
Change-Id: I1633c39fc926805a379c5c31845897914e5181a6
2020-04-15 09:53:43 +08:00
Yanting Yang
2483124478 Fix breadcrumb for the search results of Custom restrictions page
Settings Search need Settings to provide the custom site map pairs to
build up the full breadcrumb for the search results of Custom
restrictions page.

Impact search results:
Don't turn on screen
Don't wake for notifications
Hide notification dots on app icons
Hide status bar icons at top of screen
Don't pop notifications on screen
Hide from pull-down shade
Custom restrictions

Bug: 147851992
Bug: 151206664
Test: visual and robotests
Change-Id: I01e359eabcdc362e2a1fde5f3bc4ae5dc6918030
2020-04-15 08:52:05 +08:00
Julia Reynolds
3ef490189b Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1 am: e81fdf8011 am: 228048065f
Change-Id: Icbee4d67ea0166296963e65c6181d15828bc9249
2020-04-14 12:07:23 +00:00
Julia Reynolds
e81fdf8011 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: cc3d0501f1
Change-Id: I87aca0b51d821cdd60ff76c1150367e00da4f098
2020-04-14 11:47:15 +00:00
Julia Reynolds
93bc19e3a0 Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439
Change-Id: I29cc292f1ef405952739825e91d5db88ac1de3a7
2020-04-14 11:28:37 +00:00
Julia Reynolds
6585f79439 Merge "Bubble settings: feature, notification, app" into rvc-dev 2020-04-14 11:22:14 +00:00
Betty Chang
783da57b39 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505 am: f7b1c11256 am: d5418fbc39
Change-Id: I311726d6568d24313a7ad414e0a04c37e6b49998
2020-04-14 10:56:14 +00:00
Betty Chang
f7b1c11256 Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a am: b52ee87505
Change-Id: Ia60cb69646d6898cfedd7ad924f85018f1f7337f
2020-04-14 10:04:37 +00:00
Betty Chang
52466a768d Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev am: 86551e4d9a
Change-Id: Ie6b7b2b37109e0f287990168f5dc2ed5476567e8
2020-04-14 09:45:23 +00:00
Betty Chang
86551e4d9a Merge "[Telephony Setting] Add Preferred Network observer for Auto Select Network Mode" into rvc-dev 2020-04-14 09:22:04 +00:00
TreeHugger Robot
09600dd8cc Merge "Merge lastest test case from master" into rvc-dev 2020-04-14 07:32:21 +00:00
TreeHugger Robot
ca15f53fcd Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da am: 5d45d1c001 am: 74f9846f36
Change-Id: Icb764162ec8ba200167010f34abb85fa39e61345
2020-04-14 06:19:44 +00:00
Raff Tsai
7baddeebeb Merge lastest test case from master
Bug: 152716522
Test: atest com.android.settings.tests.perf
Change-Id: If5913440b4a4b58662c195e8cb637804fd6f2449
Merged-In: Ia504dd1185de1d33a21fec344871d4b0fabae953
2020-04-14 06:06:28 +00:00
TreeHugger Robot
5d45d1c001 Merge "Fix indexing error of mobile related controllers" into rvc-dev am: f25450ef48 am: edd104d2da
Change-Id: I6ae5bd8a9c8f3857d123823262baa1730bbc590e
2020-04-14 05:42:50 +00:00