Commit Graph

125585 Commits

Author SHA1 Message Date
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
Zoey Chen
334438399d Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a am: b306c4dd5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I89e4b3df4320d26801a35d67e0e3229cb851053a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:43:49 +00:00
TreeHugger Robot
d56c097761 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: I4ecd02f3c208395b88ab55d0adb58de1381d7f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:42:42 +00:00
TreeHugger Robot
1dd46754ea 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: I0eb9118e28e66c8663dbde3915e321db9c166214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:36:52 +00:00
Automerger Merge Worker
a614d10620 Merge "Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99" into udc-d1-dev-plus-aosp am: 9199f72284
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: I39811dc547cb31aa57012fccdeb52b0d535c5a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:31:25 +00:00
TreeHugger Robot
f566e6de2f Merge "Update battery saver footer string" into udc-dev 2023-04-27 10:29:25 +00:00
Edgar Wang
b6a3076b1f Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: 3b9432dad2 am: 4a874fb50f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: Iea368972644552215b508f8bf69b6ec774aeea15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:28:40 +00:00
Edgar Wang
4cf60b02b2 Fix test cases failed in WinscopeTraceTest
Fixes: 276682211
Test: autotest
Change-Id: Id31d5c4e2e1dd61c4af24e042f4aaddee3d33439
2023-04-27 10:22:29 +00:00
Treehugger Robot
a6f0662924 Merge "[Settings] Update code owner" am: 709b27384b am: c40b06b687
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2527125

Change-Id: I5390a0b64018dbeb74a79f81b94ff7a47712106a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:21:35 +00:00
Zoey Chen
4831aff1fb Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I1dbd6067723e33952369c0268847ba68f286427c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:21:01 +00:00
Zoey Chen
05d70bb710 Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: I1a2de67059623153f925386f410075aedae934bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:21:01 +00:00
Zoey Chen
b306c4dd5b Merge "Fix AppEntry.extraInfo ClassCastException" into udc-dev am: bee241bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22891101

Change-Id: Id9c1c34ea8496bb36512740efa81903af455154f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:06:36 +00:00
Automerger Merge Worker
9199f72284 Merge "Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99" into udc-d1-dev-plus-aosp 2023-04-27 09:48:32 +00:00
Edgar Wang
3996c46ec2 Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f8278dcd99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: Ibdbc9cf2a3fce33f8dbe73a4cca1b7afb1eafac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:46:50 +00:00
Edgar Wang
4a874fb50f Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: 3b9432dad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: I47ca8520fd1da0142f733a1de62e0ecbfd773750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 09:44:55 +00:00
Zoey Chen
c9994c0a54 [Regional Preferences]] Update the string of header
Bug: 279549042
Test: local test
Change-Id: I4983618c91f0e5ea83c4095491be7bb4433f6d2b
2023-04-27 09:44:17 +00:00