Commit Graph

112699 Commits

Author SHA1 Message Date
TreeHugger Robot
5c3f94cad2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours am: 10e7d32a16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic671387a6c08dfac6375397abda6fb6c994b012a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:57:37 +00:00
Bill Yi
6280dc63ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours am: c93737bbbf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6017438bc80eae38f8ec7eb6d812956d605b08d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:57:21 +00:00
TreeHugger Robot
10e7d32a16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours am: eb1fac17dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31e6b5dde9a0a2d74033ee9b38285f150dd91942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:36:51 +00:00
Bill Yi
c93737bbbf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours am: 26aaae4b33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide80c04cb23933b08370b0628cfaac16201b5e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:36:37 +00:00
TreeHugger Robot
eb1fac17dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4fe2b9284d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee783066fa19d7cdbb69ddc1914798fc46233da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:12:30 +00:00
Bill Yi
26aaae4b33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2cb8997657 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5711ae485881b9dfb32a0da03bf07c48210940f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 22:12:13 +00:00
TreeHugger Robot
4fe2b9284d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-30 21:51:15 +00:00
Joshua Mccloskey
95ccd96c49 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: c45744b895 am: f18225e8d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Idad3e1a1f174a49545decf6e6ae94af6128e49cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:49:29 +00:00
Joshua Mccloskey
3ce8497117 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774 am: 8b6d40e167
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ie326332cdc12df4a4946cde970a3016ebd9d2f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:49:16 +00:00
Joshua Mccloskey
f18225e8d4 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: c45744b895
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ic22dcf1dee20c8176aad428f8aa7d33d7f24ae55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:32:01 +00:00
Joshua Mccloskey
8b6d40e167 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca am: 93f79d6774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I4513264127184a92320636fee5cdf48e84ec7752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:31:30 +00:00
Joshua Mccloskey
c45744b895 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: I85ffc3d2738d7398b261c48f27cf29c84c328f94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:06:54 +00:00
Joshua Mccloskey
93f79d6774 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:06:42 +00:00
Joshua Mccloskey
c99fa169ca Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev 2022-06-30 18:49:06 +00:00
Jason Chiu
39fc87c30c [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: fd87b73bce -s ours am: bbd4ba6097 -s ours am: 8b8af21cec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d5cc0b9219032b9d470625ccffb71d4e4a3d22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:55:03 +00:00
TreeHugger Robot
96cbb95554 [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 95dd3a91fc am: d7d9010c66 -s ours am: 9a2c8f1aa7 -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 846d0286a8 is already in history

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

Change-Id: I6eddd06897d09a7b2467c4982d19cc7998869f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:54:56 +00:00
Jason Chiu
6dccd3c6d8 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours am: 0a32801a7f -s ours am: ce0287057e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a3fafded99e5f99687bbd279d0c41455f5ddf81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:54:50 +00:00
Automerger Merge Worker
8829e55a29 Merge "[automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 2da3d922d5 -s ours" into tm-qpr-dev-plus-aosp am: 073aae829d -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 846d0286a8 is already in history

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

Change-Id: I881263bb60dbe6fb9c2a6587f1a8942ce1f4c1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:54:42 +00:00
TreeHugger Robot
2ba7d45d72 [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 2da3d922d5 -s ours am: cef8cb554b -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 5df14831b8 is already in history

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

Change-Id: I15ca8a165b9cc8a377e9510589eb6e62317cf52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:54:41 +00:00
Jason Chiu
755891b504 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours am: 60328e4308 -s ours am: efb5229128 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida9079c9890d3068e0c1a8fc4e4c8cf420cd0714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:54:29 +00:00
TreeHugger Robot
6440caa68b [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 0e4e512d7b am: 060508e0ee -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 846d0286a8 is already in history

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

Change-Id: I81e078717257f6e96e6bd8639478b39cee8df8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:54:20 +00:00
Jason Chiu
8b8af21cec [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: fd87b73bce -s ours am: bbd4ba6097 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7899a2aa45e74ea26d1de42091a703190156cc33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:38:02 +00:00
TreeHugger Robot
9a2c8f1aa7 [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 95dd3a91fc am: d7d9010c66 -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 846d0286a8 is already in history

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

Change-Id: Ica48802f654a9f5327150dfa916186bf56bb3092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:56 +00:00
Jason Chiu
ce0287057e [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours am: 0a32801a7f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife9e3c0b25ddb40db2ba57158d871b8a911e771b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:49 +00:00
Automerger Merge Worker
073aae829d Merge "[automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 2da3d922d5 -s ours" into tm-qpr-dev-plus-aosp 2022-06-30 05:37:29 +00:00
TreeHugger Robot
cef8cb554b [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 2da3d922d5 -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 5df14831b8 is already in history

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

Change-Id: Ib68a586c09551f159d15779e502fd7767a26f2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:26 +00:00
Jason Chiu
efb5229128 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours am: 60328e4308 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id9f344a9b1270b14943c12fc17be4a2e9ead7449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:22 +00:00
TreeHugger Robot
060508e0ee Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f am: 0e4e512d7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I50b4faf9421c34826c1870d3ecb84c0c9fcbe4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:37:16 +00:00
Jason Chiu
bbd4ba6097 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: fd87b73bce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3876504245474d277f00335301cbbd3d8c98b11a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:51 +00:00
TreeHugger Robot
d7d9010c66 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 95dd3a91fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I5d747db63465740453e8f970006cfb70c605b2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:45 +00:00
Jason Chiu
0a32801a7f [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id618e4458a951d98ef0b76384aba09012f402cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:40 +00:00
Jason Chiu
60328e4308 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 919a67d253 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I785501cc24716f24a3fbb0c23483f3cb1fe234ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:36 +00:00
TreeHugger Robot
2da3d922d5 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I656847a34246a43506198d2d5a8c9cd6cbb34af5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:33 +00:00
TreeHugger Robot
0e4e512d7b Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 10c3e3e56f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I02ffa271a2896f481148b56558390c1b8f4fee88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:21:31 +00:00
Jason Chiu
53b93642d0 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours am: 16851f1d56 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9ddc7b0042fd5b72ebb39906167e66a5ed3de9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:20:56 +00:00
TreeHugger Robot
abc595fa39 [automerger skipped] Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59 am: 2a5a85c982 -s ours
am skip reason: Merged-In I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7 with SHA-1 6dcbb25fa5 is already in history

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

Change-Id: Id9d7f50363f2d865c6571b234b32b10ee2917700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:20:49 +00:00
Jason Chiu
919a67d253 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8a0de0fd82916e3177ed6c5e7f58d44bead60aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:03:18 +00:00
TreeHugger Robot
10c3e3e56f Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I36354f1a7511077a3499ff95e17992bdffb1f8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:03:13 +00:00
Jason Chiu
16851f1d56 [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b544eb68be86ee4831056121e3bfbbc0c44a0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:02:48 +00:00
TreeHugger Robot
2a5a85c982 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: I6e660a268006cbc530055e033b28795e18169d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:02:42 +00:00
Jason Chiu
fd87b73bce [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours am: 08a312eeed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3efcde0abdece1f1591e14df6ccc11a54f39803d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:01:53 +00:00
TreeHugger Robot
95dd3a91fc Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev am: 526b870f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19034069

Change-Id: Ib52f8a818aa6601d6e5c0b7e0b0a64e98c85feea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:01:47 +00:00
Jason Chiu
08a312eeed [automerger skipped] [DO NOT MERGE] Make bluetooth not discoverable via large screen deep link flow am: 846d0286a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia464c9fba5ca19ef3af0c5b66546b955bfdc5f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 05:01:26 +00:00
TreeHugger Robot
526b870f59 Merge "Make bluetooth not discoverable via large screen deep link flow" into tm-dev 2022-06-30 04:39:49 +00:00
Menghan Li
9450735e38 Merge "Refactor CaptionPropertiesFragment to improve maintainability" 2022-06-30 03:48:33 +00:00
Bill Yi
2cb8997657 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I47b4ad5429196a3a40323c5515b64b0889e60c67
2022-06-29 18:21:36 -07:00
Xin Li
f2422d23d7 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b8d6e73355 -s ours am: 5c022ddef7 -s ours am: 75f92deb34 -s ours am: d02caacd56 -s ours
am skip reason: Merged-In Ifcb9d4c564839199d998bd503f390f021c6bf3ad with SHA-1 d10618d489 is already in history

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

Change-Id: Ie1900d90ff955950638c84e357e6a23156c7dd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 01:05:04 +00:00
menghanli
1d26b6d898 Refactor CaptionPropertiesFragment to improve maintainability
Root cause: There is a bunch of different logic of preferences in CaptionPropertiesFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionPropertiesFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionPropertiesFragmentTest CaptionTogglePreferenceControllerTest
Change-Id: I7013a7aa284b587c329c2e678dbb079e553ea94d
2022-06-30 09:01:13 +08:00
Menghan Li
5a3498c9bc Merge "Refactor CaptionMoreOptionsFragment to improve maintainability" 2022-06-30 00:16:54 +00:00
menghanli
deb72e29ef Refactor CaptionMoreOptionsFragment to improve maintainability
Root cause: There is a bunch of different logic of preferences in CaptionMoreOptionsFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out different logic of CaptionMoreOptionsFragment into controllers to reduce the complexity of the relationship between preference and fragment.

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CaptionMoreOptionsFragmentTest CaptionLocalePreferenceControllerTest
Change-Id: Ifdf3e22b027328a9f8eb13d756730ca047ece047
2022-06-30 00:16:19 +00:00