Commit Graph

14850 Commits

Author SHA1 Message Date
TreeHugger Robot
d604c56542 Merge "Correct how the injection mechanism starts activities" into sc-v2-dev am: 40e9a8aaaf am: 5be7a95a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809057

Change-Id: Ib6b6c20b95653e23e79183e8ec30ac6a7c462d0d
2021-09-14 04:23:42 +00:00
TreeHugger Robot
5be7a95a99 Merge "Correct how the injection mechanism starts activities" into sc-v2-dev am: 40e9a8aaaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809057

Change-Id: I8752904ce14c7ca84787e260b0bdb1a4aefb047c
2021-09-14 04:14:22 +00:00
TreeHugger Robot
40e9a8aaaf Merge "Correct how the injection mechanism starts activities" into sc-v2-dev 2021-09-14 04:02:45 +00:00
Pavel Grafov
b01b2ba4d0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 am: fc67167c93 am: 0e72224c38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: I44c3cbd651e59cc195a25f5ce06c4ea5b4fa441e
2021-09-13 14:33:14 +00:00
Pavel Grafov
0e72224c38 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 am: fc67167c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: Ic295385f6cb70c2caecff6679336dd757cde513b
2021-09-13 14:18:44 +00:00
Pavel Grafov
fc67167c93 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: I277765ca0a21a2793558668b3a3f20bccd2f28c4
2021-09-13 14:08:56 +00:00
Pavel Grafov
1ecc3166f0 Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev 2021-09-13 13:52:26 +00:00
Pavel Grafov
36120b8a4c Respect PASSWORD_QUALITY_MANAGED for biometrics
Bug: 195488124
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=\
    com.android.settings.password.ChooseLockGenericControllerTest
Test: manual with a modified TestDPC
Change-Id: Ifa15877c735bb0f396051af04a4e012a606bf9e1
2021-09-13 11:50:06 +01:00
ykhung
dfd2bf044f Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf am: a168e2e0fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809054

Change-Id: I8396a058b78d2c37ebf223e26884860061a08b84
2021-09-11 18:25:11 +00:00
ykhung
a168e2e0fc Fix failed tests since presubmit is ignored in ag/15802168 am: 27efa546cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15809054

Change-Id: I5b0e17f5862f295da35456f691dfcdc32587bcdc
2021-09-11 18:13:37 +00:00
ykhung
27efa546cf Fix failed tests since presubmit is ignored in ag/15802168
Bug: 198553245
Test: make SettingsRoboTests
Change-Id: I91e715a6bfb64419b457812423996365a9464a93
2021-09-12 00:36:43 +08:00
Yi-Ling Chuang
5fc96844e5 Correct how the injection mechanism starts activities
Settings Injection used to start activities with
startActivityForResult() and its extension, where there was not result
really being handled. Hence, this CL corrects the way it starts
activities by removing the "ForResult" part.

Fixes: 197704126
Test: robotest and launch Android Auto to see it being launched in
another task.

Change-Id: I259b2555cf62f8966afdf664b337af5f216b3843
2021-09-11 16:48:37 +08:00
ykhung
f27d0c2935 Move allowed list definition in the battery usage to feature provider am: b62cdecc67 am: bb535f4bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I4a19dcc41b14af235c3e1d94675d14fc8f05e3a0
2021-09-10 05:14:37 +00:00
ykhung
bb535f4bce Move allowed list definition in the battery usage to feature provider am: b62cdecc67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15785737

Change-Id: I01745bccfb5cf44fbdfeedd1db6ad2b88a0c71a2
2021-09-10 05:03:32 +00:00
ykhung
b62cdecc67 Move allowed list definition in the battery usage to feature provider
Bug: 199367609
Test: make SettingsRoboTests
Change-Id: I321426e6ff1b9586ee493792f1d39aed35ecc34d
Signed-off-by: ykhung <ykhung@google.com>
2021-09-10 01:29:32 +08:00
TreeHugger Robot
e1740e2faa Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4 am: 63a22fd735
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: I69864e3efbdb8e191c5f098c004e5bee06f0351c
2021-09-09 15:57:13 +00:00
TreeHugger Robot
88cd5025e1 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: If2c47f007a67865ad9aaf8040eddc638f46f7964
2021-09-09 15:40:14 +00:00
TreeHugger Robot
63a22fd735 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev am: daaf1728b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747143

Change-Id: Id85a00a0673b59ae514b56a8f197aaa65ddd32e6
2021-09-09 15:40:11 +00:00
TreeHugger Robot
daaf1728b4 Merge "Enhance battery settings limit charge tip" into sc-qpr1-dev 2021-09-09 15:28:01 +00:00
Wesley.CW Wang
083ace54d5 Enhance battery settings limit charge tip
- Add dialog for limit charge tips
 - Add action button to make limit charge tips can bypass charge limited
 - Fix layout typo
 Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png

Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
Merged-In: I0901c56ae93691c984376852da78cde9078caaf0
2021-09-09 22:13:33 +08:00
Treehugger Robot
980ae6ce14 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765 am: 972166204d am: 11c064519b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I0a80d051eed7132d963aef5f18e68b8031c62a47
2021-09-09 11:20:09 +00:00
Treehugger Robot
11c064519b Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765 am: 972166204d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I47be397c2e1ca103e27ac15638725841a9775ade
2021-09-09 11:10:59 +00:00
Treehugger Robot
972166204d Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 am: 8a57649765
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I1845ebaf808192d3b28cc72f3548d0f489a4ce7c
2021-09-09 11:00:58 +00:00
Treehugger Robot
8a57649765 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: Iaf54828eaec9c24a83aaddec90d775dafab6dd34
2021-09-09 10:46:10 +00:00
Treehugger Robot
fbf2d0bc55 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I74de819b9c6eefb93d9447efe8398ddd27470933
2021-09-09 10:28:50 +00:00
SongFerng Wang
168a1be452 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78 am: 12a16eb32d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I79bb6ec5faecadd5bc17751e6979207398c2a300
2021-09-08 21:17:49 +00:00
pingzhi wang
860216208f Remove the option of resetting Euicc data.
Euicc reset option should not be available on devices that do not
support embedded sim cards.

Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
2021-09-08 17:34:30 +02:00
TreeHugger Robot
28a172a408 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: a5cc9839c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: I9312787c2fcdda1353e7e85b6ead85e86db3e80a
2021-09-08 08:22:04 +00:00
TreeHugger Robot
097ab944d3 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: Ib14609c4e8f875d1921638194461102dcdc6ede8
2021-09-08 08:09:04 +00:00
TreeHugger Robot
a5cc9839c2 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: Ibb65b7999bdc331c4b15363bce71ece51a448c0e
2021-09-08 08:09:04 +00:00
TreeHugger Robot
b370bfe77d Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev 2021-09-08 07:57:33 +00:00
Wesley.CW Wang
0849672890 Enhance battery settings limit charge tip
- Add dialog for limit charge tips
 - Add action button to make limit charge tips can bypass charge limited
 - Fix layout typo
 Screenshot: https://screenshot.googleplex.com/5ngtD2sJAKSQZD3.png

Bug: 196315151
Bug: 197769934
Test: make SettingsRoboTests
Change-Id: I0901c56ae93691c984376852da78cde9078caaf0
2021-09-08 04:31:59 +00:00
SongFerng Wang
12a16eb32d Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I558efa552f7c374dc980c85efbd8f1a9bbb3841f
2021-09-08 04:03:02 +00:00
SongFerng Wang
fe74266ba4 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I176f6a1b4a7d1551c721a5d63bcaabd5666daf82
2021-09-08 03:51:42 +00:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
2021-09-08 03:51:39 +00:00
SongFerng Wang
9354a7e81c Merge "[VoNR] VoNR settings" into sc-qpr1-dev 2021-09-08 03:38:02 +00:00
TreeHugger Robot
0571ab940a Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9 am: 89a745dd8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811

Change-Id: Ib9173bcda2280a683fda2e163bfc7467923d0bf2
2021-09-07 08:00:49 +00:00
TreeHugger Robot
89a745dd8c Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811

Change-Id: Idd2af151dcb4c0b8bb8f7fd04f8574544590b467
2021-09-07 07:37:54 +00:00
TreeHugger Robot
f8bb8aced9 Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev 2021-09-07 07:27:05 +00:00
Jason Chiu
7426ab7b9f Define menu keys for highlighting the menu entry on 2-pane UI
- Define an attribute for highlightable menu keys
- List the keys for Settings menu entries
- Support parsing the attribute

Bug: 199017944
Test: robotest
Change-Id: I5759bff591c79d498fffb8b2c2b57f2cb66c4421
2021-09-07 06:32:19 +00:00
SongFerngWang
eaa71ac6de [VoNR] VoNR settings
Allow user to enable or disable voice over NR.

Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest

Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
2021-09-07 10:57:34 +08:00
Wilson Wu
395e839b10 Merge "Update settings PrimarySwitchPreference reference" 2021-09-07 02:51:20 +00:00
Betty Chang
3b1c25573b Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
2021-09-06 04:16:51 +00:00
Betty Chang
ebdc0e26f6 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: I5a889a42d677e064b7ef553405fc0a19996961ad
2021-09-06 04:12:50 +00:00
Betty Chang
edd650f6b5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ib0426da2b92a1c5771dffd2ff68618f14f331f44
2021-09-06 04:12:49 +00:00
Betty Chang
adc41a55d5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev 2021-09-06 04:00:59 +00:00
changbetty
8dec2efc67 Change the SIM color for passing the GAR
Bug: 195710292
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
Merged-In: I7b7a3e1b6d72709acbae0a0433af897a28d73afc
2021-09-03 04:07:31 +00:00
YUKAI HUNG
0051f1e3e9 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 am: fab65bcfe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I760b2d0d9a85b271c6a11c0d0255a164d5aba6dc
2021-09-03 02:58:37 +00:00
YUKAI HUNG
0a11568b82 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: Ie57e3be9bda2316a8ee6a59fba76043ed6e61c54
2021-09-03 02:50:11 +00:00
YUKAI HUNG
fab65bcfe5 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I39400598833b3de8ae60b6c9901fdbcc6015a16f
2021-09-03 02:48:48 +00:00