Neil Fuller
b46adff0f4
Swap ownership to mingaleev@
...
BUG=189810551
Change-Id: I6304545540947d6695117753309c80b27cf2669a
2021-09-10 12:20:39 +00:00
Bonian Chen
d010033f00
[automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92
-s ours am: 6c1c8934a2
-s ours am: 58d30bf442
-s ours
...
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1791947
Change-Id: I4aa99ad4e762506fb17feb8d6ffc3d8f03f2d15b
2021-09-10 10:31:13 +00:00
Bonian Chen
58d30bf442
[automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92
-s ours am: 6c1c8934a2
-s ours
...
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1791947
Change-Id: I9d32b04abf40f188d302fe752f44ed7d03aa2bcd
2021-09-10 10:11:19 +00:00
Bonian Chen
6c1c8934a2
[automerger skipped] Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" am: 4c3f454c92
-s ours
...
am skip reason: Merged-In Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77 with SHA-1 f56682808e
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1791947
Change-Id: Iab613dc14204401318bd69648dad6c7d2f49e723
2021-09-10 09:59:38 +00:00
Bonian Chen
4c3f454c92
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed"
2021-09-10 09:46:32 +00:00
Ting Yu
638f12a6c8
Fix Text of VoLTE setting cannot be updated when SIM state is changed
...
Text of setting menu for VoLTE should be changed from "VoLTE" to
"4G Calling" if "show_4g_for_lte_data_icon_bool" is true. However, it
is not changed in the following steps.
1. Turn Use SIM off on Mobile Network Setting and close Mobile Network
Setting screen.
2. Open Mobile Network Setting screen again and turn Use SIM on.
Root cause is that the carrier config value is loaded only when SIM's
subid is changed. So, remove checking subId so that the carrier config
value is updated.
Additional fix:
Removed checking #isModeMatched in # onStart because "4G calling"
Setting was grayed out. It needs to listen to call state change
regardless of display status of the preference because Preference may
be switched even after the screen is displayed.
Test: manual
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Bug: 196030198
Change-Id: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
Merged-In: Ibf4d17aa493f69a3f00e35ae0e9d1419bd9e0d77
2021-09-10 01:17:26 +00:00
Bill Yi
a66a06e20a
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a
-s ours am: 74305a655a
-s ours am: 2180784c46
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1822789
Change-Id: I36d53b74ccde439c5c6b96f2a2f8f2622d538c38
2021-09-09 22:29:33 +00:00
Bill Yi
2180784c46
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a
-s ours am: 74305a655a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1822789
Change-Id: I9fc84c95f481cbb8dd75d47047dc99cc11b977bd
2021-09-09 22:11:53 +00:00
Bill Yi
74305a655a
[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1822789
Change-Id: Ic4f2be01ba3bd1251dda73f1852463b5e6b6b5f3
2021-09-09 21:39:31 +00:00
Bill Yi
f4e2f69f3a
Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE"
2021-09-09 21:27:25 +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
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
TreeHugger Robot
c0ca45a9b9
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b
am: 514c49510d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688
Change-Id: I53a3e0d9353f93f0ca42d6e34decfe77bce63c29
2021-09-09 10:25:01 +00:00
Treehugger Robot
604c7a7cfa
Merge "Remove the option of resetting Euicc data."
2021-09-09 10:09:30 +00:00
TreeHugger Robot
514c49510d
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688
Change-Id: I6968521de3a4ac2bccc83d934c2c9c897fb10fce
2021-09-09 10:00:22 +00:00
TreeHugger Robot
bb1dd00d0b
Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master
2021-09-09 09:47:14 +00:00
Bill Yi
77c6ea6e80
Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE
...
Merged-In: I1f20e829bf513d8166458e1749bcc8c9fade07b2
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Change-Id: Icad4036f299d2b082cc617b82f9f900a0f23aa96
2021-09-08 17:57:10 -07: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
Kevin Chyn
f6f13b578e
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
am: cd2016c7a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ibcdd4ad0a07289379c7a468ecc339422481389e1
2021-09-08 08:51:44 +00:00
Kevin Chyn
1b1c7ee277
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
am: 49bbd5b893
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Icb0714151e308048598738e9a61607dc5361f6fe
2021-09-08 08:51:24 +00:00
Kevin Chyn
cd2016c7a0
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ief10091c6a8fed52e87ea0da33bf24c0bad34ce8
2021-09-08 08:26:47 +00:00
Kevin Chyn
49bbd5b893
[DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087
Change-Id: Ie1964e499bc6a11499590de5a69f75539939ce3a
2021-09-08 08:25:40 +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
Kevin Chyn
0b40e09ba6
[DO NOT MERGE] Update enrollment edu asset
...
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-08 00:09:13 -07:00
Presubmit Automerger Backend
948aadcfa4
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
am: 77e02cbb71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I9335ae0dbecdbdb71cbbd1955bc57f6dabf9aa7a
2021-09-08 03:59:12 +00:00
Bill Yi
7fc6f84bb9
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I47cbb350d9c0ab717293fca603684fbd1c5b3f03
2021-09-08 03:52:05 +00:00
Presubmit Automerger Backend
d83a1eb34f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
am: 5d2b55f56c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: Iad50a5dab73a9aa2d4c4bbcf6a0ca76055ef2948
2021-09-08 03:52:04 +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
Bill Yi
47bb70329b
Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
Import translations. DO NOT MERGE ANYWHERE
2021-09-08 03:43:33 +00:00
SongFerng Wang
9354a7e81c
Merge "[VoNR] VoNR settings" into sc-qpr1-dev
2021-09-08 03:38:02 +00:00
Presubmit Automerger Backend
5d2b55f56c
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I8a830a6f59d79a8c663e61240fe9072d5c07891d
2021-09-07 23:51:49 +00:00
Presubmit Automerger Backend
77e02cbb71
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I82346cae7ca0fe69c3ad76815a9becf036c38ba2
2021-09-07 23:51:48 +00:00
Bill Yi
d770312ec1
Import translations. DO NOT MERGE ANYWHERE
...
BUG:198847997
Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
2021-09-07 23:51:36 +00:00
TreeHugger Robot
fb39c456a8
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I5b8af0112efa816d38d08a9a84e10b9ebb016531
2021-09-07 20:42:23 +00:00
TreeHugger Robot
ec9a292393
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev
2021-09-07 20:29:33 +00:00
Julia Reynolds
60dd5ef026
Remove unneeded NEW_TASK am: 717e3f6270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: I8f1564b6206d52fca34e510d41e772dcce4ed150
2021-09-07 18:51:32 +00:00
Julia Reynolds
717e3f6270
Remove unneeded NEW_TASK
...
To improve animations
Test: manual
Fixes: 197609584
Change-Id: I4cfbe7386014ba1fb6808bfeb283955101c7e1a7
2021-09-07 17:08:41 +00:00
Julia Reynolds
520c80d649
Add 'snoozing' to NLS consent dialog
...
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
2021-09-07 13:17:49 +00:00
Presubmit Automerger Backend
3e32235ad3
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I5b07fbf557c04ac2cb5f39a07a157046f1079d43
2021-09-07 04:47:13 +00:00
Presubmit Automerger Backend
d7e50f20fe
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 585d501aff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I61d4f0aedc979e9d6d79c8035bf7e441e68c0e7b
2021-09-07 04:46:50 +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
Presubmit Automerger Backend
585d501aff
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: If065d05e56a573f40969fb780299099a38b548b0
2021-09-07 01:57:06 +00:00
Presubmit Automerger Backend
4dde18fc09
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: Ia1cb0bebbab85af8bda052e0c430527909949562
2021-09-07 01:57:04 +00:00
Curtis Belmonte
e7849fb0dc
RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment
...
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll
Test: Manual
Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
2021-09-06 18:56:38 -07:00
Jason Chang
39ebcd090b
Fix hold volume keys don't trigger the one handed mode in
...
One-handed mode settings page
Add to support observing A11y's Shortcut Hardware provider key
ACCESSIBILITY_SHORTCUT_TARGET_SERVICE
Bug: 193411296
Test: manual verified on System > Gestures > One-handed mode shortcut
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"
Change-Id: I4704a56873f14e52db8f7c0468eed17f190c5dce
Merged-Id: I4704a56873f14e52db8f7c0468eed17f190c5dce
2021-09-06 08:45:27 +00:00