TreeHugger Robot
e7f2851aa8
Merge "Remove interactors from voice input settings" into sc-dev am: 9edb779e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774548
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaeccc4abb6f8d16955f496ef61f6114f7b099006
2021-03-12 17:16:46 +00:00
TreeHugger Robot
f71786b0c0
Merge "Launch channel settings as half sheet" into sc-dev am: d0fa5b2054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13844943
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac72b27a93c1ee6a5bfdb21c87c4336ef1e73670
2021-03-12 17:16:31 +00:00
TreeHugger Robot
9edb779e45
Merge "Remove interactors from voice input settings" into sc-dev
2021-03-12 17:16:16 +00:00
TreeHugger Robot
d0fa5b2054
Merge "Launch channel settings as half sheet" into sc-dev
2021-03-12 16:45:56 +00:00
Julia Reynolds
efe26e2d44
Launch channel settings as half sheet
...
If opening app has requested only a subset of fields
Test: manual - launch from an app, filtered and unfiltered, for
normal channels and conversations
Bug: 177246841
Change-Id: Ifd70478101d1ea1340d2ecc55033fab55e65ca92
Change-Id: I5194b959c82b2cfa7990c84285aaf69464cff3a8
2021-03-12 09:58:41 -05:00
Victoria Lestari
b3729f6675
Remove interactors from voice input settings
...
Bug: 180960127
Tested: on device, emulator
Change-Id: I53a74e5d003a662b1e86a1c2d77e73ba84262201
2021-03-12 14:42:38 +00:00
TreeHugger Robot
4679d28db6
Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev am: 8d73578b5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849826
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3ac030f70fbc04356a83c062e8fbe7f14efa174d
2021-03-12 13:04:49 +00:00
TreeHugger Robot
8d73578b5f
Merge "[Provider Model] Show Off if WFC is disabled by user" into sc-dev
2021-03-12 12:32:38 +00:00
TreeHugger Robot
88b7ac7db2
Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev am: cba72ddc2e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id9874abefc659053e399b3f36bcc9af8e8aac5f7
2021-03-12 10:57:34 +00:00
TreeHugger Robot
cba72ddc2e
Merge "[Provider Model] Adjust slice title and subtitle" into sc-dev
2021-03-12 10:19:26 +00:00
tim peng
e030f4c335
Merge "Update strings and tag it translatable" into sc-dev am: f90be25ca8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13839796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idcdefc489cd0bc8bafaf027378aba37f8100896c
2021-03-12 09:02:41 +00:00
tim peng
f90be25ca8
Merge "Update strings and tag it translatable" into sc-dev
2021-03-12 08:22:12 +00:00
Zoey Chen
dc1ec2d092
[Provider Model] Show Off if WFC is disabled by user
...
Bug: 182232693
Test: make and atest
Change-Id: I0ef0a09adb1c9636ec14e0ab71116fd2834f1f97
2021-03-12 15:30:07 +08:00
Weng Su
d76f0bdd0d
Merge "[Provider Model] Update Airplane mode message" into sc-dev am: d0e98010c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815926
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a4d0846fddf4265ba771423f5dbaa302c9d3b24
2021-03-12 07:29:56 +00:00
Weng Su
d0e98010c4
Merge "[Provider Model] Update Airplane mode message" into sc-dev
2021-03-12 07:04:52 +00:00
Weng Su
8ce423cdd2
[Provider Model] Update Airplane mode message
...
- Show Airplane mode message when Airplane mode is enabled
- Show the same message whether Wi-Fi is enabled or disabled
- Screenshot:
https://screenshot.googleplex.com/9FgqG7WWskRLZxo
https://screenshot.googleplex.com/4g4kvnAT6aYN57s
Bug: 181858434
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I3cb5a8bc7cb4d1e8678eb6d75116effd00ac9432
2021-03-12 11:49:46 +08:00
Tim Peng
624770a51d
Update strings and tag it translatable
...
-"Use bluetooth" -> "Use Bluetooth"
-"Use Dark Theme" -> "Use Dark theme"
Bug: 181358643
Test: manual
Change-Id: Ia999ddca2244653c3d2d32f5ea4c4e53f1c72d89
2021-03-12 10:57:35 +08:00
Sooraj Sasindran
d7b83d95fc
Merge "update isCrossSimCallingEnabledByUser name" into sc-dev am: 14a2fd6bc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13832226
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6e6c7e33df7ec8d42c1309f87eaf3125c6807fff
2021-03-12 00:10:29 +00:00
Sooraj Sasindran
14a2fd6bc1
Merge "update isCrossSimCallingEnabledByUser name" into sc-dev
2021-03-11 23:55:50 +00:00
TreeHugger Robot
05407c2877
Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev am: 9086ed36a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13828690
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icd01c7b441bbdd6c67d939f63d061393a60e255a
2021-03-11 23:14:48 +00:00
TreeHugger Robot
9086ed36a8
Merge "Fallback to AOSP eSOS settings page if OEM impl fails" into sc-dev
2021-03-11 22:37:50 +00:00
TreeHugger Robot
38b8dcc95c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240 -s ours am: 9444cfa8cf -s ours am: 0936026260 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic48b50c1d9929b763afb9b1fddb82b508544a805
2021-03-11 20:47:03 +00:00
TreeHugger Robot
7b86a2faf9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322 -s ours am: d3faa11064 -s ours am: 952a6a9214 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I004e9fda44272af90e3d2cdd9063c2604c776315
2021-03-11 20:46:09 +00:00
Fan Zhang
9fdceaea78
Fallback to AOSP eSOS settings page if OEM impl fails
...
When OEM eSOS implementation fails for any reason (app disabled,
misconfigured, etc), Emergency SOS settings should fallack to the
default settings page (rather than hiding the setting entirely)
Bug: 180959553
Test: robotests
Change-Id: I31c08449eff3f01d4c33bf827023f17beade93c2
2021-03-11 20:30:55 +00:00
TreeHugger Robot
0936026260
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240 -s ours am: 9444cfa8cf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4179b17ce23649f291435a8f6747f3490636f28b
2021-03-11 20:11:41 +00:00
TreeHugger Robot
952a6a9214
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322 -s ours am: d3faa11064 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba5c301a838912b0f27af6916d3fe08d35713acc
2021-03-11 20:11:33 +00:00
TreeHugger Robot
9444cfa8cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b19a631d045bb90a6e9fb2205e5256b163a6028
2021-03-11 19:25:43 +00:00
TreeHugger Robot
d3faa11064
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I096c84edb684d619d339a541ee249f556eca944f
2021-03-11 19:25:32 +00:00
TreeHugger Robot
36288fc240
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-11 18:43:56 +00:00
TreeHugger Robot
f6ba91f322
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-11 18:42:47 +00:00
Sally Yuen
478c674a44
Merge "Add seekBar properties 'tickMark' to LabeledSeekBarPreference" into sc-dev am: c2025d7180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830588
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id111eaf252409f2fc74a507929ae13edcacd6be9
2021-03-11 18:11:31 +00:00
Sally Yuen
c2025d7180
Merge "Add seekBar properties 'tickMark' to LabeledSeekBarPreference" into sc-dev
2021-03-11 17:41:42 +00:00
Almaz Mingaleev
c045a4771c
Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev am: 4a3ff95367
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816452
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f5f61da265c95dece22d069d181ffb75a37b1bf
2021-03-11 14:22:30 +00:00
Almaz Mingaleev
4a3ff95367
Merge "Move GeoTZ toggle to Date&Time settings screen." into sc-dev
2021-03-11 14:04:01 +00:00
Andras Kloczl
0ca761f16e
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 601902f3dc -s ours am: 8210550151 -s ours am: 4239c9047e -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add669 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3d6605d9b06d31e62ea62de5e3580721e5a1f2b
2021-03-11 12:17:26 +00:00
András Klöczl
4078dd9e7e
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours am: 5715f4301e -s ours am: a1e59f0a6a -s ours am: 3ff966da98 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add669 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I819400afec25b07928d5bf73f7c638ba0383b5fb
2021-03-11 12:17:20 +00:00
Andras Kloczl
507ab7e61b
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7c4f563b62 -s ours am: fb94b7d113 -s ours am: 4008f54081 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id7e83454f8cee5b2f4a992e9384b740b7a0350a1
2021-03-11 12:16:21 +00:00
Andras Kloczl
4239c9047e
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 601902f3dc -s ours am: 8210550151 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add669 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If239a1de2199474d60ca6db8f4a1452047ed26e7
2021-03-11 12:02:30 +00:00
András Klöczl
3ff966da98
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours am: 5715f4301e -s ours am: a1e59f0a6a -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 6746add669 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I38ebf7b94eeaec82c9596e08f3fe83ebf3dd971b
2021-03-11 12:02:24 +00:00
Andras Kloczl
4008f54081
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7c4f563b62 -s ours am: fb94b7d113 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I067bd1ba1abcaa53c4854817a52e98aef6f17660
2021-03-11 12:02:17 +00:00
TreeHugger Robot
30b55b0e44
Merge "Fix no apps text overlapping with filter bar" into sc-dev am: de9bcbb198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85146a6f363c9e39379bf3c5758864f12a866234
2021-03-11 12:00:20 +00:00
Automerger Merge Worker
1d944fcc7e
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 1d48089aa2 -s ours am: 963c939143 -s ours" into sc-dev am: 17027f55bf -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I528d749f8c43bc75c5d24c37fd2bab2b8bb3dacf
2021-03-11 12:00:17 +00:00
Automerger Merge Worker
d49172b2df
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 4989788b15 -s ours" into sc-dev am: 8b747a8637 -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a875a4a06e149720e25994b3eb21c03f276927a
2021-03-11 12:00:11 +00:00
Andras Kloczl
4b881fbdb3
[automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c -s ours am: 94872d6be0 -s ours am: f9eacae4a0 -s ours am: 9b6dcc321f -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If84e18df5901b90728c2739048dcfab644805e42
2021-03-11 12:00:03 +00:00
András Klöczl
be587d74a4
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9 -s ours am: 28539c02dd -s ours am: e690821501 -s ours am: fca809b408 -s ours am: a8dc64691b -s ours am: 203585f40d -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie105f2c0a3899ea67e93dfab6960d25a069eb369
2021-03-11 11:59:52 +00:00
Automerger Merge Worker
7ab944018e
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 07e414017c am: 0e9cbfc86e -s ours" into sc-dev am: 638a96896e -s ours
...
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec7e92e51ebb810329b65598fb09ccef27779e5a
2021-03-11 11:59:40 +00:00
Andras Kloczl
2c2c565c37
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours am: 7ed616c466 -s ours am: 73f14dcdf2 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2a83409801af9cabf27e04d8713fc6eab0adf0d3
2021-03-11 11:59:27 +00:00
Andras Kloczl
f436ab1d9e
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours am: 6355d222cd -s ours am: 5133ac1f70 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc470c0a5aed7c65f7aa8f847772ffaa84494e68
2021-03-11 11:59:21 +00:00
Andras Kloczl
8d009addd3
[automerger skipped] Prevent using invalid result uri during multi user image change am: e36357b20c am: 7f3b720d75 -s ours am: d065d46ab9 -s ours
...
am skip reason: Change-Id I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I931c66e09c4343b3699d40d8554d93a78018de05
2021-03-11 11:57:29 +00:00
Andras Kloczl
8210550151
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669 -s ours am: 94ed37dacf -s ours am: b21072b773 -s ours am: 4f095b1a6b -s ours am: cb10105fe1 -s ours am: 601902f3dc -s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d2861dafde2d11d39741db7189d6586542d6851
2021-03-11 11:37:15 +00:00