SongFerng Wang
fd8d5b5c7c
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev am: 516042b160
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13740140
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5b32dd44562fbe0eb9d3a8b37b42007563eadb5b
2021-03-12 18:59:57 +00:00
SongFerng Wang
516042b160
Merge "Change the behavior of notifyAllowedNetworkTypesChanged." into sc-dev
2021-03-12 18:49:49 +00:00
TreeHugger Robot
3e4e0befff
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: Ib783c1ff5eedcb72096731111eb080c9398822d8
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
63dbfe49ee
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: Id5db8ab3c01fb336ee6dec0fdf02a500976607a1
2021-03-12 17:15:38 +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
Sunny Shao
1e508a4280
Fix the issue of the repo upload hooking checker
...
Fixes: 182555684
Test: repo upload test
Change-Id: I80a4d4de84b6d54a7b50c325b51b832b7b40b133
2021-03-12 22:25:10 +08:00
TreeHugger Robot
c1b9468efd
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: I4d251557d1f07d58aca263070e764ada5dd1aec1
2021-03-12 13:04:42 +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
Stanley Wang
751dff2bf6
Remove the non-translatable tags from MainSwitch titles.
...
The titles of MainSwitch need to be translated.
Fix: 182540501
Test: run Robotest
Change-Id: I4a07c599e607644729718543a12d4e9147117e78
2021-03-12 19:52:07 +08:00
Zoey Chen
b8a639f8fd
[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen
...
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
2021-03-12 19:27:05 +08:00
TreeHugger Robot
1d98f112cd
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: I16e5f5e1815602d36401b9801e4d368868c93eca
2021-03-12 10:57:36 +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
a5ab8a1b6f
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: Ic310868d1b25a8c7b773d1dfb9e4ea9353e3ef3f
2021-03-12 09:02:34 +00:00
Tsung-Mao Fang
121041cf58
Only display single line for title
...
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.
Change-Id: Ifc3cc689a221830c6687b7d69cf86f1ed7f2d698
Test: Built the apk and saw single line title.
Bug: 169936038
Merged-In: I0c9d80273ed752c5a83afcad18d67400bcfc1618
2021-03-12 08:34:57 +00:00
tim peng
f90be25ca8
Merge "Update strings and tag it translatable" into sc-dev
2021-03-12 08:22:12 +00:00
Yanting Yang
a1a30296ae
Fix NPE for ConfigureNotificationSettings
...
The NPE is caused by that we have removed the advanced category from
Notification page for android S design but it still tries to get
category and call setInitialExpandedChildrenCount in onCreate().
Only run the relevant logic on the old design since it’s only used to
expand the advanced category and we don’t need the expand feature
anymore for android S.
Bug: 182237530
Fixes: 182532954
Test: robotest & manual
Change-Id: I96f35fa40221079d5498d9d2fab9c75d64698808
2021-03-12 16:11:23 +08: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
7b04b316ed
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: I181d2ad73e8c82424dab13cbc7489c01ec8145e9
2021-03-12 07:29:54 +00:00
Weng Su
d0e98010c4
Merge "[Provider Model] Update Airplane mode message" into sc-dev
2021-03-12 07:04:52 +00:00
Hugh Chen
9d00364da4
Fix bluetooth settings will broadcast to anywhere when some cases
...
BluetoothPermissionActivity and DevicePickerFragment will send
broadcast to return the result to calling apps. As this broadcast
intent is from Settings with uid 1000, it will be sent to any
protected BroadcastReceivers in the device. It can make an attacker
send broadcast to protected BroadcastReceivers like factory reset intent
(android/com.android.server.MasterClearReceiver) via
BluetoothPermissionActivity or DevicePickerFragment.
This CL will compare to calling package name with launch package name.
If they are not equal, the broadcast will not send to launch package name.
Bug: 179386960
Bug: 179386068
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify factory reset not started and no system UI notification.
Change-Id: Ib8a5acde663e875912d300dd4912c4e9416f02f1
2021-03-12 14:56:57 +08:00
Sooraj Sasindran
7f444ead2f
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: I2bcaee92a2e2c26431e9928780cda8e6d004ee25
2021-03-12 04:19:51 +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
14a2fd6bc1
Merge "update isCrossSimCallingEnabledByUser name" into sc-dev
2021-03-11 23:55:50 +00:00
TreeHugger Robot
1f657a95ae
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: I3636c58d85d3df9945418203333f62ec20ced928
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
73fd0ea929
[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: I1e3c3442413c64768b24a7f911b8169b38e07a56
2021-03-11 20:46:43 +00:00
TreeHugger Robot
671037ed02
[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: Ic152fa390a94346181803e15a96de950c61594ab
2021-03-11 20:45:50 +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
7e6061b48e
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: I092a0b428a57f99b81a9d9215217e95a9d2601d6
2021-03-11 18:11:22 +00:00
Almaz Mingaleev
a29a6ceab4
Fix imports in LocationTimeZoneDetectionPreferenceController.
...
Capabilities are extracted to separate class to reuse them
in time API.
Bug: 172891783
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"
Change-Id: If7351c4f022c69262ddffd26efacd449dc7238c5
2021-03-11 17:58:26 +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
5238602615
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: Ia67d2fba5b231a7508158c61df75cae77717b4ab
2021-03-11 14:22:19 +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
ea50b67c9b
[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: I2534cb8c25cbe6df6a1c343de14ad6a3b5a6193c
2021-03-11 12:16:39 +00:00
András Klöczl
ed68b53413
[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: If8019edab7b0c9c4641a45398759ff6035815a48
2021-03-11 12:16:31 +00:00
Andras Kloczl
2907c44bad
[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: Ibf0bdb7d8591e7a12c5b2be0136d8ccaa1fca5eb
2021-03-11 12:15:58 +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
a42f51cca0
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: I32cecc6ad780ebfaa999457f88ad6a16194efc5b
2021-03-11 12:00:44 +00:00