PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,471 Commits 1 Branch 0 Tags
0166aae999575ca82b80694798516a391468e8bb
Commit Graph

101471 Commits

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

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

Change-Id: I9788d84a57eefdd8794e1af790cdc78821a40b7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:28 +00:00
TreeHugger Robot
d8ef930b69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -s ours am: 0e536d93b5 -s ours am: 2e4f458627 -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: I2bfabd4b816f1ea2891992e3aa08efc3a09b66fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:20 +00:00
Bill Yi
f3b2661db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -s ours am: cc3a93e23b -s ours am: f0886d920c -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: I14c3dec853939107738e8e6cb8f1ff2687c04026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:19 +00:00
TreeHugger Robot
c28707b38e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -s ours am: 2703c29227 -s ours am: e5091256f4 -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: I72f30a7906c9145b8b3632ad1a00c25d8e191c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:13 +00:00
Bill Yi
fd71e4b975 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -s ours am: 620782b9d4 -s ours am: 78bfe2c604 -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: If6852a1ac855e2f46c002e902f2f4cdc4b4e8c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:09:11 +00:00
Peter Wang
c7e49878b8 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -s ours am: 4f5dbc4db4 -s ours am: 886b22a7a6 -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: I43a678f4b949e1c864a2b5f8e3a85e71d36e6e9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 16:08:54 +00:00
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
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
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
b94c0ab44e Merge "Fix "Automatically sync app data" button state not changed" into tm-dev 2022-03-29 10:36:31 +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
670016a2ee Merge "[LeAudio] Remove the QrCamera and decorateView in Settings" into tm-dev 2022-03-29 06:33:46 +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
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
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
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
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
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
daef9fa397 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-03-28 18:56:52 +00: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
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
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
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
Giulio Fiscella
a493ed6f75 Merge "Use migrated severity levels" into tm-dev 2022-03-28 08:38:47 +00:00
TreeHugger Robot
367cfd4fc3 Merge "Rename the wording for "Wallpaper" under About" into tm-dev am: 32ac672ea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Ib778211b70d66ef936a03f4c83cd5fba66fa7156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 08:33:47 +00:00
TreeHugger Robot
32ac672ea5 Merge "Rename the wording for "Wallpaper" under About" into tm-dev 2022-03-28 08:07:03 +00:00
TreeHugger Robot
5eef5f7c0e Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073" into tm-mainline-prod 
* changes:
  [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2
  Rename the wording for "Wallpaper" under About
 2022-03-28 08:07:03 +00:00
Menghan Li
988ff40ec2 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586

Change-Id: Id7492a2d81b64929ae6b1ec4d1ea4f8135212b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 07:06:38 +00:00
Bill Yi
e68d843167 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours am: b28c27e68e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id571c60c7cf39d4f4327e67e692e1fe6ad73bae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 07:01:18 +00:00
TreeHugger Robot
0e536d93b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 97539de67e -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: Icd818627964fd287182375db9e2e91789a885c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:51:36 +00:00
Bill Yi
cc3a93e23b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4b50ee2d6 -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: I977992bbe1a5875e6827128bb3495afee8d71a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:51:34 +00:00
TreeHugger Robot
2703c29227 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4d9878828e -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: I3a2febfb3742ac359a86226e0f1cc6a964ec8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:45:06 +00:00
Bill Yi
620782b9d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9e58dde841 -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: Iabad895ae533c8779bc8bc3f9330a520fae7f967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:44:52 +00:00
Bill Yi
b28c27e68e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 62dc714628 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I031a74875cddf5b00bebfbf1d23b5afc9c1fe7b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 06:43:25 +00:00
Menghan Li
c122879474 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev 2022-03-28 06:43:20 +00:00
TreeHugger Robot
97539de67e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-03-28 06:27:30 +00:00
TreeHugger Robot
4d9878828e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-03-28 06:20:17 +00:00
Peter Wang
4f5dbc4db4 [automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 0ab2226dff -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: I9f9a7264dd55407f429898be56a08f7b3682eea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 05:32:04 +00:00
Peter Wang
0ab2226dff Add a cancel string for ToggleSubscriptionDialog to handle Tamil 
translation

Bug: 185553806
Test: Build
Change-Id: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
Merged-In: I90149c9e4459747d8cd1c35d00c29f81710eb6f4
(cherry picked from commit 6879183335)
 2022-03-28 05:21:36 +00:00
Sarah Chin
61ec9b6d70 Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a am: 9b9c5f2f93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: Ic9802f7cfe88ea35afc0209fceb7666e6ee8b9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 05:17:02 +00:00
Sarah Chin
9b9c5f2f93 Merge "[MEP] Use switchToSub API with pending intent" am: 1abef7542a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043029

Change-Id: I66f96ad433720d92b3c8b0906c4fca1409d281ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 05:11:25 +00:00