PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,426 Commits 1 Branch 0 Tags
3fe4babf134f44186a51279d15ce8b3427ac77c6
Commit Graph

105426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
3fe4babf13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours am: 08462bff56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82e27fa1eb240a3eec17e941e57a4bdb7aefea65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:17 +00:00
Chaohui Wang
bf393a9ac0 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 849dba46a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I7a069a4c0cf6a752c5391b70917718cb2f618dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:44:58 +00:00
Automerger Merge Worker
429768bf64 Merge "Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518" into tm-qpr-dev-plus-aosp 2022-05-21 02:44:48 +00:00
Chaohui Wang
1dcd81b7b8 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I9e578817811d5740d4372ac8b70b5137b7758b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:44:45 +00:00
Chaohui Wang
3fdd89556e Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I98d0c3ab385539d258baad72beb048aa0c563e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:44:42 +00:00
Bill Yi
08462bff56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1e2c966de5184a95caf8dd27e096b0c63bdb0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:41 +00:00
Chaohui Wang
849dba46a3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: If64e9a2f5e885f90b949485a781f8dd6459a0984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:38 +00:00
Chaohui Wang
456a27bee3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I3b9ae5d0e02db28f8965d158d97937b8b2603433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:32 +00:00
Chaohui Wang
52507eb518 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I54efb9201eb76f49297a86ce9aac430c2fbd7989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:27 +00:00
Bill Yi
b13cc8ca4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11f86d958b411818eb7a549bf0bf6d783c564943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:19:10 +00:00
Chaohui Wang
f61254af3c Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I59fbcd9e9646f2a7fab8fd0410768b08b06f6512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:10:18 +00:00
Chaohui Wang
0d6569d199 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I911dc4f729e7d6eeb0fda8b12f16d8a153cb6bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:08:39 +00:00
Chaohui Wang
0dc89bc85c Merge "Fix Conversation page flickers when back" into tm-dev 2022-05-21 01:54:27 +00:00
Edgar Wang
739b6fd20d Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 42704ba27c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I4fc4f187592b0f904f65cc892554371493e339ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:20:17 +00:00
Edgar Wang
0d56428610 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 2e995ee697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Ib1015a217770a3412ab914146686a5816162e40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:06:23 +00:00
Edgar Wang
b9a06a9f34 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I2f7ce317b7bb9d355fbb1e5f0fc2aacb1da7f8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:02:22 +00:00
Edgar Wang
2e995ee697 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I8687407c4c7c99015bc38818b9a1beb681a3e1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:52:50 +00:00
Edgar Wang
42704ba27c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I70547c9094cdd200f1fa2a77272affbcbe308a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:52:43 +00:00
Edgar Wang
21ddf79998 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: If0fba8bf4c69645bf8cc6a153580ed7cda57610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:51:54 +00:00
Edgar Wang
4d371adf7f Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Id0599efcfd1a61b12e4e759afb76259f14fdd5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:25:32 +00:00
Edgar Wang
eaa0a1cf5c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I10a24e8723d555c9bf81ee0efff9dea9d56bf736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:24:36 +00:00
Edgar Wang
24654a3d61 Merge "Update learn more string of FooterPrefernce" into tm-dev 2022-05-20 23:13:07 +00:00
TreeHugger Robot
682a02b687 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 5416a4fd6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Icdad28a060f07d8f72ecd223660c3cb69ece05ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:54:51 +00:00
TreeHugger Robot
658b54b03a Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab am: ef922caf2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I7b05ff873e5cb265f45fb5de899920298cb48e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:54:32 +00:00
TreeHugger Robot
8734e549a0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 12cc3aeae0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ib2aafb5ccca14534c30a6d3b555bc9fdec8e9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:54:16 +00:00
TreeHugger Robot
5416a4fd6e Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I0c68a4f31552bff5a134c52e86dda61dcc000e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:33:53 +00:00
TreeHugger Robot
12cc3aeae0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I468f2cce8f5d67055addc01ef4749b1cf98b5896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:33:43 +00:00
TreeHugger Robot
ef922caf2e Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I72bbadfe8be1d2710704dc5c85d54c0d7d6ff6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:24:51 +00:00
TreeHugger Robot
f36d767679 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I2a4e530320564961901f96af333e47dd019aa226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:14:12 +00:00
TreeHugger Robot
96d31478ab Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ife6c05fc69d672a15d1bbbb8e06ba87e2f3a3ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 18:58:15 +00:00
Bill Yi
26be41c615 Import translations. DO NOT MERGE ANYWHERE 
BUG:233360920

Auto-generated-cl: translation import
Change-Id: I264f7b7815e65b65892d9bdf62b7748ac392efaf
 2022-05-20 18:28:22 +00:00
TreeHugger Robot
baa2c48575 Merge "Filter out the duplicate click event on menu page" into tm-dev 2022-05-20 18:18:58 +00:00
Hank Sheng
96b8ee8b2e Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 3935ea32fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I59bb6be1f33846b51a6752c1c63905da6f58408b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:23:36 +00:00
Hank Sheng
a64a7640ff Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce am: 033a744c95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Ia2a268a3d266a8c91149086a493b63d1565da622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:23:17 +00:00
Hank Sheng
ac59647901 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 9fb34ae376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Ib2ecd69665ad7e35c7f8c15823388e9ad75d721f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:22:38 +00:00
Hank Sheng
3935ea32fd Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I3c8a6a744c33d87f976536717d8d49f3bbf59ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:06:56 +00:00
Hank Sheng
033a744c95 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Iac318ff0b836ac2148c1c08f28298655f8596fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:06:50 +00:00
Hank Sheng
9fb34ae376 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I4aa2af07a568f4a67e47d52959f74004f4c8990c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:06:48 +00:00
Hank Sheng
37c36d0c63 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I155d06cf2e6c0adf93426d35075b8ebeb71b84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:49:13 +00:00
Hank Sheng
434e728bce Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I11fd085f1798f2ebaab2b14951716038379e2848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:47:41 +00:00
Hank Sheng
841964c02b Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev 2022-05-20 16:27:56 +00:00
Jason Chiu
e04dfaa29e Filter out the duplicate click event on menu page 
Whenever the highlighted item is clicked, Settings shouldn't start the
second-layer page again even if the user goes to its child page.
Ex. When the user goes to the Tethering page, clicking on the menu
entry "Network & Internet" should not switch to the page.

Exception: in the deep link case, allow the first click event on the
highlighted item to launch the second-layer page when the page is not
the same as the one on the right pane.

Fix: 215267159
Test: manual, robotest
Change-Id: I2315e0069facc4867cb157752b1a3144716b7d17
 2022-05-20 15:01:31 +00:00
TreeHugger Robot
19911706d2 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 6a2136b93a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I31ccaba523f8dfb7143d07373f931cc1060e1cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:27:08 +00:00
TreeHugger Robot
5ca6f95d91 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 7a8d582874 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I00c6b9e803f03d23fb42cafbe2539462e76047d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:26:27 +00:00
TreeHugger Robot
df5f2618ef Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: fdc8f75278 am: 776ef7ce34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: Ic02fa0044792dae4bfa5053a031ba60b5256c302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:16:48 +00:00
TreeHugger Robot
74d16a3f46 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: 6ecbc57e0e am: a0470d433c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I448be72b21df4012e1b33cf4b7a722eb8264903d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:16:07 +00:00
Chaohui Wang
9f8b8b376d Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: 246764009c am: 5e09274023 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I739d2aa533a68f49b7c1c8e20c1ab608dbb2c2a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:14:18 +00:00
TreeHugger Robot
50250ad224 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 972bb9ddef am: 4bc2f2df60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I6f1f3149980767bfd089d7cc9ee007018d178cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:11:38 +00:00
SongFerngWang
3ece44d658 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: eae57aee2e am: d46f1f8afe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: If9c99a86687fac9e9a2b398ad5a0dd056cf91895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:11:29 +00:00
TreeHugger Robot
8329fa64cc Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I6e4dd7854a850464c619869b13e3ec0712246512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:11:22 +00:00