PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,320 Commits 1 Branch 0 Tags
31ab0107230c523faa2672cbcf2b3a5480c25bcc
Commit Graph

113320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b03b944ea2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id47645562acd0fd9d93769bb5bb184cffc4d1426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:37:04 +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
763c57727e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours am: de76b7c0c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4ee7e4ef6b3a1a8abe5b1b0b91c1b9d45cb69bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:36:16 +00:00
Bill Yi
7ce77f731d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37a1fad359 -s ours am: e725f74df6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d1fed1764f95efa440204ca2ba4b49d1e95d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:36:14 +00:00
TreeHugger Robot
f76d513bac [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: Ia24aa647669b45543c89a0ff544208c56fd5fbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:36:04 +00:00
Bill Yi
1e7ec9488d [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: I3f144c74d50937adb49ba867bfbbeda127a5e1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:35:47 +00:00
TreeHugger Robot
de76b7c0c0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a28bac49f9 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I6f371ab53ed6773a539e2f02e08917c978f080bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 22:12:40 +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
a28bac49f9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-30 21:51:15 +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
Aleksandar Kiridzic
82ef1ef6db speech: Add on-device speech recognition settings entry 
Currently under `Settings > System > Languages & input > Speech` there
is a `Voice input` entry with a cog which starts the SSBG model manager
settings activity. Under the same preference group another entry
labeled `On-device recognition` is added which would open a similar
model manager settings activity, but for the on-device recognizer. That
settings activity is yet to be implemented.

The new entry should appear only under the following conditions:
 - An on-device speech recognition service must be available in the
system.
 - A speech recognition service with a proper settings activity
meta-data must exist in the same package as the default on-device
speech recognition service.

Bug: 235457391
Test: Manual, already existing robotests
Change-Id: I17208c8725500ccb3dd2fa51a12b003d32073c4e
(cherry picked from commit 31473663f5)
 2022-06-30 19:12:07 +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
Bill Yi
ac73a2f10f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I828baaa165b4b83e91890f75779f3d2681d81f88
 2022-06-30 03:06:58 -07:00
Bill Yi
36728d9972 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5d207b4e02f4cec681b3182eb103058c2af54e27
 2022-06-30 03:02:57 -07:00
Bill Yi
1f30e66ce1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I374017b14f84a2e6ab4c1fc54157c161c5a14231
 2022-06-30 02:58:37 -07:00
Bill Yi
a140e645ff Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib82da5ad9567b72f5a152893d397cafb736f0037
 2022-06-30 02:54:36 -07:00
Bill Yi
d642b8754c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idaa60c0a1a599d60559c2610ffee17880bc5763b
 2022-06-30 02:52:59 -07:00
Bill Yi
19777b98cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3e02d79532f2ccbde6d2f6716ba6991ab6945dd2
 2022-06-30 02:51:14 -07:00
Bill Yi
3775e246dc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id0a25d2b31fee26b7f9ca2c9b45ed5128c064d00
 2022-06-30 02:41:16 -07:00
Bill Yi
b107521284 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0fc17cde5466fe2346434ee2741d614c8c7fd2ba
 2022-06-30 02:35:43 -07: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