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

102242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Giulio Fiscella
a493ed6f75 Merge "Use migrated severity levels" into tm-dev 2022-03-28 08:38:47 +00:00
Giulio Fiscella
362f0abf6d Merge changes from topic "scAPItm" 
* changes:
  [automerge] Use migrated severity levels 2p: 2a775c69fc 2p: b5446ce437
  [automerge] Use migrated severity levels 2p: 2a775c69fc
  Use migrated severity levels
 2022-03-28 08:38:47 +00:00
TreeHugger Robot
6b1148faec Merge "Rename the wording for "Wallpaper" under About" into tm-dev am: 32ac672ea5 am: 367cfd4fc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Iebd674696c3e0b8b37e1eada5fea2cb95844575a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 08:36:17 +00:00
TreeHugger Robot
b39ae8cdfa Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073" into tm-mainline-prod am: 5eef5f7c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: I3056764eee6883d5af594fd9f984e2ca61421589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 08:35:24 +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
0d2a6a6f45 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: I11a640d463be4591ecd1f8814e3d0909d411f035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 08:33:26 +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
TreeHugger Robot
bfba7b5cc4 Merge changes from topic "presubmit-am-4ee42228d6fc407e80556e83c7adc073" 
* changes:
  [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2 2p: 0427d13d07
  [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
e8b6546410 Merge "Fix Caption preview SubtitleView textSize cannot update correctly" into tm-dev am: c122879474 am: 988ff40ec2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348586

Change-Id: Iba76f62d7a67366c4f48ef2cb0bed79b92a6dbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 07:25:24 +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
Menghan Li
7325d18d30 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: I3e7576cc35c3088957d2976726c14971bf9defe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-28 07:06: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
menghanli
917ab11ed1 Fix Caption preview SubtitleView textSize cannot update correctly 
Root caue: When received #OnLayoutChangeListener callback, the mPainText size keeps "zero" after called setTextSize() because the requestLayout() does not trigger the whole view re-measure & re-layout in not ui thread.
Solution: Post #refreshPreviewText to ui thread to get correct bounds to
measure & layout.

Bug: 223696269
Bug: 211178478
Test: Manually test
Change-Id: Idcbeba52876171e5f3641eafc77d203764c78788
 2022-03-28 12:30:29 +08:00
Tsung-Mao Fang
6de0d49560 [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2 2p: 0427d13d07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Ic02af877f65a79d9527803c824c0360b28fc7af3
 2022-03-28 02:51:50 +00:00
Tsung-Mao Fang
0427d13d07 [automerge] Rename the wording for "Wallpaper" under About 2p: 4b27f24ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17233884

Change-Id: Ia41ecd508fe1ec6bfb3cc0fa215664e94b2477fc
 2022-03-28 02:51:43 +00:00
Tsung-Mao Fang
4b27f24ab2 Rename the wording for "Wallpaper" under About 
In order to improve the order in the search result
between "Wallpapers attributions" and "Wallpaper & style",
We should rename the wording here, and I think "Wallpaper"
is confused under About page.

Test: See the order in the search result list.
Fix: 201359802
Change-Id: I2b50703a7e4bbffd0649a60f7bc2c463f6877fba
 2022-03-28 02:51:33 +00:00
SongFerng Wang
5b338ca156 [automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 am: b9cd3f7ef9 am: 53f68b7f27 -s ours am: 3beb209f1f -s ours am: bb374dc257 -s ours 
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c is already in history

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

Change-Id: I359db04ff56907e15a78065a44ebac7fa4cf59b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:31 +00:00
SongFerngWang
a3dd677e01 [automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69 am: 2eb57839c6 -s ours am: 1b62ca1267 -s ours am: 9c5332be3d -s ours 
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3 is already in history

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

Change-Id: Ibc6f557d4ccb82557a292adca2c3ec3807e02fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:30 +00:00
SongFerngWang
1251e223a7 [automerger skipped] [MEP] renew the default data selection UI am: db2ddb6a92 am: e9d39b468d am: 696f538ff3 -s ours am: e6d9e910d9 -s ours am: 9e202e028e -s ours 
am skip reason: Merged-In I5c6ad4b35d38112d5e88330a3fc9638be533bc94 with SHA-1 be8f279f2c is already in history

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

Change-Id: I8eb418e619e857ea6dae0b9cddca429c610ad37a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:29 +00:00
SongFerngWang
acfec73fd8 [automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2 am: b29d670c71 am: 0453d9de8d -s ours am: a579616596 -s ours am: 695fef0c00 -s ours 
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420 is already in history

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

Change-Id: Iccb0814e00395600fc7766f63ddc302bad47cec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:27 +00:00
SongFerngWang
8a69caaf18 [automerger skipped] switch SIM refactor to support MEP am: 37358798bc am: 483ff27a47 am: 57fbdab22d -s ours am: 7ae4b284b0 -s ours am: 16274d2eaf -s ours 
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac is already in history

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

Change-Id: I49323b943c2a4b45de4b518fb1f1868de2a616d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:26 +00:00
changbetty
21c5e714c2 [automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e am: 4b3a17619e -s ours am: 606c1b0aaa -s ours am: ce1ba949c4 -s ours 
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d is already in history

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

Change-Id: Iafd1a971bcdfec0a28aeec11acac37b58c522f19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 16:11:25 +00:00
SongFerng Wang
bb374dc257 [automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 am: b9cd3f7ef9 am: 53f68b7f27 -s ours am: 3beb209f1f -s ours 
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c is already in history

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

Change-Id: Ief56f5117943433ef098d7d94b7b102d165255be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:40 +00:00
SongFerngWang
9c5332be3d [automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69 am: 2eb57839c6 -s ours am: 1b62ca1267 -s ours 
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3 is already in history

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

Change-Id: I45e9ababae56f79c5ab12e744e51e70a1aa3364b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:38 +00:00
SongFerngWang
9e202e028e [automerger skipped] [MEP] renew the default data selection UI am: db2ddb6a92 am: e9d39b468d am: 696f538ff3 -s ours am: e6d9e910d9 -s ours 
am skip reason: Merged-In I5c6ad4b35d38112d5e88330a3fc9638be533bc94 with SHA-1 be8f279f2c is already in history

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

Change-Id: I13c809c86c5c724e9157f86f492aac8bc0c43da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:37 +00:00
SongFerngWang
695fef0c00 [automerger skipped] switch SIM refactor to support MEP am: 59a6ecbde2 am: b29d670c71 am: 0453d9de8d -s ours am: a579616596 -s ours 
am skip reason: Merged-In Ief4299e775c0758e4b886d5eff13bd482f8c8ab3 with SHA-1 22ab05b420 is already in history

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

Change-Id: I33345358d241c3f928c2acad799e74c8a7355532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:36 +00:00
SongFerngWang
16274d2eaf [automerger skipped] switch SIM refactor to support MEP am: 37358798bc am: 483ff27a47 am: 57fbdab22d -s ours am: 7ae4b284b0 -s ours 
am skip reason: Merged-In I8580022793e5c3fc14159f14b406f864353477f8 with SHA-1 1e0e9021ac is already in history

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

Change-Id: I29e24837dcafa6027bae17905ad0392e89ffbecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:35 +00:00
changbetty
ce1ba949c4 [automerger skipped] Support RTL mode in Sim switch dialog am: 562cc5ed45 am: 342fe3487e am: 4b3a17619e -s ours am: 606c1b0aaa -s ours 
am skip reason: Merged-In I89bf58dfd0c0019799b9062eba5f6318dfc9fe1a with SHA-1 59d5b47f6d is already in history

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

Change-Id: I8e3d2800a8d361ea84fdb332675dde6d083361df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:34 +00:00
SongFerng Wang
c52a160183 [automerger skipped] Merge changes Iee650897,Icb00b3fc,I5c6ad4b3,Ief4299e7,I85800227, ... am: 31c40b00e7 am: b9cd3f7ef9 am: 53f68b7f27 -s ours am: 3beb209f1f -s ours 
am skip reason: Merged-In Iee650897b81c96b5febb0413649629b1a1971b18 with SHA-1 bf148dea7c is already in history

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

Change-Id: I3c31ba7a05885cb49e0d54b49df56584dce2c00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:33 +00:00
SongFerngWang
6569a9a89b [automerger skipped] [MEP] renew the sim confirm dialog UI am: ba9d26696b am: 04424bbf69 am: 2eb57839c6 -s ours am: 1b62ca1267 -s ours 
am skip reason: Merged-In Icb00b3fc32066e21d22cbeca1fdf50e5d7dbef20 with SHA-1 4780be49f3 is already in history

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

Change-Id: Id8663e6f927684e8cf3bc7e871ac4392d0a0409d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-27 15:54:32 +00:00