Chaohui Wang
1f5d847176
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab44e
am: 19e3f06952
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182
Change-Id: Ifddbc4cf3da568d8d8182aef046cc40eb1595e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 11:17:43 +00:00
Kholoud Mohamed
a95a9154fa
Merge "RESTRICT AUTOMERGE Refactor device policy resource APIs to a separate class"
2022-03-29 11:01:21 +00:00
Chaohui Wang
19e3f06952
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab44e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182
Change-Id: I70f5a1bf1039685b7602c8378d60bc3d6570e0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 10:53:03 +00:00
Chaohui Wang
f86a15362a
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab44e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182
Change-Id: Ifb118af9849109abb3ec164716eed903ef6957a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 10:52:53 +00:00
Chaohui Wang
b94c0ab44e
Merge "Fix "Automatically sync app data" button state not changed" into tm-dev
2022-03-29 10:36:31 +00:00
Josh Hou
57af174e45
Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile"
2022-03-29 08:48:00 +00:00
TreeHugger Robot
c70563fe76
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev am: 670016a2ee
am: 70155c7ebc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17379163
Change-Id: I4b603da2efe80692e4e749e97df10a378c5f039a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 07:26:24 +00:00
TreeHugger Robot
70155c7ebc
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev am: 670016a2ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17379163
Change-Id: I7d9a450f5047ce720dad26dad84fba25113da720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 07:03:57 +00:00
TreeHugger Robot
0efaf46546
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev am: 670016a2ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17379163
Change-Id: I3c032ade902dac1b30bdff1f0a029a9fc382af41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 07:03:34 +00:00
TreeHugger Robot
670016a2ee
Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev
2022-03-29 06:33:46 +00:00
Bonian Chen
e239efd363
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev am: 3df6924591
am: c676cbcaf3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286345
Change-Id: Ib870545b686efe163452cf91352ec96b81e0f1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 05:21:33 +00:00
Bonian Chen
c676cbcaf3
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev am: 3df6924591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286345
Change-Id: Id614300db4c1c1555bd963c0281b7ebb82b4a153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 05:06:22 +00:00
Bonian Chen
662409a0d4
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev am: 3df6924591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17286345
Change-Id: If5c1121da24d311acc65a779c9bd14556cb69c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 05:06:10 +00:00
Bonian Chen
3df6924591
Merge "[Settings] Code refactor - NetworkModePreference" into tm-dev
2022-03-29 04:50:20 +00:00
Chaohui Wang
9d8603568d
Fix "Automatically sync app data" button state not changed
...
This issue is caused by mPreference is null.
(Not recovered when the fragment is recreated after configuration change.)
Mimic the PreferenceDialogFragmentCompat.getPreference() in AndroidX to
solve this issue.
https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:preference/preference/src/main/java/androidx/preference/PreferenceDialogFragmentCompat.java;l=176;drc=ca9feb3b73769089afbfd36b4d4a3d91239f9cd5
Ideally in the long term, we could use PreferenceDialogFragmentCompat
instead.
Fix: 218754949
Test: robotest & manual
Change-Id: I7fc8dd3b771aa45c91f915e25c8cc6c6afdd8d63
2022-03-29 12:32:23 +08:00
Josh Hou
3550064e2e
[Panlingual] Fix the app language is shown incorrectly in the work profile
...
The root cause is that the context corresponding to the specified
profile Id is not correctly used when using LocaleManager to query the
app language.
Bug: 222769707
Test: Verify the issue by using the steps provided in the bug
Change-Id: Ic1f9e4cc9e90f5aecfa5e1094184aa63f3d94ffb
2022-03-29 12:00:13 +08:00
Bill Yi
b387657974
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I153402b8f77ce5d15360ede6ce234a994bcf7410
2022-03-29 03:35:53 +00:00
Tom Hsu
9541f70a80
Merge "[Panlingual] Improve and refactor revamped UI"
2022-03-29 03:34:31 +00:00
Bill Yi
ac9baaee08
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8140f108bb0c0d00ba08b1fccab4b6fc9376d4dc
2022-03-29 03:00:30 +00:00
Grace Cheng
0e7f6a45c6
Merge "Hide fingerprint setup animation from talkback users" into tm-dev am: 14ffe2a2ef
am: a9318375ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126
Change-Id: Iff050c2c00931e4b64932c5a95cbff9d34e6e4e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:07:00 +00:00
Grace Cheng
98e521ba9c
Merge changes from topic "presubmit-am-329e8f4e07b8433d90ca6850e1be95f1" into tm-mainline-prod am: d17e49853f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126
Change-Id: I53c832dc5bea28f3eea01e291f1776aaeae84491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:06:44 +00:00
Grace Cheng
a9318375ea
Merge "Hide fingerprint setup animation from talkback users" into tm-dev am: 14ffe2a2ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126
Change-Id: Ia3f04dd73d8cc96ee51a492a756d020ce0761a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:06:24 +00:00
Grace Cheng
3316ed1f70
Merge "Hide fingerprint setup animation from talkback users" into tm-dev am: 14ffe2a2ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17414126
Change-Id: I322b33ddb27e4d27c23e168e5a51df73756ca9bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-29 00:06:10 +00:00
Grace Cheng
14ffe2a2ef
Merge "Hide fingerprint setup animation from talkback users" into tm-dev
2022-03-28 23:47:06 +00:00
Grace Cheng
d17e49853f
Merge changes from topic "presubmit-am-329e8f4e07b8433d90ca6850e1be95f1" into tm-mainline-prod
...
* changes:
[automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2
Hide fingerprint setup animation from talkback users
2022-03-28 23:47:06 +00:00
Grace Cheng
aa13b51222
Merge changes from topic "presubmit-am-329e8f4e07b8433d90ca6850e1be95f1"
...
* changes:
[automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2
2p: d8ae83d3d3
[automerge] Hide fingerprint setup animation from talkback users 2p: 404ed2b0b2
Hide fingerprint setup animation from talkback users
2022-03-28 23:47:06 +00:00
Kevin Han
3cfc87cc05
Update hibernation toggle title to have "if unused"
...
As per UX request, update the toggle title to say "Pause app activity if
unused" and remove "if unused" from the summary.
Bug: 227235454
Test: manual
Change-Id: I9c80f801fcd9bc29660705a7ea4dee0086739c81
2022-03-28 14:47:29 -07:00
TreeHugger Robot
49241c4797
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d
-s ours am: 4a926629e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178
Change-Id: I9d76a0590c9721e38d0dcc4552bbcf465ac87323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:38:06 +00:00
TreeHugger Robot
4a926629e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178
Change-Id: I72344a0005c60e1eb94b7e9c572d96c1ef0602dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:32:07 +00:00
TreeHugger Robot
1098e80d27
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 09b761700d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178
Change-Id: Ifae4927b645d2cb6850e4a3df4d692d2945158cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:32:02 +00:00
TreeHugger Robot
4d87a40a2e
Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68" into tm-mainline-prod am: 8cf398f54c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17416178
Change-Id: Ia57704f0a5ffe19d88fa8acc3aaf6054dbb6076a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:24:40 +00:00
TreeHugger Robot
2992165ee3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: daef9fa397
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17407842
Change-Id: I12d85ea178a2ef5005f6b5f61b497b88c2cbac69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 19:23:42 +00:00
TreeHugger Robot
09b761700d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-03-28 19:07:49 +00:00
TreeHugger Robot
8cf398f54c
Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68" into tm-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
Import translations. DO NOT MERGE ANYWHERE
2022-03-28 19:07:49 +00:00
TreeHugger Robot
6d3031f99d
Merge changes from topic "presubmit-am-00d12da97c5e43b2a01259c930b2cf68"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
2p: af27e56740
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9d49da2eab
Import translations. DO NOT MERGE ANYWHERE
2022-03-28 19:07:49 +00:00
TreeHugger Robot
daef9fa397
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-03-28 18:56:52 +00:00
TreeHugger Robot
83277399ac
Merge changes from topic "presubmit-am-3dfc11e67f034df8bec0f0cb5665ba32"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: c0a1868fbd
Import translations. DO NOT MERGE ANYWHERE
2022-03-28 18:56:52 +00:00
Ronish Kalia
bb75ff2158
Merge "Update settings strings as per UXR"
2022-03-28 15:49:52 +00:00
ronish
9a91a86aba
Update settings strings as per UXR
...
Change-Id: Iccac0c658b4a7552e4f4a6ff78693bcdd344c318
2022-03-28 11:58:14 +00:00
Yi-Ling Chuang
0bf3ed99eb
Fix flickers on the Location page
...
Use the UiBlocker and its delegate method to prevent the flicker.
Fixes: 220837804
Test: Go to Settings > Location and see all items appearing at the same
time.
Change-Id: I2095289b9436ca66970b6a868d5c9780f2b19664
2022-03-28 17:27:34 +08:00
TreeHugger Robot
41557ecc36
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
am: 23c2c3da41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177
Change-Id: I1d8345ab2cb5846a7d2445280f64eefabd6e0eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 09:15:28 +00:00
Giulio Fiscella
decb701e7b
Merge "Use migrated severity levels" into tm-dev am: a493ed6f75
am: 918ae23a07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Change-Id: Ie1a1e5cdc00ab6af0f444464e58cefda58dd3740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 09:15:20 +00:00
tom hsu
ded10f8e24
[Panlingual] Improve and refactor revamped UI
...
- Remove useless file
- Make Icon be able to scroll up and down
Bug: 226350483
Test: local test
Change-Id: I4564f432143e7e31ba5beff1dd32d7bc7764f9bf
2022-03-28 17:13:04 +08:00
TreeHugger Robot
23c2c3da41
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177
Change-Id: I19e0a83052b44b6a0c09acaac2dc714477846995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:40 +00:00
TreeHugger Robot
e5cb2a170a
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev am: 5fd1f8fe4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397177
Change-Id: I80be1a5786880a4b85ccad6b3444675d9e3cf026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:35 +00:00
Giulio Fiscella
918ae23a07
Merge "Use migrated severity levels" into tm-dev am: a493ed6f75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Change-Id: Idf5621c4b257ef7f823e4dc072ca7e416d53ff5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:33 +00:00
Giulio Fiscella
16c4c3ead1
Merge "Use migrated severity levels" into tm-dev am: a493ed6f75
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Change-Id: I9cb06c36b2e9effb40e94f426a23c81aa298c055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:59:26 +00:00
TreeHugger Robot
5fd1f8fe4e
Merge "Restrict secondary users to share Wi-Fi network" into tm-dev
2022-03-28 08:43:23 +00:00
Giulio Fiscella
a834645b92
Merge changes from topic "scAPItm" into tm-mainline-prod am: 7aa25402d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17384684
Change-Id: I3f6d2e644b49d54773de03ee22f88393d8c79bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-28 08:42:04 +00:00
Giulio Fiscella
7aa25402d2
Merge changes from topic "scAPItm" into tm-mainline-prod
...
* changes:
[automerge] Use migrated severity levels 2p: 2a775c69fc
Use migrated severity levels
2022-03-28 08:38:47 +00:00