Bill Yi
b63c84d427
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546
Change-Id: I8b23a0c3bed86312eb39801637497f1b18c7e135
2021-04-23 16:55:05 +00:00
Bill Yi
7201890895
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5cc7bbb24715e6845f855156e63d3518e274d6b
2021-04-23 11:27:37 +00:00
Treehugger Robot
a0a5760ff9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7
-s ours am: 220ba05109
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488
Change-Id: Ia7a95d05a05529fba88972f0714683b2da4c5fc7
2021-04-22 21:12:58 +00:00
Treehugger Robot
c17720247e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3
-s ours am: dda5464180
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526
Change-Id: I9a1156f535c7cfd8d529ea4071c585db403ac314
2021-04-22 21:12:55 +00:00
Treehugger Robot
220ba05109
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: acc37353d7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684488
Change-Id: Ieec4e25b4a582e782b410df438d401d1a328aac7
2021-04-22 20:55:37 +00:00
Treehugger Robot
dda5464180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5d68dc45b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683526
Change-Id: I74ccbff817c7d8e695e38a56e6a48c00df1a7d9b
2021-04-22 20:50:28 +00:00
Treehugger Robot
802d9f3c8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d
-s ours am: ab17423f8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684487
Change-Id: I86c667f5d23e47d29443a055443f786b78922ada
2021-04-22 20:43:29 +00:00
Treehugger Robot
ab17423f8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 631013489d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1684487
Change-Id: I5a0298e75ff4adce5487c6e86153d5364e95f7c0
2021-04-22 20:26:17 +00:00
Treehugger Robot
acc37353d7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 20:01:33 +00:00
Treehugger Robot
5d68dc45b3
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 19:24:09 +00:00
Treehugger Robot
631013489d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-04-22 19:20:30 +00:00
Bill Yi
86cf8dc82f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I74a0174984401e63ae86978bb3d472cb6422c1ce
2021-04-22 10:33:24 -07:00
Bill Yi
183d5436b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I670023c95e90df9d083ad0359c70b19195ccfb02
2021-04-22 10:31:33 -07:00
Bill Yi
fbcfe8af01
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I814358b71ad2829789f1d9ac0711e369dddd11e4
2021-04-22 10:28:15 -07:00
TreeHugger Robot
58ff823e7e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b2185f5ede
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14261000
Change-Id: I905f157e08ee5b07b2ea5a0851212faa53b4fb3a
2021-04-21 08:39:24 +00:00
Bill Yi
95ffa79af1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260991
Change-Id: I218735c7a6468d882769285c4f4fa0e7ab1d563c
2021-04-21 08:39:21 +00:00
TreeHugger Robot
b2185f5ede
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-21 08:21:52 +00:00
Bill Yi
258d71bdb5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78ea5296db70d652825abe7a8838613027945e53
2021-04-21 07:13:04 +00:00
Bill Yi
34ce6187c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia246265007d3858abdac7c9c5d368c607afd5a15
2021-04-21 07:09:42 +00:00
Jeremy Goldman
032b0a4bf3
Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6
am: e67b576ab9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185
Change-Id: I7e906e3982dab72dfed796bc061f37468c2e3f2d
2021-04-20 06:08:30 +00:00
Jeremy Goldman
e67b576ab9
Merge "Check if the SubscriptionsChangeListener has been started before stop" am: 162029c5b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1679185
Change-Id: Ia0580d6c17e936fe631c0cd1e0d946fa6881a92c
2021-04-20 05:44:54 +00:00
Jeremy Goldman
162029c5b6
Merge "Check if the SubscriptionsChangeListener has been started before stop"
2021-04-20 05:24:37 +00:00
Jeremy Goldman
660e7164c7
Check if the SubscriptionsChangeListener has been started before stop
...
calling mContext.unregisterReceiver on an unregistered broadcast
receiver will result in an exception. To make the
SubscriptionsChangeListener safe from this kind of error, add a check to
see whether start has been called before implementing stop's
functionality.
Bug: 184662284
Bug: 184521296
Test: atest -c SettingsUnitTests
Change-Id: Ic13911ee7573666f5d42ab4612c025968984ba47
2021-04-20 11:33:17 +08:00
Treehugger Robot
7609a76fe7
Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6
am: ba40979005
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685
Change-Id: If59c31a9df0fc8426fa48310aa0eec3157d6a249
2021-04-20 03:18:27 +00:00
Treehugger Robot
ba40979005
Merge "Update OWNER file for TTS subfolder" am: a1cf8135e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1674685
Change-Id: I0a31341d2018503a3e8d8bd0c4cd9f0d7637b5d3
2021-04-20 02:53:35 +00:00
Treehugger Robot
a1cf8135e6
Merge "Update OWNER file for TTS subfolder"
2021-04-20 02:19:53 +00:00
TreeHugger Robot
4c69b3e30e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6a691cbc1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14237979
Change-Id: I96bb90ccfe25cfd6f56020a54020ad8755380b6b
2021-04-19 22:18:52 +00:00
TreeHugger Robot
6a691cbc1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-19 22:11:59 +00:00
Bill Yi
debe299d81
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e7ff773ec9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14238550
Change-Id: Ideb6b39714e86e01bfc84aecafc99e89d5741dac
2021-04-19 22:08:53 +00:00
Bill Yi
4edd6f1d2e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eb5c765212e06835518338f632653cd97764b16
2021-04-19 20:59:50 +00:00
Bill Yi
e7ff773ec9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I63b71ebf8f57a8effa4345bb1b00dbf35c2b1b3e
2021-04-19 20:56:11 +00:00
Jack He
130f27d48f
Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232
am: ee25171aa1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159
Change-Id: I690e850a6b67125a35e999a4faf86a3454140d3f
2021-04-14 06:07:23 +00:00
Jack He
ee25171aa1
Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159
Change-Id: Ib4b7dbbc490cbb74954531fbf17b440074cb4447
2021-04-14 05:23:30 +00:00
Jack He
6de2953232
Merge "BT: Use DeviceConfig for Bluetooth GD toggle"
2021-04-14 04:44:02 +00:00
Tsung-Mao Fang
b6b63bec6c
Update OWNER file for TTS subfolder
...
Change-Id: If0efd5051bc8ddcaa406746d4eb4e4a03d9023b7
Test: N/A
Fix: 185232773
2021-04-14 01:29:15 +00:00
Jack He
8cc23bd2fe
BT: Use DeviceConfig for Bluetooth GD toggle
...
Bug: 184235563
Test: make and toggle GD settings, unit test
Change-Id: I643339f80a82950b1b1ffcf60830f93a955e6666
2021-04-13 20:31:38 +00:00
Peter Wang
bc52992b42
Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567
am: 108ee559ea
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969
Change-Id: I35ee9c8bc08d8cbbbac9d22d47aa75e3fcfcc4dd
2021-04-10 01:14:56 +00:00
Peter Wang
108ee559ea
Merge "Fix intent String for starting profile management page in Manifest" am: ae74222567
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1671969
Change-Id: I26d0d0be6943bfc691c9b2476dd32f98a5561d50
2021-04-09 23:26:07 +00:00
Peter Wang
ae74222567
Merge "Fix intent String for starting profile management page in Manifest"
2021-04-09 22:24:58 +00:00
Peter Wang
f40897d27e
Fix intent String for starting profile management page in Manifest
...
Bug: 170507492
Test: Local
Change-Id: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
Merged-In: I6c3f36f1dd99eb4b380dce7218f85757d350bc42
2021-04-09 13:33:15 -07:00
TreeHugger Robot
7ccc647d7b
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours am: 8ec57d3e30
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Id36ed926f501ab40049c3d76cef814958cf8dfa4
2021-04-09 19:34:39 +00:00
TreeHugger Robot
8ec57d3e30
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I92487706addaddda44613b00903c4dd5c862de3a
2021-04-09 18:52:26 +00:00
TreeHugger Robot
be6b904ec5
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I8dae5afba2b9b3ad00a1c7d8ec0d254abd706901
2021-04-09 18:10:21 +00:00
TreeHugger Robot
00e30fba67
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I0f596d744078240f574e6f998cbb7dd9e8d09dfd
2021-04-09 17:27:01 +00:00
TreeHugger Robot
c3edd0b379
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Ie4514dfe4f245139b9733d903f8f36ed29af998c
2021-04-09 16:50:18 +00:00
TreeHugger Robot
d2ee0db550
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev
2021-04-09 15:58:30 +00:00
Almaz Mingaleev
f3a44236e3
Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144
am: 90d5572fa5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001
Change-Id: I75ef99ef2f008e98c12642c442e94f7daf860f69
2021-04-07 19:03:43 +00:00
Almaz Mingaleev
90d5572fa5
Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils." am: e3d4e39144
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1658001
Change-Id: Ia7c9b9c683429dcb51b79c57d745c7763a888721
2021-04-07 16:55:48 +00:00
Almaz Mingaleev
e3d4e39144
Merge "Move MIN_USE_DATE_OF_TIMEZONE to TimeUtils."
2021-04-07 16:19:33 +00:00
Treehugger Robot
53fa14267f
Merge "Modify the value of intent-filter" am: 15ecc3610d
am: e7ff215244
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989
Change-Id: If539b29f4ebdcdac637fb8ff61e1752de5af5cd2
2021-04-07 11:25:59 +00:00