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
Bill Yi
c17d7563c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours am: a1fbab88b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: I6ac735c3a33e3064ac010f4c2c940f43ecabbebf
2021-09-12 13:43:16 +00:00
Bill Yi
5b1fdf9c97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours am: a6262f4929
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: I71dfd2c468ec965aa249177ad4d3cdb1ec2c3071
2021-09-12 13:43:01 +00:00
Bill Yi
b89b43bf79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours am: 7b59a40d17
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Icaed89a976f212712af5fc73c8256e03c04cccb2
2021-09-12 13:42:54 +00:00
Bill Yi
9f2415ea70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours am: 080db6b64d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: I755e18813630f8815577e5a3f58af411077ce546
2021-09-12 13:42:43 +00:00
Bill Yi
a1fbab88b0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: I2524cd8a07d10ec1cdf4aac42e972caa9e6a90f4
2021-09-12 13:28:23 +00:00
Bill Yi
a6262f4929
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: Ibf908ae1613110202f6bfa0ed16f575866121fb4
2021-09-12 13:28:15 +00:00
Bill Yi
7b59a40d17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours am: 75d96641c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Ib76fa3621571832716728f486aafc0d01b6e6a60
2021-09-12 13:27:23 +00:00
Bill Yi
080db6b64d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours am: 2bc492b5a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: If3dfaff3154b221dc5c5e46c8434fefcb735bec2
2021-09-12 13:27:16 +00:00
Bill Yi
84c8cce97e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0444a1a047
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811407
Change-Id: I18e0855054dd67edc6985c6fdc12b122fbee5944
2021-09-12 13:13:18 +00:00
Bill Yi
d056c27aef
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
am: b1e28007d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I34b94c1b42a6f0dbacc5b0e8b13866d5cab656b0
2021-09-12 13:12:09 +00:00
Bill Yi
75d96641c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98945e949e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811297
Change-Id: Ieff57a9bcb1cb08bfff67c882d2d23d40bf8881c
2021-09-12 13:11:17 +00:00
Bill Yi
2bc492b5a6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24917c6fce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811295
Change-Id: I5c98246752b54a166967392171d412f79fa3dfce
2021-09-12 13:11:08 +00:00
Bill Yi
1c9390c614
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
am: 78d0880792
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: Ie370a49faa9729372de252a89a8cf3d5bb5cb2f2
2021-09-12 13:11:04 +00:00
Bill Yi
0444a1a047
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-12 12:59:03 +00:00
Bill Yi
98945e949e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-12 12:57:50 +00:00
Bill Yi
dfa9ca0dff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b28169e85744c126af035cae96f457b7d9471ea
2021-09-11 09:11:27 +00:00
Bill Yi
78d0880792
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: Icab5517ddc19bbe60183846d4f85bef549b0e3e8
2021-09-11 09:10:05 +00:00
Bill Yi
b1e28007d4
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5d4317641
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15811299
Change-Id: I7e8aa5a5b4825dba96ed2f220eb073506ee4bc53
2021-09-11 09:10:04 +00:00
Bill Yi
a5d4317641
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I89637d7c6419239e93a6dd005268adcf378c2291
2021-09-11 09:09:53 +00:00
Bill Yi
b2e42cabd4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a37f3d6526c53393d047d99f8c19f2054e932f7
2021-09-11 09:05:32 +00:00
Bill Yi
24917c6fce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id7feff6bce69e46b992f5062c6fe2679f3fdd429
2021-09-11 09:02:07 +00:00
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