TreeHugger Robot
9257747b19
Merge "Update strings of clear app data dialog" into tm-dev am: f6eb111b91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17491666
Change-Id: I08cd841290dbe7d669bbfc2320f1b8e44dec5604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 05:28:46 +00:00
TreeHugger Robot
04ae0b26fa
Merge "Update strings of clear app data dialog" into tm-dev am: f6eb111b91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17491666
Change-Id: Iff4543ae9f8dcd9e7944c7cdf50f913a2e6754e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 05:28:38 +00:00
TreeHugger Robot
f6eb111b91
Merge "Update strings of clear app data dialog" into tm-dev
2022-03-31 05:11:20 +00:00
Bill Yi
80cccc92a3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1ead787a36abb7192ac2a07bdd9a09fe5a2170ed
2022-03-31 04:30:06 +00:00
hoffc
5710b02972
Settings: Fix cellular internet option Not seen after internet reset
...
Cellular internet preference will be hidden during reset internet, and resume to be visible after successfully reset or reset timeout. Due to the wrong immediately param value assigned for hidePreference method, which results in cellular internet preference not seen after internet reset.
Assign correct immediately param value when resuming after internet reset.
Bug: 224893326
Test: manual test
atest InternetResetHelperTest
Change-Id: I3f8d5dd9de2a56ecfe201483ee8a95b379e8fe65
2022-03-31 04:01:58 +00:00
hoffc
f3fe5cf197
Settings: Fix WifiSettings FC when rotating screen
...
Rotating screen will trigger wifisettings re-creation. Force close occurs If receiving wifi picker tracker callback during activity finishing.
Bug: 218411211
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettingsTest
Change-Id: I06d251a8a12d3f8785db24ead0abe31c0f34cc9b
2022-03-31 04:00:52 +00:00
Bill Yi
cc9f99268a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d70a27bb5a877a042194ad1a72ce028b69ff9b9
2022-03-31 03:53:54 +00:00
tom hsu
9be043e750
[Panlingual] Revamp the panlingual UI in Settings.
...
- Create a Activity to contain AppLocaleDetail and
LocalePickerWithRegion
- Update the Entry from apps language page
Bug: 223089715
Test: local test pass
Change-Id: Id01e93f3df32412c7323ca577a149009eb1862ad
Merged-In: Id01e93f3df32412c7323ca577a149009eb1862ad
2022-03-31 03:35:21 +00:00
Quang Luong
baf2ef0be6
Do update signal icon for -1 level in AddAppNetworksFragment
...
The level of a WifiEntry may be -1 (WIFI_LEVEL_UNREACHABLE) due to race
conditions. Thus, only update the signal icon if the level is a valid
value [0, 4]
Bug: 201488249
Test: m
Change-Id: I87f1c108d262bb5a7575c9ad434d2cfb953134af
(cherry picked from commit 9d66b22ee0
)
2022-03-30 21:48:31 +00:00
TreeHugger Robot
431fe93906
Merge "Added vibration back to UDFPS#onEnrollmentProgress" into tm-dev am: 3ef050d225
am: fccee046e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17492107
Change-Id: Icef0ac43e9caa1e2333a73f1ad12cd35b17c1871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 20:19:49 +00:00
TreeHugger Robot
5ada6a2d23
Merge "Added vibration back to UDFPS#onEnrollmentProgress" into tm-dev am: 3ef050d225
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17492107
Change-Id: I91ce5ff84553d63e56df052134904844558fb72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 20:03:31 +00:00
TreeHugger Robot
fccee046e3
Merge "Added vibration back to UDFPS#onEnrollmentProgress" into tm-dev am: 3ef050d225
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17492107
Change-Id: I7b71e3fa735158c05cb46834a1914c1841123598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 20:02:51 +00:00
TreeHugger Robot
3ef050d225
Merge "Added vibration back to UDFPS#onEnrollmentProgress" into tm-dev
2022-03-30 19:47:42 +00:00
Joshua Mccloskey
75063d8474
Added vibration back to UDFPS#onEnrollmentProgress
...
Test: Verified haptic is now present.
Bug: 222593183
Change-Id: I3aed905e127f4e3eff931e4e35f5929389764b7e
2022-03-30 17:04:29 +00:00
Aaron Liu
23452be356
Merge "Home Controls: Add conditional copy for setting." into tm-dev am: 126e629c7d
am: d3599b3ffe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17476399
Change-Id: I90f6c9162196c81b1f06a47bae009f8d389760a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 15:35:53 +00:00
Aaron Liu
3d3957830e
Merge "Home Controls: Add conditional copy for setting." into tm-dev am: 126e629c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17476399
Change-Id: I07568b33ba507c78fe9ad3fe2f058687533893d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 15:20:25 +00:00
Aaron Liu
d3599b3ffe
Merge "Home Controls: Add conditional copy for setting." into tm-dev am: 126e629c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17476399
Change-Id: I34b6447af0092dc8cdb6843ee130174d3f86e02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 15:20:22 +00:00
Aaron Liu
126e629c7d
Merge "Home Controls: Add conditional copy for setting." into tm-dev
2022-03-30 15:05:05 +00:00
Anna Bauza
734969805d
Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev am: a5f29f2e93
am: f3e4068a03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352023
Change-Id: I927261fb5e48a4c18f21c64cd099d6f641df820e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 12:42:01 +00:00
Anna Bauza
f3e4068a03
Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev am: a5f29f2e93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352023
Change-Id: I14db68605e0c14735a9f2bdb6a5303c0a226271c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 12:19:12 +00:00
Anna Bauza
49fc78d5b2
Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev am: a5f29f2e93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352023
Change-Id: I45eda3798a1359863ab8f92bd222d77df949f4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 12:19:08 +00:00
Anna Bauza
a5f29f2e93
Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev
2022-03-30 11:57:19 +00:00
Yuri Ufimtsev
49f55019d6
Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev am: 4dcf05657e
am: fa6ae0770f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17471746
Change-Id: I85dff72d4f21be04458009d26b401689cbaa7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 10:37:21 +00:00
Yanting Yang
f14248310f
Update strings of clear app data dialog
...
Update body and positive button strings.
Bug: 219932186
Test: visual
Change-Id: I34f4be091d1e5a076de8ee7a2221a3b5c90747a4
2022-03-30 18:31:52 +08:00
Yuri Ufimtsev
fa6ae0770f
Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev am: 4dcf05657e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17471746
Change-Id: I15fe56b4c1d3edb2e1d791bdff7146ad15c977e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 10:20:02 +00:00
Yuri Ufimtsev
40c8b629c7
Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev am: 4dcf05657e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17471746
Change-Id: I036943258043567991aa24d6d4a9665c42cc106f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 10:19:57 +00:00
Yuri Ufimtsev
4dcf05657e
Merge "Remove title of Smart Lock / Trust Agents preference category" into tm-dev
2022-03-30 10:03:52 +00:00
TreeHugger Robot
738644e2f1
Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada
am: c9ea940a37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104
Change-Id: Id4826a5bfeac089ffc0751b39c78b5c46d1d880a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:57:05 +00:00
TreeHugger Robot
c9ea940a37
Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104
Change-Id: Ia63428939b5f9329d3f59965391ce33d5888ec6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:34:22 +00:00
TreeHugger Robot
72d54f7007
Merge "Fix flickers on the Location page" into tm-dev am: a8eabc6ada
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17447104
Change-Id: If884b3bbc0449ce1e5a232d734fae35883470bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 09:34:17 +00:00
TreeHugger Robot
a8eabc6ada
Merge "Fix flickers on the Location page" into tm-dev
2022-03-30 09:17:53 +00:00
Jason Chiu
e60dd45156
Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1
am: 187b39edc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489
Change-Id: I525dbf313c7865746f33425a85052dc73a51f41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:22:22 +00:00
Yuri Ufimtsev
075f6d8b2f
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc
am: 4a7394041c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923
Change-Id: I9d0eeda10de700d276045afc5ad2bd8e925f7b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:22:12 +00:00
Anna Bauza
ee23152051
Fix "Remove Guest" option shows "Reset Guest" dialog
...
If the guest user was not auto created, removing the user from settings message was wrongly worded. Small refactor to reuse the same wording in different modules has been done.
Bug: 225314166
Test: manual
Change-Id: Ia1871efc6aeeb2d3604c2fc4fd98a2a3a500953b
2022-03-30 08:20:04 +00:00
Jason Chiu
187b39edc2
Merge "Refine layouts for large screen" into tm-dev am: 51316c13a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374489
Change-Id: I58366792b3bb490d5131b28b5218ef8486988971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:13:57 +00:00
Jason Chiu
51316c13a1
Merge "Refine layouts for large screen" into tm-dev
2022-03-30 08:10:42 +00:00
Yuri Ufimtsev
4a7394041c
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923
Change-Id: I5389c1897386eac6f23fc33e4f56ff71286cb392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:06:13 +00:00
Yuri Ufimtsev
a800f1f9e7
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev am: addc9c06bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474923
Change-Id: I7a1d703af18bde8311e32190b3920fa6d3e2cbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 08:06:10 +00:00
Yuri Ufimtsev
b388ccfc70
Remove title of Smart Lock / Trust Agents preference category
...
Test: manual
Bug: 191735388
Change-Id: I49a0f8138dc06e4bc4ab945116bde5e2e83ffaff
2022-03-30 07:57:38 +00:00
Yuri Ufimtsev
addc9c06bc
Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev
2022-03-30 07:48:16 +00:00
Weng Su
7f293907ee
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours am: 1c60264236
-s ours am: 76a3954c18
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ifafce87dc3e2a2a1886c9e32cb5dcd96159b0abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:27:01 +00:00
Weng Su
76a3954c18
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours am: 1c60264236
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ie90a01f637e5b88aa7ad882443c329591d1baff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:11:13 +00:00
Weng Su
ed743470a9
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours am: 1c60264236
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ib9ba9792a2ee6f15118020ed1edc0ff0f2e5cb44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:11:10 +00:00
Weng Su
198e2e6375
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours am: a2e5b7b7cb
-s ours am: 33138dfc48
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I831cb162bb1db9f714b92139e3688bdccc4d01b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 07:04:22 +00:00
Weng Su
1c60264236
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
am: 4026f4134f
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 4c4a1f58c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: Ia69461e39acae0c5a685b9901e1fc2b265ec1eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:56:02 +00:00
Weng Su
33138dfc48
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours am: a2e5b7b7cb
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I2de07abbbdb4de1ff49a5ac497ab4d7b67db4080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:41:26 +00:00
Weng Su
4a865ce7fc
[automerger skipped] Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: 95ff0f1453
-s ours am: a2e5b7b7cb
-s ours
...
am skip reason: Merged-In Ic434f0583cba557228c72508a501347ffa3141e1 with SHA-1 876f691377
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I8b22ff00a7d143673c9108264412ff72c731d5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:41:18 +00:00
Weng Su
4026f4134f
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
am: 7abffe0057
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: I17625880bf59eb632cc0dcdbc222c60a516d119e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:40:51 +00:00
Jason Hsu
a0524e53ad
Merge "Set title to the hearing aid pair instruction dialog" into tm-dev am: abd4fd54b1
am: 3f88b72bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291806
Change-Id: I0942b354fc69207764ef671001907340335f1477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:34:32 +00:00
Weng Su
7abffe0057
Restrict secondary users to share Wi-Fi network am: 4c4a1f58c1
am: a30d123e12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397180
Change-Id: If2619c93286363f268bb7021af1037195fcba4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-30 06:26:59 +00:00