PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,365 Commits 1 Branch 0 Tags
a0524e53ad01c41e6b768113a56406ba29ec306f
Commit Graph

102365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
5729190b77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours am: e68d843167 -s ours 
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2045919

Change-Id: I1d32837fd68effe1470001964dd08c8a4463dfd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:46:07 +00:00
TreeHugger Robot
2e4f458627 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289

Change-Id: I137bd8e32d90c1bb3691d53633fe9e86cf2562a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:58 +00:00
Bill Yi
f0886d920c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422289

Change-Id: I84bf0cdc0c3d2fef27883a04efc2944be2e6044e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:56 +00:00
TreeHugger Robot
e5091256f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152

Change-Id: I64ca7d3f6fc6d9e3668f0a08d3fd1f58f9a79d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:30 +00:00
Bill Yi
78bfe2c604 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17422152

Change-Id: I2bae1da3c62063d6ae7544cb863a8d34952252fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:38:28 +00:00
Peter Wang
886b22a7a6 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours 
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 6879183335 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400637

Change-Id: I3555813a6c257b9a084febc50b50ebd0936df3e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 15:09:30 +00:00
Sarah Chin
4448b772ed [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours am: a0ddaeb7c3 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: Id49e4bb1a16d03d5dc531f9fb304cbcc1707aa5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:51:37 +00:00
Sarah Chin
eae173e823 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: I7f995b09dcdab990964ce9e56946d468c400c88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:42:47 +00:00
Sarah Chin
a0ddaeb7c3 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours am: a8312161c7 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: I861481b35d5bfba7c6052b83901a1620e3b12a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:41:09 +00:00
Sarah Chin
a8312161c7 [automerger skipped] Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 am: 61ec9b6d70 -s ours 
am skip reason: Merged-In I800b26c0eed8243a5f1c5ae8b7c42d1f9cfdb205 with SHA-1 e28eaa725d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: Ic6ca95a4fb388ef93b63135e7064932406eec83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 14:22:52 +00:00
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
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