PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,744 Commits 1 Branch 0 Tags
47e1c783436c38f1287f3156ec7fd2ee534b2159
Commit Graph

79744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Goldman
47e1c78343 Merge "PrivateVolumeOptionMenuControllerTest converted to JUnit" 2021-02-25 05:43:56 +00:00
Jeremy Goldman
3098ea1274 Merge "BrandedAccountPreferenceControllerTest converted to JUnit" 2021-02-25 05:43:29 +00:00
Paul Hu
dbcd0ba8c8 Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev am: e6f2889e01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13668411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib93bbaa05a9ddf13a6dc45ea06883544ff0fb452
 2021-02-25 04:30:38 +00:00
Paul Hu
e6f2889e01 Merge "Replace ConnectivityManager hidden symbols on Settings" into sc-dev 2021-02-25 03:43:50 +00:00
Meng Wang
0203f5b33c Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 am: 3b19347431 am: 69720d62a3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia36445bff49763cd21bd63647399a64f2da8bb66
 2021-02-25 02:13:09 +00:00
Meng Wang
69720d62a3 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 am: 3b19347431 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If84a42f0d51cfa758dd9bca7847d2ca178c86627
 2021-02-25 01:41:08 +00:00
Jeremy Goldman
9ec80bb8b0 Merge "TopLevelStoragePreferenceControllerTest converted to JUnit" 2021-02-25 01:31:20 +00:00
Meng Wang
3b19347431 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03542ee476ebff7bfae2a8f54894f00f69578744
 2021-02-25 00:44:42 +00:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
 2021-02-25 00:10:09 +00:00
Meng Wang
2161d17f32 Merge "Use string "Carrier settings version"" 2021-02-24 23:17:20 +00:00
Suprabh Shukla
9f566fe469 Merge "Adding alarms and reminders activity" into sc-dev am: a78849982d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13633051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic41874282654b015c7fa450af9b3066b19c72e1a
 2021-02-24 21:18:15 +00:00
Meng Wang
3f9db799e5 Use string "Carrier settings version" 
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
 2021-02-24 21:15:08 +00:00
Suprabh Shukla
a78849982d Merge "Adding alarms and reminders activity" into sc-dev 2021-02-24 20:06:56 +00:00
TreeHugger Robot
43490276ac Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev am: 69fab4bdaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13679462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaedd2ae21c4308504ed4d17d62da3b0b9a6dc726
 2021-02-24 18:28:14 +00:00
TreeHugger Robot
69fab4bdaa Merge "Revert "Revert "Use location access for recent location apps.""" into sc-dev 2021-02-24 18:06:41 +00:00
TreeHugger Robot
e2e8219452 Merge "Fix the higlighted settings not work properly from search" into sc-dev am: 3e2a7f6186 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13495590

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67ff291f78c9cbc0322a98cae9797b782dad5111
 2021-02-24 15:58:07 +00:00
TreeHugger Robot
3e2a7f6186 Merge "Fix the higlighted settings not work properly from search" into sc-dev 2021-02-24 14:41:25 +00:00
Ryan Lin
0d0b5127aa Merge "Add uninstall option in the capabilities confirm dialog" into sc-dev am: 296c42e4ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660508

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4662653f72f14826137e467ae8a5aca2008e5e43
 2021-02-24 13:46:36 +00:00
TreeHugger Robot
9b2b0dcffb Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev am: 588c4e1508 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13622529

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4781c62bb219050d67cbe7f58debd1847b8cb19b
 2021-02-24 13:46:05 +00:00
Ryan Lin
296c42e4ce Merge "Add uninstall option in the capabilities confirm dialog" into sc-dev 2021-02-24 13:12:45 +00:00
TreeHugger Robot
588c4e1508 Merge "[Bug] Private DNS shows odd message about Bluetooth" into sc-dev 2021-02-24 13:03:13 +00:00
Menghan Li
062c0ea933 Merge "Add general grouping title into accessibility settings" into sc-dev am: 21f790c68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13675177

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I248e600501f925cc12cefee0f07136e7ef196555
 2021-02-24 11:40:37 +00:00
Menghan Li
21f790c68e Merge "Add general grouping title into accessibility settings" into sc-dev 2021-02-24 11:07:17 +00:00
menghanli
da07d7a6c2 Add general grouping title into accessibility settings 
Bug: 174829936
Test: atest TextAndDisplayFragmentTest, atest AccessibilitySettingsTest
Change-Id: I7455c3d369c3a28b9c64e9a9498a2d6ce5a0ae08
 2021-02-24 17:24:17 +08:00
Tsung-Mao Fang
ef87755c34 Fix the higlighted settings not work properly from search 
Since the Andorid S, we introduce the CollapsingToolbarLayout
, the highlighted funcation might break for unkown reason.
I observed that broken cases with overlapping issue on tool bar.
The possible root cause is the interation bwtween
CoordinatorLayout v.s CollapsingToolbarLayout v.s Recycler
view.

This cl is definetly a workaround to prevent this issue.
I try to collapse the tool bar with an animation before
we start to scroll the list. This makes the overall transition smooth
but always collapse the tool bar.

Fix: 177968297
Test: Click a lot of search results, and screen should highlight
settings correctly.

Change-Id: Id9c32b642433dcc39c179a2cc83a06e77cc47888
 2021-02-24 16:46:08 +08:00
Jeremy Goldman
899eb7282d TopLevelStoragePreferenceControllerTest converted to JUnit 
Helper function composed to return thread future, to guarantee
concurrent function finishes before test condition is checked.
Additionally a @VisibleForTesting helper function is used rather than
robolectric reflection helpers to set a class variable.

Test: atest -c TopLevelStoragePreferenceControllerTest
Change-Id: Ia22ebac4baec60f72b8516e9e79998cd788266ab
 2021-02-24 16:24:19 +08:00
Treehugger Robot
70a046ed8d Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 am: c7bd662dee am: e05e8065e7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39d6fa9b74c5bffa8dbea9adc45277d987982293
 2021-02-24 08:14:41 +00:00
Wei Wang
22399153dc Revert "Revert "Use location access for recent location apps."" 
This reverts commit 5da4f381a6.

Reason for revert: Fixed the crash and roll forward

Test: Manual - tested with work profile.
Change-Id: I8b500b8fddc58cc0d0e5e7f4e54d8bb5cb6b3022
 2021-02-24 00:08:04 -08:00
Treehugger Robot
e05e8065e7 Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 am: c7bd662dee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied3dab4b389ba8a83ccf8630eeb04c2fce962e48
 2021-02-24 07:39:00 +00:00
Stanley Wang
6c45d16509 Merge "Replace the SwitchBar with MainSwitch." into sc-dev am: beefb25b48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5378d834b478d5abec20d9cc1b25d0c52fbe0c7b
 2021-02-24 07:00:04 +00:00
Treehugger Robot
c7bd662dee Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d87849cf4c8c85f19858164faff1d17cf32d43
 2021-02-24 06:59:58 +00:00
Treehugger Robot
8fc4828ad2 Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790 am: dbf857e2c7 am: e5313e42cc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I296d9933a284ce1ccbd1ec01c9bd4f641d0b825f
 2021-02-24 06:58:11 +00:00
Suprabh Shukla
c8b9240535 Adding alarms and reminders activity 
Adding a settings screen to control the permission SCHEDULE_EXACT_ALARM.
Apps can start this by starting a newly introduced API intent
REQUEST_SCHEDULE_EXACT_ALARM.

Test: make -j RunSettingsRoboTests
Manually by UI inspection:
Settings -> Apps -> Special App access -> Alarms and Reminders
or by running:
adb shell am start -a android.settings.REQUEST_SCHEDULE_EXACT_ALARM

Bug: 171306433
Bug: 171305516
Change-Id: I1293d38fc50a22b2af46f80ab24f676ed632f964
 2021-02-23 22:32:24 -08:00
Tim Peng
8467b9f484 [Bug] Private DNS shows odd message about Bluetooth 
-Private DNS dialog uses preference_widget_dialog_summary
layout. It is wrong to set Bluetooth string for it.
-Remove default string from preference_widget_dialog_summary
-Set the customized string in BaseBluetoothDialogPreference

Bug: 179329046
Test: manual test
Change-Id: I749647f48e4bba7d4d0f9099d1c40d788778c15e
 2021-02-24 14:21:38 +08:00
paulhu
6151c227e0 Replace ConnectivityManager hidden symbols on Settings 
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
 2021-02-24 06:17:17 +00:00
Treehugger Robot
59f43e5299 Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d99ba0c146418dbca6fe190c02a7b52db2e85da
 2021-02-24 06:07:30 +00:00
Stanley Wang
beefb25b48 Merge "Replace the SwitchBar with MainSwitch." into sc-dev 2021-02-24 06:04:03 +00:00
Jeremy Goldman
d2a5331711 PrivateVolumeOptionMenuControllerTest converted to JUnit 
ArgumentCaptor used to verify which activity is started by the context.
Additionally, spy of application runtime context used instead of a
robolectric shadowActivity

Test: atest -c PrivateVolumeOptionMenuControllerTest
Change-Id: I5afd83cc09d57150661b22156a2fb06e1f09ea0b
 2021-02-24 13:59:13 +08:00
Treehugger Robot
e5313e42cc Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790 am: dbf857e2c7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6306474d5ac4eb50686da75fc85aa15418be03f
 2021-02-24 05:54:51 +00:00
Jeremy Goldman
b277923e56 BrandedAccountPreferenceControllerTest converted to JUnit 
Resource determining controller availability is mocked, rather than
using robolectric device config.

Diff: https://diff.googleplex.com/#key=JywCGq1rz3Pb
Test: atest -c BrandedAccountPreferenceControllerTest
Change-Id: I14e6db63af29479cb663895f9d9259bff0df43b7
 2021-02-24 05:41:03 +00:00
Treehugger Robot
d8137193ae Merge "Grant BatteryStats OWNERS for FakeUid.java" 2021-02-24 05:34:05 +00:00
Treehugger Robot
dbf857e2c7 Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32c192b2d4dfe390243a477b51ff807dced229fb
 2021-02-24 05:08:28 +00:00
Tom Hsu
87a11d41fb [automerger skipped] Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641 am: 693e52688b -s ours am: b8ccb41c30 -s ours 
am skip reason: Change-Id Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd with SHA-1 9bd774a0b0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13672665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08fb932d70b0dae3303fc4157d33dc28f4f848dc
 2021-02-24 05:07:50 +00:00
Adam Bookatz
456e50f1a9 [automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 am: 042f06aadf -s ours am: 750ed6a672 -s ours 
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id872a83b40c52e1e5c302b0f11b9a4758b27ca56
 2021-02-24 05:07:39 +00:00
Tom Hsu
b8ccb41c30 [automerger skipped] Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641 am: 693e52688b -s ours 
am skip reason: Change-Id Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd with SHA-1 9bd774a0b0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13672665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33c22d67cc1e7c2716c5ac9172225d240a61e97b
 2021-02-24 04:30:45 +00:00
Adam Bookatz
750ed6a672 [automerger skipped] Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 am: 042f06aadf -s ours 
am skip reason: Change-Id I330d074c6e504493abf4cece51199ec5851b5d3b with SHA-1 9a90dc1e8e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7aa1b661119b6f224ffbd935a1b5a3d95a52a5c
 2021-02-24 04:30:23 +00:00
Tom Hsu
693e52688b Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13672665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia58c627514657f60dd2401cc7eaed1495d5747ca
 2021-02-24 04:26:15 +00:00
Treehugger Robot
1d7e8ae790 Merge "Adding notification team members to notification directory" am: f290b00125 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4fb1061bbc4036b3166f8ddc3d9836f10078a1
 2021-02-24 04:26:10 +00:00
Tom Hsu
f76a2ff641 Merge "Only default APN type can make preference selectable." into rvc-qpr-dev 2021-02-24 03:59:11 +00:00
Adam Bookatz
042f06aadf Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d2c2520b03586c375601f8987c53d9e25d68c6b
 2021-02-24 03:30:08 +00:00