Commit Graph

90870 Commits

Author SHA1 Message Date
Bill Yi
b07f4eca84 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icf0bc906bc6e41539af9fa4200ec6fe24d559b0f
2022-02-23 08:20:54 +00:00
TreeHugger Robot
e647298264 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124 -s ours am: 1a2962d15b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0efa9857c3e46969c664f6460b793aa2518844a
2022-02-18 17:50:08 +00:00
Bill Yi
e29c0bb725 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 382229bcb6 -s ours am: be2ae00267 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b51595a36d4dcee8c6f6833d05e96a3f697c063
2022-02-18 17:49:34 +00:00
TreeHugger Robot
1a2962d15b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1c5ae8a124 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea951572b963b5d7c01f2c98fb298b4c579bc3e8
2022-02-18 17:40:19 +00:00
Bill Yi
be2ae00267 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c am: 382229bcb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf22d45eb3d5056bc345ec241c29663a5922b51a
2022-02-18 17:39:27 +00:00
Bill Yi
e2d91a630e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b45dc4ca74 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd6af66701dbe80bcbe1d070ab8ba50e4410387c
2022-02-18 17:37:09 +00:00
TreeHugger Robot
1c5ae8a124 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-02-18 17:09:16 +00:00
Bill Yi
b45dc4ca74 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idba594ec1c8ce5633f197c8a91c4db39cb4eb5ab
2022-02-18 03:20:57 +00:00
Bill Yi
b3c81561c2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I97f82f3f3ab3ac037a2b28c4e0c0db21398a605c
2022-02-18 03:17:09 +00:00
Bill Yi
382229bcb6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: bfb1c0090c
Blank merge reason: commit message contains skip directive

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

Change-Id: I1b36efd22b8f9c8af9ceeca44656c53010349444
2022-02-18 03:13:47 +00:00
Bill Yi
bfb1c0090c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3127e1d696f00a9d496edaa5ed672ac1820da936
2022-02-18 03:13:28 +00:00
Rahul Sabnis
99e2c9f2f2 Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff am: 19d5264723
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146

Change-Id: I59f5ddaa559331d6efd974e7abd719db3d05aafb
2022-02-16 23:18:32 +00:00
Rahul Sabnis
19d5264723 Merge "Remove hidden Bluetooth dependencies" am: 2e6f2dcfff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989146

Change-Id: Icf270075cf196c75e797f967e721cab8aa0db332
2022-02-16 22:56:11 +00:00
Rahul Sabnis
2e6f2dcfff Merge "Remove hidden Bluetooth dependencies" 2022-02-16 22:36:25 +00:00
William Escande
a95180f228 Remove hidden Bluetooth dependencies
Bug: 217736913
Test: pre-submit
Change-Id: Ib4e12e8e350ffa08b48f58e8256991d7ed4fa013
2022-02-16 20:00:59 +01:00
Treehugger Robot
f5246d8a8c Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033 am: df16e4b74c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150

Change-Id: Ib92a9c70e554ff53f452cae5cf45d6be511da39b
2022-02-16 13:33:21 +00:00
Treehugger Robot
df16e4b74c Merge "Restart the MTP connection when changing transcode enabled" am: 8109ad8033
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1882150

Change-Id: I180666f8edc9fdb69fcdec20b9ae2730240ff923
2022-02-16 13:08:35 +00:00
Treehugger Robot
8109ad8033 Merge "Restart the MTP connection when changing transcode enabled" 2022-02-16 09:58:58 +00:00
Treehugger Robot
b99cd8f159 Merge "Show identity address in the bluetooth details page" am: 5d17cfd938 am: 3ac72d1fd6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I65bec3e2b43dff86f6bc69f52bfba4abcdcce6fb
2022-02-15 06:31:19 +00:00
Treehugger Robot
3ac72d1fd6 Merge "Show identity address in the bluetooth details page" am: 5d17cfd938
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I07ff71fbb60abae09d8a3116542260b709a6a81e
2022-02-15 06:13:57 +00:00
Treehugger Robot
5d17cfd938 Merge "Show identity address in the bluetooth details page" 2022-02-15 05:07:42 +00:00
Treehugger Robot
a3102c477f Merge "Fix dream settings OWNERS path" am: c6bf492db4 am: 58fb784e7d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: I99530d86b8e1372034bf3f1edaf65c7c809dbb15
2022-02-15 00:55:50 +00:00
Treehugger Robot
58fb784e7d Merge "Fix dream settings OWNERS path" am: c6bf492db4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1985346

Change-Id: Ifeb24520760d02cefc9ab12ff648203dbd2a988b
2022-02-15 00:42:12 +00:00
Treehugger Robot
c6bf492db4 Merge "Fix dream settings OWNERS path" 2022-02-15 00:22:02 +00:00
Xin Li
7928abd2b2 [automerger skipped] Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: da7237b2ed -s ours
am skip reason: Merged-In I962c318f41adcf180b885f2052ce0ec4952edfb6 with SHA-1 0eab9c02b9 is already in history

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

Change-Id: I489e0cbc88a0095b34f3b3c260b4a908c764bf55
2022-02-14 18:03:30 +00:00
Xin Li
da7237b2ed Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:11 +00:00
Lucas Silva
55ce0f7cdd Fix dream settings OWNERS path
Change-Id: I4ebcec52d96cee03448a872984036c314c760eaa
2022-02-14 17:02:16 +00:00
Treehugger Robot
b7077ab55f Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c am: 1a16975a36
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698

Change-Id: I0196d39d1e8d619a54931492fc89f15b8b5dfc99
2022-02-14 11:49:04 +00:00
Treehugger Robot
1a16975a36 Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" am: 57238d653c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977698

Change-Id: Icecb9f0232a86fbbaf8f8d9a22c86aaa40ab234d
2022-02-14 11:27:00 +00:00
Treehugger Robot
57238d653c Merge "Use Intent.EXTRA_USER for ACTION_CHANGE_DEFAULT" 2022-02-14 10:50:17 +00:00
Treehugger Robot
a93434b11e Merge changes Idadf8487,I84d87024 am: e489d46b7c am: 43b7ae19fb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855

Change-Id: I38ae0b28716a446c9d30a3fbcf7517d0c74e3d30
2022-02-12 12:35:48 +00:00
William Escande
fe155f50fc Use allowed system value am: 088a7b87f2 am: f859d0f15d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854

Change-Id: If7fd42b0a7c006635073a3704ec0af1ac68ada55
2022-02-12 12:35:43 +00:00
Treehugger Robot
43b7ae19fb Merge changes Idadf8487,I84d87024 am: e489d46b7c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981855

Change-Id: I4ee8583862f590206240d107d9a2a509edea03df
2022-02-12 12:21:09 +00:00
William Escande
f859d0f15d Use allowed system value am: 088a7b87f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1981854

Change-Id: I757da4bdfd98e460ae66ff1c31d74e2838480a8a
2022-02-12 12:21:08 +00:00
Treehugger Robot
e489d46b7c Merge changes Idadf8487,I84d87024
* changes:
  Resolve bluetooth hidden API usages
  Use allowed system value
2022-02-12 12:06:16 +00:00
William Escande
6de80163b1 Resolve bluetooth hidden API usages
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
Merged-In: Idadf84873c88155382c48bb9108cf28d88aaef0a
2022-02-11 14:19:38 +01:00
William Escande
088a7b87f2 Use allowed system value
Test: build
Change-Id: I84d87024423869515937ab87381be572fed0ba65
Merged-In: I84d87024423869515937ab87381be572fed0ba65
2022-02-11 13:05:33 +01:00
Xin Li
b9e9ca119c Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I962c318f41adcf180b885f2052ce0ec4952edfb6
Change-Id: I77764eaf895ac3c13c7440adb5b3f597a516d690
2022-02-11 07:29:32 +00:00
Tsung-Mao Fang
e098415564 Merge "Update OWNERS for dream settings" am: e294a5a1db am: 144f23be39
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I3da1488d455189eb25107e5452040fa86e8d2ae4
2022-02-11 06:47:00 +00:00
Tsung-Mao Fang
144f23be39 Merge "Update OWNERS for dream settings" am: e294a5a1db
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1979791

Change-Id: I0eee5bb9c89621f84bc43bc9e8763991b782c292
2022-02-11 06:25:15 +00:00
Tsung-Mao Fang
e294a5a1db Merge "Update OWNERS for dream settings" 2022-02-11 06:12:16 +00:00
Lucas Silva
c3f78bce8d Update OWNERS for dream settings
Change-Id: Ie4b483907918986c3b1b4b284ec0f977569cfd58
2022-02-10 19:40:25 +00:00
Julia Reynolds
445aa53ddc Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c am: 809c15fd53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: I4f8ce83fea5cde2ddf4517c78e5f66bae461a1ea
2022-02-10 14:38:05 +00:00
Julia Reynolds
809c15fd53 Merge "Update notification settings OWNERS" am: 49b9583ea1 am: e2d790725c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: Id88fd287953b4190d4830d0037d9f0817e6a715b
2022-02-10 14:22:43 +00:00
Julia Reynolds
e2d790725c Merge "Update notification settings OWNERS" am: 49b9583ea1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1960665

Change-Id: I3bdeaab21beed6c214d28516b9699a20c5b09dd5
2022-02-10 14:04:25 +00:00
Julia Reynolds
49b9583ea1 Merge "Update notification settings OWNERS" 2022-02-10 13:48:25 +00:00
Tom Hsu
d1040f8fe9 Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 am: f9355dcc95 am: 3639f8c59a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I4db5ebcc51cef0ad63ce03b0d3d137515c6fa8a5
2022-02-10 10:32:35 +00:00
Tom Hsu
3639f8c59a Merge "Add a OWNER file for per-app language" am: 38cb70ffd9 am: f9355dcc95
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I137701d26151296a0ef8e7401a1cfc3334952230
2022-02-10 10:06:56 +00:00
Tom Hsu
f9355dcc95 Merge "Add a OWNER file for per-app language" am: 38cb70ffd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1977704

Change-Id: I35dceb538404edcbe552b87c6c615c0c8d16c69b
2022-02-10 09:52:36 +00:00
Tom Hsu
38cb70ffd9 Merge "Add a OWNER file for per-app language" 2022-02-10 09:31:50 +00:00