PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,070 Commits 1 Branch 0 Tags
00d8cf19eb12a1eb0293aa2ae6b6446ba3d86a66
Commit Graph

109070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
cbc5f8a756 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 am: 2034695af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: Ie96d1ab046c988058dca50e0bfa8107d5babce8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:24:54 +00:00
Bonian Chen
cb9e5a8076 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I158f6542124f5260ddf64eddd589de654ff086b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:24:44 +00:00
Automerger Merge Worker
85f5fa0c01 Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 8bd1ac8ad2" into tm-d1-dev-plus-aosp 2022-05-19 11:24:36 +00:00
Bonian Chen
ec2b35fe87 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 7e7ef59813 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I4aff0efcc0bd667d952f23695d6c7db7dac85ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:24:32 +00:00
Bonian Chen
fd79110356 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e am: 8bd1ac8ad2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I2d2ea978b37da3ca0a2737ff5f267c5026132ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:24:31 +00:00
Bonian Chen
2034695af7 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: Id5e3b9d471b378a65c195179cac6da4b38e3723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:08:34 +00:00
Bonian Chen
7e7ef59813 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: Ie45deeea978e1a87b4d34e930bfd068a05f43ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:08:27 +00:00
Bonian Chen
1cdd01268a Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev am: 08b7f53383 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18426347

Change-Id: I7fd11293633fd718210bf59a83c5db28a12852f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:07:08 +00:00
Bonian Chen
8bd1ac8ad2 Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402157

Change-Id: I390e0565a2ebfea00ad464117a63eec193fc6282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 11:06:42 +00:00
Bonian Chen
08b7f53383 Merge "[Settings] Select RAT in between SIMs for Internet" into tm-dev 2022-05-19 10:28:21 +00:00
Bonian Chen
fccca65c0e Merge "[Settings] Stop network mode query when changing config" into tm-dev 2022-05-19 10:27:07 +00:00
Yi-Ling Chuang
ff3ef50a7b Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66 am: 4c592c3baf am: 3d15dd9f8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I269d44ce50bec4613c8ef3e260767c3353b96478
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 10:07:53 +00:00
Yi-Ling Chuang
163cc7852c Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: 07438e359d am: eb7afaa167 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Idcae5b9c2174bf781f03108030f88e513fb9555a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 10:07:38 +00:00
Yi-Ling Chuang
f933f1b65e Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: e8aaf2ba6f am: 4bd95131c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ibb82102d632d497117411513adcdb5b298e51cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 10:06:59 +00:00
Yi-Ling Chuang
3d15dd9f8b Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66 am: 4c592c3baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Iea79f9f9e7b5d8aecb8d4cfc5b269a1170fa9cd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 09:47:53 +00:00
Yi-Ling Chuang
eb7afaa167 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: 07438e359d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ib6eb196cc4a3f617c440160896201169e43c2b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 09:47:30 +00:00
Yi-Ling Chuang
4bd95131c6 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e am: e8aaf2ba6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I0b5f36f13dfabe114ffa88d74423e14c3e65573a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 09:46:41 +00:00
Yi-Ling Chuang
4c592c3baf Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: 562977ee66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I4f7e7a14f83f2e18880978472aa71ac02ae37dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 09:21:07 +00:00
Yi-Ling Chuang
07438e359d Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I57ad7d8c54d8441b2dfa4daa2cf900bdae76914a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 09:20:51 +00:00
Yi-Ling Chuang
e8aaf2ba6f Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e am: d16cf0453e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I8a7b1e0af688bfaaab35374bb7c1db1f881863ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 09:20:48 +00:00
Yi-Ling Chuang
d16cf0453e Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: Ic1c953a034827ce7df2bd7b0f464fdb340aebb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 08:44:38 +00:00
Yi-Ling Chuang
562977ee66 Merge "Guard against the NPE in getTransitionType()" into tm-dev am: 3bf578c73e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447100

Change-Id: I4d7371583bd16123096f2e1bdeb71680aefa14c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 08:43:03 +00:00
Yi-Ling Chuang
3bf578c73e Merge "Guard against the NPE in getTransitionType()" into tm-dev 2022-05-19 08:19:50 +00:00
SongFerngWang
5350643e7a [LE unicast] Disable the "phone calls" when LE is enabled 
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
 2022-05-19 15:14:01 +08:00
TreeHugger Robot
330aac4d2f Merge "[Le Audio] Add test case for the QrCodeScanModeActivity" into tm-qpr-dev am: ad6fc3acf5 am: 73850fc1be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18408202

Change-Id: I71e22627ea1ab4197e2d49459af87cce1502acc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 04:35:55 +00:00
Bill Yi
7eb1a86013 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: fb624c7eb4 -s ours am: 9be6f3ac1c -s ours am: 3d21f9b287 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77159ba8b41a7a737e2e960151a46e98e1fcbc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 04:28:33 +00:00
Chaohui Wang
692068d535 Add the jank detection to Settings toggles 
Add jank detection when click the following preferences,
 - SwitchPreference
   Single target, detect click in InstrumentedPreferenceFragment
 - PrimarySwitchPreference
   Two target, only detect click switch in switch's onClick()
 - MainSwitchPreference
   Single target, detect click in TogglePreferenceController
 - SettingsMainSwitchPreference
   Single target, detect click in its onSwitchChanged()

Bug: 230285829
Test: manual & robo tests
Change-Id: I97a13e05a601237b16cd2d903ba2fb6ec4a69a74
 2022-05-19 12:28:16 +08:00
Bill Yi
fd71f2e47c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: 8e72e0eff1 -s ours am: 72d01bba8f -s ours am: 9198d60e4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3bb5166eca5cc106ddd8e56770a2104df09bfcbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 04:20:57 +00:00
Automerger Merge Worker
6197b41a34 Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into tm-qpr-dev-plus-aosp am: 1f400bc4cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18423219

Change-Id: I5482ee1f3b2d1715b33d83c55b6006e2cf0a71d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 04:11:35 +00:00
Bill Yi
0e146b7e43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045 -s ours am: e7804305be -s ours am: c6ff29f7ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib837d5031a56618fb15c42bdfd3564021459ca48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 04:11:21 +00:00
Bill Yi
b4dd94da43 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aaa6d1154 -s ours am: 72642fa03d -s ours am: fb624c7eb4 -s ours am: 5c12bc3d5d -s ours am: 094f0d2f66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3eee938ad39219816c44f0444050222dfdef2cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 04:06:59 +00:00
Bill Yi
2eb8df9864 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: daacf9d045 -s ours am: e3a01dbf3c -s ours am: c6c4152d7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9975f8c2882308d07ad432dd0347e42c51d54a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:59:26 +00:00
Bill Yi
9fdedd3bde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66baefeaed -s ours am: c9122bbe1f -s ours am: dc984245e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8efc25039afd89d98ec499dc4bb9652b3989392d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:59:13 +00:00
Kate Montgomery
8e5c633f76 Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: 499e8848bc am: 2dc9ab9f81 am: 0e8a3deadd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I5719b5c8300cae2a700ddda7d62864b408f6b9e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:57:51 +00:00
Kate Montgomery
cd7c0c04dc Merge "Flag off stickiness of show/hide system setting." into tm-dev am: d79959bd7d am: c92780ceba am: 196d99198d am: b26c4dd27b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18399916

Change-Id: I703b95855d6463cd103d52da9ee7a7e233896c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:57:41 +00:00
TreeHugger Robot
ece71be3d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 1f16b93bfb -s ours am: b4f8df82a1 -s ours am: 0b8eee081a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefa707478fc7299cd7892d3df0ef0cd8ca9e066f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:05:06 +00:00
Bill Yi
e0af883e70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours am: ccf14d5a76 -s ours am: d81baee6ee -s ours am: f0f97e6e87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c9e7fbc01000cc6ab39bb8e69c4af9eb2c4d115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:04:56 +00:00
TreeHugger Robot
c4ae0b19e8 Merge "Update Spatial audio settings page" into tm-dev am: 6993aa86eb am: d9fa9f7ba1 am: f29047c284 am: 8ad0040bf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456662

Change-Id: Iba89b0f66c3cd40d658787f26c510c2cda6deee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:02:40 +00:00
TreeHugger Robot
d11fdd2688 Merge "Guard against the NPE in setPreferenceIcon()" into tm-dev am: cce3381ed4 am: 33622a034e am: 4dfa092886 am: fb691325b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447101

Change-Id: I512f5d098c0e8feb4728c7632716e66ce6503f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:02:33 +00:00
TreeHugger Robot
4b97077799 Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev am: 1cf78b8b83 am: d2631c30f2 am: c6451d4def am: 0c7a872346 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18447091

Change-Id: Ifae43fdc21ca993f04c5d923ecceff30a4b0b81a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:02:25 +00:00
Bill Yi
999c1a6f86 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6890a9fd64 -s ours am: 06e4b3d06e -s ours am: d84e849f2d -s ours am: a0ecbad49f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ed45574eb156937737a6dd86a86fb9937b1df4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:02:17 +00:00
Arc Wang
49f0d02012 [automerger skipped] Center apps Preference title when there is no summary am: 3cb8171f4f am: 75eac09a00 -s ours am: c443587bc2 -s ours am: ac8520e059 -s ours 
am skip reason: Merged-In I6fceba243e2ccac9ea180b940b571da07e1ba805 with SHA-1 3cb8171f4f is already in history

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

Change-Id: I88d3cdc0a4bb45dc4a05dffc40b7d0ab85114680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:02:11 +00:00
Chaohui Wang
375cca8692 Fix flicker in Location page when location is off am: f9ebeadb33 am: 01431d5ffe am: 012573573e am: b37a8b945e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18402153

Change-Id: I8e5a810c5dedc5a5dbe6e4e581df9df85a5486b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:02:04 +00:00
Hugh Chen
898cf185ee [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 06139d3ffc am: c2bb599eeb -s ours am: 8ddd1d70b2 -s ours am: 22ce749aa6 -s ours am: 8ce854af29 -s ours am: 136af4e593 -s ours am: 40ed71c895 -s ours am: c4899bf019 -s ours am: d217f66380 -s ours am: 710bc7d66e -s ours am: 2e4ddda473 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24ebcc308dd6708f75ac9267c32db7ade98e73cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:01:57 +00:00
Hugh Chen
967fbaa779 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: c44b6fed73 am: d925f52768 -s ours am: 8d4a4b690f -s ours am: f13ceb8aea -s ours am: ddc8e16cd6 -s ours am: 0e568376a3 -s ours am: 978ba3a85d -s ours am: 825c6dfa45 -s ours am: fcd76cba7b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5bb2d5980607cd7cf85b39ddbb9a6b91cf2da6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:01:47 +00:00
Hugh Chen
71e1b57976 [automerger skipped] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline am: 9399a699d7 -s ours am: 1e636ad03e -s ours am: dc1023e587 -s ours am: 3d0db8d34f -s ours am: e5d54e867c -s ours am: 1b0e924968 -s ours am: cedf84a84c -s ours am: 2628006023 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14b741aaf03a4324e4b4b6ca7ff31b93eb996c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 03:01:33 +00:00
TreeHugger Robot
e39b1e577a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c41e921e1c -s ours am: 9db1451fc5 -s ours am: 2e39615795 -s ours am: 23710261eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c4dde0571b035a2f9365fb898c74141149d9b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 02:43:39 +00:00
Bill Yi
c98bf5a7cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff3c01f123 -s ours am: c94186ccf4 -s ours am: cedf54a680 -s ours am: daf46002b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39d631338b2ae479069a651a684e6c25b039f4ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 02:43:27 +00:00
Tom Hsu
7cd5cab910 Merge "[Panlingual] Fix the item clicked is not match target application" into tm-dev am: 45c60f8564 am: 6a85746757 am: fcb8ce86f0 am: f3c1c8d0a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356600

Change-Id: I5d59d2b078ddd3b57928f28c24182119fa5f7a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 02:40:12 +00:00
TreeHugger Robot
f2abdf6b3f [automerger skipped] Merge "RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline" into sc-qpr1-dev am: 20457ad117 -s ours am: e26317b97c -s ours am: ce98ad58a5 -s ours am: cfcad71f14 -s ours am: b7ac6d6b36 -s ours am: d7a41f98b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibaf569c956978f1672cc4ee39110788f45281bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 02:40:03 +00:00