Commit Graph

74229 Commits

Author SHA1 Message Date
Bonian Chen
522841a340 [automerger skipped] Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9 am: 1e328285b7 -s ours
am skip reason: Change-Id I286c4879d55e28707081d4cacba1a2c444f92646 with SHA-1 c3a453174e is in history

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

Change-Id: I6a0cc537207cdb772ec26f347b570c14ebc9a5f4
2020-08-05 06:36:19 +00:00
Bonian Chen
05b07f424e Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387127

Change-Id: I9e2af4dda890ab5b13aa049430161eab1d602df3
2020-08-05 06:11:11 +00:00
Bonian Chen
1e328285b7 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" am: b3b25c39c9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387126

Change-Id: I9389e2226554123fd25844c27aa24e6b13466124
2020-08-05 06:11:00 +00:00
Bonian Chen
f534811627 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours am: 8c81b0f412 -s ours am: 84c6336cff -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: Ic49870f5f08be705c23bf5df88a8c1ef9e8e8a38
2020-08-05 06:09:09 +00:00
Bonian Chen
622da45ee6 Merge "[Settings] Data roaming warning only when turn ON" 2020-08-05 05:58:13 +00:00
Bonian Chen
b3b25c39c9 Merge "Removed reference to PhoneConstant PHONE_TYPE_*" 2020-08-05 05:55:32 +00:00
Bonian Chen
84c6336cff [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours am: 8c81b0f412 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: I0efa0bf0f9ecdbb870f3903145efeba3ce410c0a
2020-08-05 05:52:40 +00:00
Bonian Chen
8c81b0f412 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours am: 620f9c0b28 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: If5b7a1461b5a8fef8526f91689f3938ff6d4e4ef
2020-08-05 05:36:40 +00:00
Bonian Chen
620f9c0b28 [automerger skipped] Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5 am: f5557102c9 -s ours
am skip reason: Change-Id Icd131f133e47dae0770a4da71c51de3c2a94b42b with SHA-1 640e56433f is in history

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

Change-Id: If56211f627d1898c14db2c7fc3ecb491ec1cdda9
2020-08-05 05:15:37 +00:00
SongFerngWang
7e045ab9f6 Mainline: removed legacy UI for network selection mode.
This cl base on ag/10098777. Now inserted inactive pSIM
will be included in Telephony's get available and
get selectable subInfo list so that logic is no longer
needed.

Bug: 147128878
Test: build pass
Merged-In: I1a0f431f05268d29afce145c3eb720594cfc57a3
Change-Id: I54ed8c69edcdc618f8cf8df8af0fffc8c4f187e8
2020-08-05 12:58:53 +08:00
Bonian Chen
f5557102c9 Merge "Remove logic to manually search inactive pSIM." am: 144e2b41f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387129

Change-Id: I84e8bf96b0d58f5833e00effaee52e120f77fa98
2020-08-05 04:57:19 +00:00
Bonian Chen
144e2b41f5 Merge "Remove logic to manually search inactive pSIM." 2020-08-05 04:39:45 +00:00
Bill Yi
c5bfd20042 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1d989aa630906a9aef4c31952fb90712a542602
2020-08-05 02:14:15 +00:00
Sally
a76f8ce443 Add grayscale support
Bug: b/111940818
Test: test added mode under Settings-> Accessibility -> Color correction
Change-Id: I7d71152775836771ae6ebaa6af0f2e89215e744b
2020-08-05 01:19:17 +00:00
Bill Yi
3d88c92bb3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I10b1f760c4f7e55be7feef9dfe6e1881fd07d85f
2020-08-05 01:00:16 +00:00
Xin Li
d2b2a4e126 Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I398e0d1f652bafc92f99b05d665cf1f9018cc6fa
Change-Id: I1129dba865eb6acaa047bc43e3057d02d8528ff0
2020-08-04 15:30:39 -07:00
TreeHugger Robot
6300e98b1f Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 18:52:54 +00:00
Kevin Chyn
5224c86444 Merge "Save mConfirmingCredentials state" 2020-08-04 17:37:32 +00:00
TreeHugger Robot
6daf67a792 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 15:40:55 +00:00
TreeHugger Robot
6a68e2f216 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 15:39:56 +00:00
Edgar Wang
21f8cb3a44 Refactor Reset options Settings
Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I94969f6903d047b9bc41b1e8c14096c92c460b38
2020-08-04 23:33:50 +08:00
Julia Reynolds
8f1309a69d Merge "Allow DND screens on low ram devices" into rvc-qpr-dev am: 74c6c21b96 am: 885da59d6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12294001

Change-Id: I8d05cc9b93c4dd75384f463988bfd915001ba94e
2020-08-04 14:18:32 +00:00
Julia Reynolds
885da59d6a Merge "Allow DND screens on low ram devices" into rvc-qpr-dev am: 74c6c21b96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12294001

Change-Id: I1e318a02298759aa95d71459508273d7985a2696
2020-08-04 13:52:25 +00:00
Julia Reynolds
74c6c21b96 Merge "Allow DND screens on low ram devices" into rvc-qpr-dev 2020-08-04 13:27:06 +00:00
Bonian Chen
ec6100243b [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours am: 633fb21411 -s ours am: 08e0f19067 -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: I7c6cc702cbee2f45187bc58c994a11f1f59471e5
2020-08-04 12:06:52 +00:00
Bonian Chen
b618a0852a [automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours am: d35e25c295 -s ours am: fe652a5641 -s ours am: 2d0b2a0c3f -s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history

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

Change-Id: I75693bfcd6579fccb6d11041b152cd3c7eeb23ac
2020-08-04 12:06:42 +00:00
Bonian Chen
08e0f19067 [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours am: 633fb21411 -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: Ia75fb4de72f25ce6fbfc74f926262eff63b3bede
2020-08-04 11:52:26 +00:00
Bonian Chen
2d0b2a0c3f [automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours am: d35e25c295 -s ours am: fe652a5641 -s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history

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

Change-Id: Iadfbb00c1a6ea41d3e6633a8b4156549939e06c2
2020-08-04 11:52:10 +00:00
Bonian Chen
633fb21411 [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours am: 0f7a0642de -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: Ie129b1d13ee9f466741127d55dc2e505e51ba3e3
2020-08-04 11:30:54 +00:00
Bonian Chen
fe652a5641 [automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours am: d35e25c295 -s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history

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

Change-Id: I68bdb1e2c58467b7d79a2fcfd6461f284835478e
2020-08-04 11:30:38 +00:00
Sunny Shao
0e855382f1 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -s ours am: 6a0a44ba16 -s ours am: 5181948f08 -s ours am: bd78f5d4d3 -s ours am: c101eac32b -s ours am: 644c6af4fb -s ours am: 6dc6e78cc4 -s ours am: 828210acda -s ours
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I611ba80d6d8bd51bba9095ac99f9ae17ab3fb49c
2020-08-04 11:10:46 +00:00
Jakub Pawlowski
5b45b6eed9 Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb am: 682c00d893 am: 62ec2b5aa0 am: 01251764ce am: 06828a4a9f am: ee42cb271c am: bae9a9e47b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I82a7af52b57175fc1525f6d315c8dee6d547feb2
2020-08-04 11:10:36 +00:00
Jakub Pawlowski
2cf3fd61a3 Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2 am: ea460a8527 am: 7d38515814 am: a4e4323fc1 am: 797fb6d0af am: 134c2f20a2 am: 38791c1984
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: Ie0964c27b086f014163a65e8694d3fc459e5d4a8
2020-08-04 11:10:14 +00:00
Sunny Shao
a576db71f3 [automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -s ours am: 0240abd711 -s ours am: fd9977a094 -s ours am: a1e734b558 -s ours am: 7d05af5388 -s ours am: e26dae4cc7 -s ours am: ffcbb09a12 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I3ad2e169fa184ddee42969d19eb6ab57a09000ea
2020-08-04 11:09:45 +00:00
Mill Chen
c4f745b68c [automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09 am: d3abc029bc -s ours am: 57f93997d7 am: b5a0b4f7a8 am: 8dc494d0f7 am: 9161044325 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d5bfbe4d03734afc301fe8d34553b59c0765cda
2020-08-04 11:09:17 +00:00
Mill Chen
975f338f72 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1 am: 2bbc2529a8 am: 60d8cc727d am: a2ef19bb97 am: 4828c73931 am: 39d0752789 am: ec9ede0441
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: Id804fb769bf84c33a0ffe1fde4c2c4f079effcc9
2020-08-04 11:09:06 +00:00
Sunny Shao
6d5ca814e7 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -s ours am: 6a0a44ba16 -s ours am: 5181948f08 -s ours am: bd78f5d4d3 -s ours am: c101eac32b -s ours am: 3a4190e88b -s ours am: d94f74a752 -s ours am: 398aba60b3 -s ours
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: Ie3f2e376fef9c117314345bf50529b9fecc67e53
2020-08-04 11:08:46 +00:00
Jakub Pawlowski
69f3d47dfc Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb am: 682c00d893 am: 62ec2b5aa0 am: 01251764ce am: 3afa3cd405 am: 00950b7d6d am: ea59fa2f59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: Ic7b3f5f974075d9539f690348434ba5e19887c35
2020-08-04 11:08:31 +00:00
Jakub Pawlowski
f58fcb218c Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2 am: ea460a8527 am: 7d38515814 am: a4e4323fc1 am: 4f1d128ffa am: 661788efbb am: a22c0e9255
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I31cee23b48a5fffcfaf04e271a47e768032de300
2020-08-04 11:08:13 +00:00
Sunny Shao
3ac0357c6e [automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -s ours am: 0240abd711 -s ours am: fd9977a094 -s ours am: a1e734b558 -s ours am: 566e54e616 -s ours am: 6301cef017 -s ours am: 21d57723f9 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: Ifb6d0eff4a1a8cb0beda781000d7d4486420e19a
2020-08-04 11:07:45 +00:00
Mill Chen
56afd65c4c [automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09 am: d3abc029bc -s ours am: 57f93997d7 am: d988a5ca4d am: 1d3ffe6578 am: 8de59262e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If238f043c30ef2dbb4c2363cad272f6353a9c043
2020-08-04 11:07:34 +00:00
Mill Chen
e3cb991663 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1 am: 2bbc2529a8 am: 60d8cc727d am: a2ef19bb97 am: 1202e45210 am: 66dda042e3 am: f306d1b563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: I0cd8811ad511301d879443e29aa0b95f65548a57
2020-08-04 11:07:18 +00:00
Sunny Shao
d95f6db4ee [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 573599b628 -s ours am: b2eac1654f -s ours am: e615d96b9b -s ours am: 6a0a44ba16 -s ours am: 5181948f08 -s ours am: bd78f5d4d3 -s ours am: c101eac32b -s ours am: 644c6af4fb -s ours am: 1fd688bd67 -s ours am: 3835bfbea0 -s ours
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

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

Change-Id: I124cb822f83416dcb6010a90045b1cf0c4745d34
2020-08-04 11:06:57 +00:00
Jakub Pawlowski
ea231c341a Prevent overlay drawing on top of Bluetooth discovery request dialog am: ac67100423 am: 2094f01676 am: 0b7ce7660c am: fa8d015bdb am: 682c00d893 am: 62ec2b5aa0 am: 01251764ce am: 06828a4a9f am: 1afe980769 am: db9a0515b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I93048a42117393462100cf99208a2605d1bed5e0
2020-08-04 11:06:42 +00:00
Jakub Pawlowski
fc79d89864 Prevent overlay drawing on top of Bluetooth pairing dialog am: 3f5bf02fd8 am: a0c963ba95 am: 368fc30e37 am: 988d9633c2 am: ea460a8527 am: 7d38515814 am: a4e4323fc1 am: 797fb6d0af am: f8fa5e3831 am: dffc905077
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: Ifd7652209b72db5c957caa3ff99e7c7dc1da0738
2020-08-04 11:06:24 +00:00
Sunny Shao
0411bf7572 [automerger skipped] Allows to launch only authenticator owned activities am: 4b6e82fd5d am: fcc0b2872d -s ours am: e791be54f2 -s ours am: 83cadecf04 -s ours am: 0240abd711 -s ours am: fd9977a094 -s ours am: a1e734b558 -s ours am: 7d05af5388 -s ours am: c8ad5dc6c4 -s ours am: 3ea1fc6b89 -s ours
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

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

Change-Id: I9f26e2942ea0420383972103738c0604b3fd1116
2020-08-04 11:06:00 +00:00
Bonian Chen
0f7a0642de [automerger skipped] Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa am: 603dcc1856 -s ours
am skip reason: Change-Id Ic520bc34c5a460b4fcd199cd524b180d307e9ab4 with SHA-1 fb4a0c25e0 is in history

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

Change-Id: I715e838ade3a2eae24736c8fef55c18f21670a41
2020-08-04 11:05:32 +00:00
Mill Chen
24e6aeb7cf [automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2 -s ours am: 5045f120af am: 7bdd4b3273 -s ours am: 5f16b03f50 -s ours am: c54d68ea09 am: d3abc029bc -s ours am: 57f93997d7 am: b5a0b4f7a8 am: 265af06fb4 am: eedb19a232 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I993a10ec66b7fec1c98e95a2e6397fd23f0f0736
2020-08-04 11:05:28 +00:00
Bonian Chen
d35e25c295 [automerger skipped] Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 am: 6a4d09c4ed -s ours
am skip reason: Change-Id I2a72d409574fc281e5de57d58a27551dd040d551 with SHA-1 762e193266 is in history

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

Change-Id: I20ef63c25a5ea334d75cbacc57664d6cb9defa29
2020-08-04 11:05:19 +00:00
Mill Chen
97695d3f86 [automerger skipped] Prevent accounts page directly opening in screen pinning mode am: 6c2f32b3ae -s ours am: a6a08263f2 am: 1958831a8c am: 5c7ca93bf1 am: 2bbc2529a8 am: 60d8cc727d am: a2ef19bb97 am: 4828c73931 am: 1bcd658339 am: ed5d1f0bb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: Id882ec37fd8ed199c2e144c21cafe65a3327b085
2020-08-04 11:04:59 +00:00