Commit Graph

11592 Commits

Author SHA1 Message Date
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
423fdfa8bb Update conversation-related strings am: 9e78ec75d1 am: 61e956443d
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
2020-05-22 12:03:49 +00:00
TreeHugger Robot
3954cce0c3 Merge "Add an exported flag in manifest" 2020-05-21 20:50:37 +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
Julia Reynolds
a98f5e1445 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d
Change-Id: Iabb72c8e018cf568ae43ac1a24f7d1b7fafbfad7
2020-05-21 19:34:33 +00:00
Ashwini Oruganti
fd9721f1af Add an exported flag in manifest
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: I878adb9108c95f06ddd059b23a542b61210edfa4
2020-05-20 15:08:34 -07: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
5e8ba70140 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b am: e67e058f26
Change-Id: I7fc511dba6f739653494c68753e191c8091f33b9
2020-05-20 08:58:34 +00:00
Amy Hsu
ce64e46603 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: f18ab3712b
Change-Id: I8487aa59cacee8a261849dd50d2baafc0cbd5020
2020-05-20 08:57:59 +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
TreeHugger Robot
b5a3893f76 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209
Change-Id: Ib8f58a2e5930dfd4f3b8a25dcd0d02d4455a5b24
2020-05-20 06:43:42 +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
1f21e1b6f9 Merge "Add bottom padding of profile group on Bluetooth detail page" into rvc-dev am: 3370e0304f
Change-Id: I811c45543d62207490f1e3db5a5af1bbb06c2e82
2020-05-18 09:12:19 +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
51e997cfd8 Merge "Output switcher shows the device list by an incorrect package name" into rvc-dev am: 0581bd7f1c
Change-Id: I2a1d02417f787535ae64a72b7ea5c0da5014c41f
2020-05-18 05:26:52 +00:00
tim peng
9c01aac31e Merge ""Play null on" displayed under media volume" into rvc-dev am: 9a9ce2b2fa
Change-Id: I888d2c83f9b169a88212e71994faa160089d8e42
2020-05-18 05:26:50 +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
TreeHugger Robot
0217cbd19e Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea
Change-Id: If57ab8c7d45fbd771b5be23aa5812cdb9e0b35e5
2020-05-15 23:39:09 +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
Treehugger Robot
d0b06f5bee Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6 am: f4383db1b7 am: a4bc83b985 am: 7f1f96ac92
Change-Id: I7a40ddb61b37c66c5d621ace1b0a651398a108ef
2020-05-15 11:52:14 +00:00
Treehugger Robot
f4383db1b7 Merge "Settings performance testing" am: 9446266f4f am: 5797829fa6
Change-Id: I84c0d95de3f1cc108197cc3f8ab88a9a1d08b0bc
2020-05-15 10:57:57 +00:00
Treehugger Robot
5797829fa6 Merge "Settings performance testing" am: 9446266f4f
Change-Id: Ie761e966d27c4aaf7e28850b0a01fc06650c4738
2020-05-15 10:43:29 +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
youtengliang
1bf3f1c26a Settings performance testing
1. Change TEST_TIME to 10 to avoid timeout fail.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: Id1ec855196b3e8b5fdd28c0d683aa95b002a8462
2020-05-15 14:26:14 +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
e8451d99a0 Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5 am: 7bc6358a8c
Change-Id: Ibd035c8749e06a8ee0909ec2342e3ca35819e613
2020-05-15 00:29:24 +00:00
Jay Aliomer
b56a6e06cf Revert "Revert "Unable to select twilight scheduling after enabling location"" am: dba11e82b5
Change-Id: I7e9c33644e76e7712d0becfdacfdbf1cfdd26b83
2020-05-15 00:17:16 +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