Fabian Kozynski
0e552c0f36
Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11
am: 3b6faace6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11396513
Change-Id: Ibf9138f59a8c638443e28276a8fd63552dc28869
2020-07-28 19:57:53 +00:00
PETER LIANG
6c1a719a40
Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9
am: f9d34c89ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11404228
Change-Id: I2828a09d7f592f3c8335de6495e7e99a9cab0243
2020-07-28 19:57:46 +00:00
PETER LIANG
f9639a76b4
Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968
am: 74be8c7396
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11404233
Change-Id: Icd6b4d0871d21dfcfcce63716e1f6f4a21170f40
2020-07-28 19:57:39 +00:00
Edgar Wang
86f7a7e389
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
am: 01d79db1fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11404231
Change-Id: I511c2b1d0a674755674eab7c065f607598e56a21
2020-07-28 19:57:30 +00:00
Fan Zhang
7feee3521b
Merge "Add panic gesture settings page."
2020-07-28 19:33:24 +00:00
Yanting Yang
15e9c7a641
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
am: 9a29ea71a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11395550
Change-Id: Iccc674e732d271875a65e4602419424b00f33d56
2020-07-28 19:00:49 +00:00
Bonian Chen
7ebaed74c6
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb
am: c98ca2d00f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11404220
Change-Id: I3b2ec2461649fe1f4ffde4f6d0ba73c4cd4489c9
2020-07-28 19:00:37 +00:00
Kevin Maurin
42ae04a88e
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6
am: f0ba8a7f80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11400390
Change-Id: I5b32696608d4d7492c0758f1f11e41a475c06d4c
2020-07-28 19:00:30 +00:00
TreeHugger Robot
897d16da4b
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
am: b9065a0d8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390114
Change-Id: I358b3cfd2ec25dbaaa5a8ab243ad5151510c323b
2020-07-28 19:00:19 +00:00
Bonian Chen
ca4f3bc48a
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
am: a78fbae982
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367599
Change-Id: I14c6d839107df050f928cf9967a68e8cd4f68f7a
2020-07-28 18:59:57 +00:00
tim peng
64ba56f44d
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1
am: 30a4d31d6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367601
Change-Id: I64bac6ce4610ac0ca0edb35b292700ffc06485da
2020-07-28 18:50:05 +00:00
TreeHugger Robot
22211103c2
Merge "Fix the layout direction problem in RTL locale" into rvc-dev am: a49498f048
am: bb136fe79d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11393054
Change-Id: Ifb778cac140075670ee480ce4d39c157a6a325ad
2020-07-28 18:49:50 +00:00
TreeHugger Robot
15b565fb6d
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f
am: 68c0ac7d15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390113
Change-Id: Id2e391273056031f541dfce3b97bf69465b5beab
2020-07-28 18:49:25 +00:00
Marco Ballesio
62abbfac07
Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
am: 3703b15c93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11343474
Change-Id: If277d8b4b2eaa0f6beb0f19e2c737b3f7ae643e7
2020-07-28 18:10:06 +00:00
Tim Peng
68fc7625d2
PanelSlicesAdapterTest failure am: 901e1503f5
am: 6056783954
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11393053
Change-Id: Ifffcfb78826017d03e53ae826579f3783abe3cff
2020-07-28 18:09:47 +00:00
TreeHugger Robot
26a43d1a4e
Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a672
am: 0563f93000
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11389451
Change-Id: Ibc3d0ea2e28634ce6f821379d9ebf96176c9d3ea
2020-07-28 18:09:39 +00:00
Yi-Ling Chuang
560c7b0132
Merge "Revert "Display "Android Auto" in Connected Devices summary text."" into rvc-dev am: 153b336baa
am: edffa96f2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11390110
Change-Id: Ic0d7c4bc9f41f6a176fc2183e5578288fdad9f09
2020-07-28 18:09:31 +00:00
Tsung-Mao Fang
fdfbb7dedb
Merge "Update description when device allows guest user" into rvc-dev am: 6b82df2603
am: cfa8bb6a3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11317177
Change-Id: I21c6031237f05b502b5d7057b1fc8c945075e991
2020-07-28 18:09:16 +00:00
TreeHugger Robot
cb47334f19
Merge "In system nav settings, makes back inset animation full screen." into rvc-dev am: 9b940670c1
am: cccd089509
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11386979
Change-Id: I106c61e7402f1755103d6cdcc56cfc98dd371ca4
2020-07-28 18:08:55 +00:00
tim peng
2e49a0234a
Merge "Add 12dp padding above the first slice item" into rvc-dev am: 4ed5c3aac4
am: 08bee5a5a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11138560
Change-Id: I9d27023968280e0fca458c58eb97d14f1e143ebc
2020-07-28 18:08:44 +00:00
TreeHugger Robot
415ee6f1a9
Merge "Remove duplicate result for dark mode" into rvc-dev am: 6e68e34f2a
am: 57d9bcc02f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11367605
Change-Id: I622ab1a3653a43a35a9734be3cda5ca5dc4c85bb
2020-07-28 18:08:29 +00:00
Fan Zhang
0a23c4bf89
Add panic gesture settings page.
...
Ui is not final, the strings and video are placeholder only.
Bug: 161394591
Test: robotests
Change-Id: I8ada396506363e4711a1544e2c7ba1cd0e5d2dda
2020-07-28 09:54:12 -07:00
Amy Hsu
2d4bb20219
Merge "Change the UI strings of developer in Settings app"
2020-07-28 13:50:53 +00:00
Treehugger Robot
083045a9c2
Merge "More inclusive language." am: 4be2b5c2f6
am: ef56fb20c3
am: b2a470166e
am: 17c895b94c
am: ce59418d0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I773bf1dd2fb3c8ef40681a598505cff004914966
2020-07-28 11:37:05 +00:00
Treehugger Robot
ce59418d0a
Merge "More inclusive language." am: 4be2b5c2f6
am: ef56fb20c3
am: b2a470166e
am: 17c895b94c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: Ia6d55cdd8c42406e347175cdf6c769bfe7e4a83e
2020-07-28 11:25:00 +00:00
Treehugger Robot
17c895b94c
Merge "More inclusive language." am: 4be2b5c2f6
am: ef56fb20c3
am: b2a470166e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I9d4404f5d94a9b18682b260eb7ed6413fb540202
2020-07-28 11:14:07 +00:00
Treehugger Robot
b2a470166e
Merge "More inclusive language." am: 4be2b5c2f6
am: ef56fb20c3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I4cd918e07ced74d846b75f01550f57e447229d51
2020-07-28 10:58:05 +00:00
Treehugger Robot
ef56fb20c3
Merge "More inclusive language." am: 4be2b5c2f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1373177
Change-Id: I4848004145a681e49a75a3f2d6e267b32c424585
2020-07-28 10:42:13 +00:00
Treehugger Robot
4be2b5c2f6
Merge "More inclusive language."
2020-07-28 10:25:10 +00:00
Amy Hsu
d3835522a4
Change the UI strings of developer in Settings app
...
Bug: 161694718
Test: Manually check Settings app
Change-Id: I79a9b955aae70da5e19f93504b39b2191a151c8f
2020-07-28 13:48:03 +08:00
Alan Stokes
cd2c453cbd
More inclusive language.
...
Test: Builds
Bug: 161896447
Change-Id: Ie4d64dca9f4720eea532b534162e47ed81aea03b
2020-07-27 18:21:56 +01:00
Kevin Chyn
0ab0255f4a
Merge "1/n: Make ChooseLockSettingsHelper into a builder"
2020-07-27 05:33:44 +00:00
Bill Yi
953a2dc009
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b0e0a00e
-s ours am: c410ef3a43
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12230457
Change-Id: I71709c813d3d1683c7ff7708b69758abdf08b41b
2020-07-26 14:55:32 +00:00
Bill Yi
c410ef3a43
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7b0e0a00e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12230457
Change-Id: Iadd61c89433d1a0fe4d951715e369acda302eabb
2020-07-26 14:45:25 +00:00
Bill Yi
d7b0e0a00e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I96f100c3d048b2b1fdb9a5969149eba0bd677b79
2020-07-25 18:33:55 -07:00
Arc Wang
fc51452b25
[automerger skipped] Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d
am: f420f94e7d
-s ours
...
am skip reason: Change-Id Id4901d632f7f4634461ebbbc096e36d348a33365 with SHA-1 fef7216ef9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284
Change-Id: I7faf8acb261b24cdbaf79e1e0286eaed20f06a36
2020-07-25 01:18:30 +00:00
Arc Wang
f420f94e7d
Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev am: bd86a39c7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12193284
Change-Id: I14788fb9f4ce105fc4f095ccd2fdd4862022bcc9
2020-07-25 01:03:34 +00:00
Arc Wang
bd86a39c7d
Merge "Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"" into rvc-qpr-dev
2020-07-25 00:52:56 +00:00
Arc Wang
55bce77aea
Revert "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib"
...
This reverts commit ebf8ffd8fd
.
Reason for revert: b/161659380
Bug: 161659380
Test: manual, observe threads after launching 'Network & internet'.
Change-Id: I28773eac40c6bf194e3410b829a1a7b744f79597
Merged-In: Id4901d632f7f4634461ebbbc096e36d348a33365
2020-07-25 00:51:50 +00:00
Chen Chen
a9ffaaec62
BluetoothPairingRequest: Add null check for action am: 1805f666e7
am: e8dd64f891
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808
Change-Id: Ic34c9a8730c108d1d67eaeaeccdac2ab9c5ca9dd
2020-07-24 22:25:07 +00:00
Chen Chen
e8dd64f891
BluetoothPairingRequest: Add null check for action am: 1805f666e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12214808
Change-Id: I48e1d4f390a6c71c86d1c191d4b9090d1f4d29bc
2020-07-24 22:07:57 +00:00
Chen Chen
1805f666e7
BluetoothPairingRequest: Add null check for action
...
Bug: 159728132
Test: Build
Change-Id: I24668e20accf96c7469c9e1ab589b1383ab59d18
2020-07-24 18:15:19 +00:00
Kevin Chyn
b13bc50542
1/n: Make ChooseLockSettingsHelper into a builder
...
The multitude of slightly different launchConfirmationActivity(*)
methods are a big unsustainable pyramid. It's too difficult to
read, too difficult to track which clients are interested in which
parameters, and too difficult to add new parameters, since we need to
1) Read through all of them and find one that's the closest
2) Try not to affect other callers, so potentially add yet another
3) Modify the internal paths, which all basically call each other
until it reaches the biggest launchConfirmationActivity which
has ALL of the parameters
This change should have no behavioral change.
Note: CredentialStorage doesn't need returnCredentials anymore as of
ag/6073449
Test: make -j56 RunSettingsRoboTests
Test: Manually traced code paths for each invocation. A few hidden
dependencies (such as explicitly setting challenge=0 with
hasChallenge=true) were found. Left them the way they were in
case they were intended
Test: Enroll face, fingerprint
Test: Enable developer options
Test: Change to PIN, Pattern, Password, then back to PIN (so each
type requests confirmation)
Test: adb shell am start -a android.app.action.CONFIRM_DEVICE_CREDENTIAL,
authenticate
Test: adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL
(shows confirm credential screen)
Fixes: 138453993
Change-Id: Ic82ef3c3ac2e14d624281921f2d816bcdacbd82b
2020-07-24 11:13:13 -07:00
TreeHugger Robot
965d3d37b3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bea26691e2
-s ours am: 125b8d1ea1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12213755
Change-Id: I4714f83f634715bc8b48b38eac2b7a764b56c40f
2020-07-24 16:40:48 +00:00
TreeHugger Robot
855af64db8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2a5fd7c6ad
-s ours am: 5516b6cbd0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12226482
Change-Id: I08d58e4d48b038f2526232ef73debf7a39e5df35
2020-07-24 16:40:34 +00:00
TreeHugger Robot
125b8d1ea1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bea26691e2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12213755
Change-Id: I623b723848388158bd97fdb0a0d3cd93c7ccff17
2020-07-24 16:29:37 +00:00
TreeHugger Robot
5516b6cbd0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2a5fd7c6ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12226482
Change-Id: I6d080ca5055224082044b620a1e3138123abebf2
2020-07-24 16:29:28 +00:00
TreeHugger Robot
bea26691e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-07-24 16:19:51 +00:00
TreeHugger Robot
2a5fd7c6ad
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2020-07-24 16:14:39 +00:00
Bill Yi
a7c91c79a0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id76718f68db5dab542ea821cd972ee9338eaa64c
2020-07-24 07:31:31 -07:00