Commit Graph

10137 Commits

Author SHA1 Message Date
Automerger Merge Worker
4bc830265a Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 691e31b0cf" into rvc-qpr-dev-plus-aosp am: 2d256d5ca8
Change-Id: I8233440348485f16894219fe1b50f12608303498
2020-05-28 16:27:54 +00:00
Bonian Chen
e837495c6c Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 8367dc4e03 am: f2bb69f354
Change-Id: I059fcd2231c9d4b65f1c6e2eaf74d1c9e7391193
2020-05-28 15:43:26 +00:00
TreeHugger Robot
591d761d43 Merge "Revert "Do not prebind sticky slices."" into rvc-dev 2020-05-28 15:42:28 +00:00
Yi-Ling Chuang
740db33c5c Revert "Do not prebind sticky slices."
This reverts commit ac59ea8e23.

Reason for revert: Fix it using another approach in ag/11629780. The prebind part will be helpful to cache slice data.

Bug: 152365480
Change-Id: Iebed42027552a923907647b61480f135ac4f4097
2020-05-28 15:42:15 +00:00
SongFerngWang
480b56b3f3 EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: b086e67289 am: cc361e10ae
Change-Id: Icdceccc1028c3a050189a95a474f83fe123fceed
2020-05-28 15:07:37 +00:00
Bonian Chen
e2da25108a Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev 2020-05-28 14:59:47 +00:00
SongFerngWang
259e6288c9 EnabledNetworkModePreferenceController Remove AllowedNetworkType
Power manager decision do enable/disable NR by AllowedNetworkType,
and it will effect the PreferredNetworkMode UI. The
PreferredNetworkMode list no 5G item when AllowedNetworkType
disabled.

Bug: 156709797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest  (pass)

Change-Id: I3ab9eca0956c4cce1b79e518942063b681eb96cd
2020-05-28 20:37:51 +08:00
Bonian Chen
ce0f3c66a0 [Settings] Avoid crash for VoIP account displayed as default voice
When displaying VoIP account in Default voice account UI within
mobile network configuration, some null pointer checking need to
applied due to this is no longer a real account bind to SIM card.

Bug: 157334667
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultSubscriptionControllerTest
Change-Id: I3927362676c867ac245f16e1d00ea953b21ec1d4
2020-05-28 18:17:42 +08:00
Stanley Wang
d5b08e8959 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: ae8cdee154 am: f6398a09fa
Change-Id: I0b3774f7cb8ab6d242446a7d757549c7c84d7751
2020-05-27 11:55:22 +00:00
Stanley Wang
12e3efcb04 Merge "Fix the search result "Google Account" doesn't work." into rvc-dev 2020-05-27 11:12:02 +00:00
tim peng
d2b8f3662d Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484 am: ceb23093e9 am: 7a87480f82
Change-Id: Id18ba750a4c3902f56375d44337bef6bf9bafbb6
2020-05-27 06:32:45 +00:00
Jason Chang
6c8fd325ee Merge "Update new string for One-Handed feature" 2020-05-26 10:08:23 +00:00
Tim Peng
1af5b0cd7b Non-deselectable routes can be deselected
-Check deselectable list
-Add test case

Bug: 157098549
Test: make -j42 RunSettingsRoboTests
Change-Id: I254a9d3825319aa7b262d04e4f4c580f76afe381
2020-05-26 07:25:29 +00:00
Jason Chang
cc35ece032 Update new string for One-Handed feature
According One-handed mode string review doc to change strings.

Bug: 151993111

Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.gestures.OneHandedTimeoutPreferenceControllerTest"

Change-Id: I7dc961387c1e14b25438e051ce6b1cc70fb59417
2020-05-25 23:25:05 +08:00
Julia Reynolds
087c3f5bf6 Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb am: 0051068fcb
Change-Id: I5da6a7997f960ca6a112ce6958c20197447a4846
2020-05-22 12:31:26 +00:00
Julia Reynolds
9e78ec75d1 Update conversation-related strings
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Julia Reynolds
75aba32e27 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf
Change-Id: Iddbf702265aa3c17cdd7ad9997f2b76aa22d0b36
2020-05-21 20:11:16 +00:00
Stanley Wang
732514cd5f Fix the search result "Google Account" doesn't work.
- The "Google Account" item will launch the
  AccountDetailDashboardFragment.
  To launch the account detail page, we need the intent extras, account,
  account label and account type.
- Currently, SI doesn't support to index the intent extras, so we launch
  AccountDashboardFragment instead of AccountDetailDashboardFragment.

Fixes: 153626405
Test: manual test the search result and run Settings robotest
Change-Id: I081bd447c3f8422fb8859146b1ed4d7fcbc06810
2020-05-21 12:39:46 +08:00
Julia Reynolds
04d50c9709 Switch from shortlabel to label
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
2020-05-20 14:23:43 -04:00
Amy Hsu
048eb1b00a Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26 am: 5e8ba70140
Change-Id: If073b3d860cbc53ac62548e7e211c512dfe42d0a
2020-05-20 09:18:48 +00:00
Amy Hsu
a75dddbf9f Merge "Move PeakRefreshRateController to Settings app" into rvc-dev 2020-05-20 08:48:56 +00:00
TreeHugger Robot
6b29e7a567 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76 am: 2772005888 am: 4210565481
Change-Id: I785a1360fb3151a2249dcc0ace63e81f59a0048a
2020-05-20 07:45:32 +00:00
Amy Hsu
7730d301b7 Move PeakRefreshRateController to Settings app
1. 60/90 Hz switch
2. Allow DeviceConfig to change default refresh rate

bug: 139869828
bug: 137064289
bug: 132750102

Test: Check refresh rate is expected.
Change-Id: Ia6a3e3717fd8845c7177e55b70bc6d2d952d58f3
2020-05-19 21:45:33 +08:00
SongFerngWang
414f8b8fe6 Add corresponding code for the new NR condition
Bug: 155915216
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (Pass)

Change-Id: I171ea0a8adc621ad5e9dc5cd2090e431b923e775
2020-05-19 12:32:57 +00:00
TreeHugger Robot
05cc1e7076 Merge "[Wi-Fi] Remove all files in com.android.settings.wifi.savedaccesspoints" 2020-05-19 07:56:37 +00:00
TreeHugger Robot
739416db8e Merge "[Wi-Fi] Enhance AddAppNetworksFragment unit test cases" 2020-05-19 05:01:01 +00:00
TreeHugger Robot
ee508db76d Merge "Add bottom padding of profile group on Bluetooth detail page" into rvc-dev am: 3370e0304f am: 1f21e1b6f9 am: 07f70e8efc am: 52e90afcbb
Change-Id: I6f83c6904a9e8c37e670612f1eb2b1630fa6f73e
2020-05-18 09:51:39 +00:00
TreeHugger Robot
3370e0304f Merge "Add bottom padding of profile group on Bluetooth detail page" into rvc-dev 2020-05-18 08:54:39 +00:00
tim peng
8ab04e08ee Merge "Output switcher shows the device list by an incorrect package name" into rvc-dev am: 0581bd7f1c am: 51e997cfd8 am: a9693c3080 am: 058881001f
Change-Id: I804b5efde131e74fe9980f8131ceebbd7f118d29
2020-05-18 06:09:37 +00:00
tim peng
ddc2b79eae Merge ""Play null on" displayed under media volume" into rvc-dev am: 9a9ce2b2fa am: 9c01aac31e am: 53715ebd3f am: 68dda2451d
Change-Id: Ifa2d4b62c109c030a2ed3f7ca9aeedd1a06bac15
2020-05-18 06:09:35 +00:00
Arc Wang
8c1c52f134 Merge "[Wi-Fi] Replace WifiTracker with WifiPickerTracker in WifiSettings" 2020-05-18 05:58:33 +00:00
tim peng
0581bd7f1c Merge "Output switcher shows the device list by an incorrect package name" into rvc-dev 2020-05-18 05:22:50 +00:00
tim peng
9a9ce2b2fa Merge ""Play null on" displayed under media volume" into rvc-dev 2020-05-18 05:22:50 +00:00
hughchen
1df322225b Add bottom padding of profile group on Bluetooth detail page
- This CL add a bottom padding preference to make UI consistency.
- Update test case

Bug: 146522686
Test: make -j42 RunSettingsRoboTests
Change-Id: I525d8a3b71535972755de92924a3c04768f68e63
2020-05-18 13:17:15 +08:00
TreeHugger Robot
07c525c487 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683 am: e8d332dc54
Change-Id: I035d09faa19a1269adf361a5e0cfdb8c9d74eb8b
2020-05-16 00:06:05 +00:00
Julia Reynolds
32d189fbfe Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b am: 6a87cdcd50
Change-Id: Ic01e59c4462f51128cd9b425075087459add3057
2020-05-16 00:06:02 +00:00
Julia Reynolds
33e6708f75 Add settings for apps that don't use full conversations am: eca1e4d197
Change-Id: I3360ffd3f7975346f24d0943912cc31b88b2a07d
2020-05-15 23:39:06 +00:00
TreeHugger Robot
4bbe564aea Merge changes from topic "jr-update" into rvc-dev
* changes:
  Update conversation launch point
  Add settings for apps that don't use full conversations
2020-05-15 23:35:06 +00:00
TreeHugger Robot
76215df1df Merge "[Wi-Fi] Quit worker thread in WifiNetworkListFragment" 2020-05-15 20:11:05 +00:00
Julia Reynolds
cd237ccf9b Update conversation launch point
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 156670585
Change-Id: I31f306d1b7d480ac0ef0cc4a5f7e66efe528383d
2020-05-15 19:40:56 +00:00
Julia Reynolds
eca1e4d197 Add settings for apps that don't use full conversations
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 155276427
Change-Id: Ie145b9cdc9555d4676a8bd225427abc9222f31c5
2020-05-15 19:38:14 +00:00
govenliu
23d91663f6 [Wi-Fi] Enhance AddAppNetworksFragment unit test cases
Add new unit test cases in AddAppNetworksFragmentTest.java

The coverage rate of com.android.settings.wifi.addappnetworks will raise from 65% to 81%

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest
Change-Id: Iae15b5ad27b20f90cbf8b0318a24a9069b738a33
2020-05-15 16:05:45 +08:00
Tim Peng
77bec31eb5 Output switcher shows the device list by an incorrect package name
-Reset package name when it is different with previous one
-Add test case

Bug: 156561856
Test: make -j50 RunSettingsRoboTests
Change-Id: I7931ebbc59ab404f12473fe29f2735ad3a8197fd
2020-05-15 06:26:03 +00:00
Tim Peng
a5280fcc51 "Play null on" displayed under media volume
-Reset package name when it is different with previous one
-Add test case

Bug: 156224161
Test: make -j50 RunSettingsRoboTests
Change-Id: Ifcacc171d86017b702f51343036e0ebf0e0d1989
2020-05-15 06:25:54 +00:00
Arc Wang
fa128687ae [Wi-Fi] Quit worker thread in WifiNetworkListFragment
Should quit worker thread when a fragment is about to
be destroyed.

Bug: 145100890
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkListFragmentTest
Change-Id: I840750ac4e9601fe553ce219305876581bea7197
2020-05-15 11:17:20 +08:00
Arc Wang
59e6bcbfdf [Wi-Fi] Remove all files in com.android.settings.wifi.savedaccesspoints
Developers should developer the files of
com.android.settings.wifi.savedaccesspoints2 with WifiTrackerLib objects.

Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi.savedaccesspoints2
Change-Id: I6c8548fb7b3c9403ad300da0024e93e0e0cb8607
2020-05-15 10:32:39 +08:00
Jay Aliomer
e64715b2fb Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c am: e8451d99a0 am: f719aca99d
Change-Id: I9e3e5fb76ae9256770186c73b8cf5b2717f313af
2020-05-15 00:59:02 +00:00
Jay Aliomer
dba11e82b5 Revert "Revert "Unable to select twilight scheduling after enabling location""
This reverts commit 782438347b.
Bug: 153115261
Reason for revert: fixing tests

Change-Id: I497a2b83cbe3eaee5f5fb3eb4df73618130fc6e2
2020-05-14 15:14:18 +00:00
Arc Wang
41f23de712 [Wi-Fi] Replace WifiTracker with WifiPickerTracker in WifiSettings
WifiSettings uses WifiTracker in SettingsLib while WifiSettings2
uses WifiPickerTracker in WifiSettingsLib.

1. Remove WifiSettings.
2. Rename WifiSettings2 to WifiSettings.
3. Remove the files only used in the removed WifiSettings.
   (Saved networks files are not included)

Bug: 152571756
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
      atest WifiSettingsUiTest
Change-Id: I800b434c8049121db115cff87d51e164e4529999
2020-05-14 21:24:57 +08:00
TreeHugger Robot
117becf188 Merge "Do not prebind sticky slices." into rvc-dev am: fa1e102af7 am: 722b197488 am: ad332955ba am: 2438ec049a
Change-Id: I7f4599347a2580663a827fcbd214c729efcd8caa
2020-05-14 12:45:51 +00:00