Bill Yi
9b25911c3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a04b6df040
-s ours am: 9bb60a200e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140
Change-Id: If5480716680eb2a785cff991e320999dd0671e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:51 +00:00
Bill Yi
49103dfc2e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc9e1994c
-s ours am: 9abc703e40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801140
Change-Id: I370319fcbc37e1a632a2e8a6d20083ece4b69566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:43 +00:00
Bill Yi
155b5266fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 171e66e000
-s ours am: 4caa1ee4c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: If51f800f04ad40049ee3508ff02d9ded8cf7f7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:37 +00:00
Bill Yi
0ebc9d790d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c416adc1df
-s ours am: d4ba4def6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801124
Change-Id: Ie6058d58565c8b9f65cc7cb5a61b1367141dd17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:30 +00:00
Bill Yi
a70fa93e6b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 499308fa2c
-s ours am: dcd5353e67
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Ib6beab44e6862b85e5a5ebb28f9573b894a69dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:07:19 +00:00
Bill Yi
340b85bb5b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a05355cc0a
-s ours am: 22ac363063
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22801123
Change-Id: Idb3db0d1797033ce2854741532be1f0eb32823fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:06:56 +00:00
Piotr Wilczyński
0066bdea3e
Merge "Revert "Back up the smooth display setting"" into udc-d1-dev
2023-04-27 16:06:37 +00:00
Treehugger Robot
46bd7feab6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 0cb641a695
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I1943d52ba4d0aa955897e823a3860ef619d98915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:05:02 +00:00
Treehugger Robot
0b8d81c18c
Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 953f6167e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019
Change-Id: I6372af8e100d0ab6d7709cc180c13efce4ff40fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 16:04:44 +00:00
Zoey Chen
cfaa13442c
[Settings] UI part: Add metrics for language
...
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
2023-04-27 15:55:45 +00:00
TreeHugger Robot
6b72708a65
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
am: ffb6adb9e6
am: fc81c4f554
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: Icff0a85b1e8d6746cf03079cb765c63468a004d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:31:02 +00:00
Treehugger Robot
fc118cbc74
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
am: 118a51ad6d
am: d5c1e54e8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: Ibe9a32aaf21b97171a41643fc25ad7815e4126f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:27:51 +00:00
Menghan Li
1650672133
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
am: cd4c0f15a8
am: c55f3c57cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I477e2547226dfc52ddf5407395b0a29541a197b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:24:43 +00:00
TreeHugger Robot
ab698bb070
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
am: 143f6aeb43
am: 2f2163ee02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I2b738868662145a08eca5c67ae632504984d0556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:20:49 +00:00
Treehugger Robot
c0df78e007
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
am: 9e1c1ecca5
am: f7210aa079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: I836e5e24fd192a11a5086647fe4703c8d5c64f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:18:05 +00:00
TreeHugger Robot
fc81c4f554
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
am: ffb6adb9e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I8805a3a28cc710330861e409e3fc3e1435444973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:17:13 +00:00
Menghan Li
a6a8240c5e
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
am: e9427458a9
am: 54492ea2fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I8933895ee2ea928efea19d9d61337c300322de83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:15:14 +00:00
Treehugger Robot
d5c1e54e8f
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
am: 118a51ad6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: I7a2dd3b4ccb13921913df8b9c9e153d80ddd5091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:13:43 +00:00
Menghan Li
c55f3c57cb
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
am: cd4c0f15a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: Ied8c33725f5295b6786413591687eb6966cf2ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:11:01 +00:00
Chaohui Wang
68d638707b
Fix Data Saver page crashed when rotate
...
This is because before fix mLoadAppRunnable is async run. And the
getContext() within it will return null when the Fragment in some not
ready lifecycle.
Use viewLifecycleOwner.lifecycleScope.launch to ensure the async
function will only be run when the view is ready, and automatically
canceled when out of scope.
Since this requires Kotlin Coroutine so migrate DataSaverSummary to
Kotlin, other functionality are keep no change.
Fix: 279863347
Test: Manual
Change-Id: I2e97a071c103e63b3306b801fc38f4704e3be0d2
2023-04-27 20:08:19 +08:00
TreeHugger Robot
bebe506509
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
am: 795f3d2d09
am: 88ef9a6791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I56ad9738af1f6a18649570967c43f4819e89d9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 12:07:24 +00:00
TreeHugger Robot
2f2163ee02
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
am: 143f6aeb43
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I06930be8adbd6b67b20b2ddc83db0abdf1d73ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:48:23 +00:00
Treehugger Robot
f7210aa079
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
am: 9e1c1ecca5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: If5c83bd412be1309c427efcd6e16034fcc71a007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:48:13 +00:00
Menghan Li
54492ea2fc
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
am: e9427458a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I37d13a846f66ff642eaf72808bbb27824087eb5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:47:07 +00:00
TreeHugger Robot
88ef9a6791
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
am: 795f3d2d09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: If02a094c1f38fca2e8b5a9c9a5ee36e1fce7c57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:45:44 +00:00
TreeHugger Robot
7b102e8288
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
am: 29d3ac3432
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I4fc4dd51e69ebc7217af23e4b80b25e0b008eedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:33:40 +00:00
Treehugger Robot
def9272d43
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
am: 4789bda4c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: Ied13ceb8431e577458cc3da16bf7b99ea1f3ca24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:30:01 +00:00
TreeHugger Robot
143f6aeb43
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: I193bbf41ec079e0266357de47661e083594d3fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:29:05 +00:00
TreeHugger Robot
29d3ac3432
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: Ib0f3fe11381620d4f699e1d622f1a095f5510aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:28:53 +00:00
TreeHugger Robot
ffb6adb9e6
Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afda6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739
Change-Id: Ia3b6ce10e3db8a9a04c43251e96468fbb6dbde05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:28:41 +00:00
Automerger Merge Worker
9161f018e5
Merge "Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
am: c3eebfe67e"
2023-04-27 11:28:37 +00:00
Treehugger Robot
118a51ad6d
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: I6a566a5438d02e0600465072e971b2c0ea4a28ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:27:47 +00:00
TreeHugger Robot
9bc7d31a4c
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
am: d56c097761
am: 4903c6f42f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I0009d62b5b81d1f30cf576b3f90833c287b71237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:26:40 +00:00
Zoey Chen
778f48f7c1
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
am: 05d70bb710
am: 680f91b58d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: I9234588a0b3bd1eeabff04b1b7af513327a32d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:26:26 +00:00
Zoey Chen
be6c61b7fe
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
am: b306c4dd5b
am: 334438399d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: Ib62d652876390bb59fc00ffb74d415b85c3f2fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:25:10 +00:00
Menghan Li
a874c9c061
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
am: c3eebfe67e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I61faab0bfa93def4f3171bbc233b477c7b764516
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:25:00 +00:00
Menghan Li
cd4c0f15a8
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I85ac1c91d02661c77259fdb54d1e8c23a79971dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:24:35 +00:00
TreeHugger Robot
d3897afda6
Merge "Change drop down strings to "View by ..."" into udc-dev
2023-04-27 11:12:45 +00:00
Treehugger Robot
9e1c1ecca5
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: Icf963af6f2d5a931b678226970cde5701edb19fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:10:16 +00:00
Menghan Li
e9427458a9
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: Iaf75b768f12728be4d6d249dd9f26ed0efeaa21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:10:01 +00:00
Treehugger Robot
4789bda4c3
Merge "[Regional Preferences]] Update the string of header" into udc-dev am: d12716bb12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905740
Change-Id: Id47e3ab9934ca0c129340602ddad6e8b8c92c51f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:09:09 +00:00
TreeHugger Robot
795f3d2d09
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I61fa48523f8462a156b13d63d14035edd1dc4c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:08:50 +00:00
Menghan Li
c3eebfe67e
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev am: 0e32500259
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891105
Change-Id: I3c97a4ec9962406e030747934f7b2895387a5cd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:07:44 +00:00
TreeHugger Robot
8f596bd365
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
am: 1dd46754ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: Ife766cf2ad98b511f274a47058776dc5527b89c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:04:16 +00:00
Zoey Chen
8a7883299e
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
am: 4831aff1fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: Ib716861a6294f4ae978dd8ced9870503ca9bcade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 11:03:59 +00:00
Treehugger Robot
d12716bb12
Merge "[Regional Preferences]] Update the string of header" into udc-dev
2023-04-27 11:02:53 +00:00
Menghan Li
0e32500259
Merge "Fix "Open <a11y service> " starts from end for RTL language" into udc-dev
2023-04-27 10:57:17 +00:00
Milton Wu
1205ba58de
[BiometricsV2] Fix fingerprint 2nd enroll fail
...
Enrolling fragments wait cancelled msg then finish itself when user
presses skip button in this page
Bug: 279540275
Test: atest FingerprintEnrollmentActivityTest
Test: For udfps and sfps devices, manually click "Add fingerprint" from
Fingerprint Settings, then quickly back, and quickly re-enter.
Make sure the re-entered enrolling works well.
Change-Id: I99b67af31234f7332ad33e776e82d04ece117e5e
2023-04-27 10:52:01 +00:00
TreeHugger Robot
4903c6f42f
Merge "Update battery saver footer string" into udc-dev am: f566e6de2f
am: d56c097761
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901659
Change-Id: I2b444c88f6f92e7b6bc93704729d8ab38801fd72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:48:18 +00:00
Zoey Chen
680f91b58d
Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
am: 05d70bb710
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101
Change-Id: I73963128d9cf4324bebf1d8386080a14191f476c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-27 10:48:05 +00:00