PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,229 Commits 1 Branch 0 Tags
d43fcdaf495a9bdebd20235f16b80bd8b648556c
Commit Graph

74229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Malcolm Chen
3805373f90 Remove logic to manually search inactive pSIM. 
Nowe 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: unittest
Merged-In: Icd131f133e47dae0770a4da71c51de3c2a94b42b
Change-Id: I9ba5dded7817116c02d70298c9c271ff6a99925b
 2020-08-04 18:57:37 +08:00
Sunny Shao
828210acda [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 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: Ic41c1c4edbec8237b8dfb997a17fcd37b51fa965
 2020-08-04 10:55:26 +00:00
Jakub Pawlowski
bae9a9e47b 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I61d10981c9e948ffd161ada3860401dd9901e7db
 2020-08-04 10:55:17 +00:00
Jakub Pawlowski
38791c1984 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I02a97cae08b74e4bfeaa2c355b1c2b35a0e93523
 2020-08-04 10:54:54 +00:00
Sunny Shao
ffcbb09a12 [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 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: I9ff8ee79b35c1ad9765af7604c53edd39299d27a
 2020-08-04 10:54:30 +00:00
Mill Chen
9161044325 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: I2898b420f57440d082644cbd8d277368b4c4c48c
 2020-08-04 10:54:09 +00:00
Mill Chen
ec9ede0441 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: I5c46b6420281db193ba0026855a536d496106c20
 2020-08-04 10:53:53 +00:00
Sunny Shao
398aba60b3 [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 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: Ie8375beea4160004ac787631e11a1a8dccad256e
 2020-08-04 10:43:11 +00:00
Jakub Pawlowski
ea59fa2f59 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I7eedb368053677906c32d3fb17b7c438423d5385
 2020-08-04 10:42:58 +00:00
Jakub Pawlowski
a22c0e9255 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: Ia2224bd6ff84049e2e12d1979d98404790bf2677
 2020-08-04 10:42:46 +00:00
Sunny Shao
21d57723f9 [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 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: I50f3b29c7afa37d16f2b716133613af5b3f8959b
 2020-08-04 10:42:32 +00:00
Mill Chen
8de59262e7 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: I9927b818b78513b18654cdd6995ddc6a7b030c85
 2020-08-04 10:42:16 +00:00
Mill Chen
f306d1b563 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: I37e3a45295dd90a6dbaeb0c36080a8316d288d5f
 2020-08-04 10:41:59 +00:00
Bonian Chen
603dcc1856 Merge "[Settings] Avoid crash when switch SIM during PIN lock" am: 9057a78bfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387124

Change-Id: Id886131d82e274572e4277ed8d8f0f61513a8d65
 2020-08-04 10:41:58 +00:00
Bonian Chen
6a4d09c4ed Merge "mainline: remove CarrierConfigManager.init" am: eff795f061 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387120

Change-Id: I79a3a67123c110eb2ccbba5c0e54598bcc99c86e
 2020-08-04 10:41:43 +00:00
Sunny Shao
3835bfbea0 [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 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: Iaf9ea214419944f6695d79e64660879d08aabeec
 2020-08-04 10:41:39 +00:00
Jakub Pawlowski
db9a0515b1 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I356cdf6bb6e749d93f6651da2fe15263e64ed60b
 2020-08-04 10:41:28 +00:00
Jakub Pawlowski
dffc905077 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: Ie12a80b6ff810c42c3c7e163d6241698270439c4
 2020-08-04 10:41:15 +00:00
Sunny Shao
3ea1fc6b89 [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 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: I07ce7cea5b8e09a7b6288c64788f729c030655a3
 2020-08-04 10:40:58 +00:00
Mill Chen
eedb19a232 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: I8316cd70cffd0ab94dc48c5beea05d2a5c55e3ef
 2020-08-04 10:40:46 +00:00
Mill Chen
ed5d1f0bb4 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: Iaed9c2b681c09e4acc04775ed606d45a361d29fc
 2020-08-04 10:40:29 +00:00
Bonian Chen
9057a78bfa Merge "[Settings] Avoid crash when switch SIM during PIN lock" 2020-08-04 10:37:12 +00:00
Bonian Chen
76bd28fe60 [Settings] Data roaming warning only when turn ON 
handlePreferenceTreeClick() goes after setChecked() however
configuration may have been altered within setChecked().

Follow same design within MobileDataPreferenceController to fix this
issue. A boolean state will be maintained as the condition when warning
dialog is required when click.

Bug: 148491064
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Merged-In: I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d
Change-Id: I2f9998e87b053c8d30af48f977ef58a7fe9ea829
 2020-08-04 18:35:13 +08:00
Sunny Shao
d94f74a752 [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 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: I348df82088558266700eb60cbc1df190fadd61a5
 2020-08-04 10:31:27 +00:00
Jakub Pawlowski
00950b7d6d 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I7d86ff7d09f0d446a49b499abbb5e3d7627c7fcb
 2020-08-04 10:31:19 +00:00
Sunny Shao
6dc6e78cc4 [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 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: Ibf008a9be83697850d05191992893417149ed59f
 2020-08-04 10:31:06 +00:00
Jakub Pawlowski
661788efbb 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I7cb945cfdbf944ce05b394f13f214a3f002e9fdb
 2020-08-04 10:31:05 +00:00
Jakub Pawlowski
ee42cb271c 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: Ib14d72b76567f9dfa50ede2a38b01f93b8f36ad8
 2020-08-04 10:30:58 +00:00
Sunny Shao
6301cef017 [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 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: If85a5bbfc053a65d8897da3bd03f5ac0844b59f7
 2020-08-04 10:30:51 +00:00
Jakub Pawlowski
134c2f20a2 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I3c858c2bd3bdabcfe7a6957a66b9be0ef0449866
 2020-08-04 10:30:44 +00:00
Mill Chen
1d3ffe6578 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: Idbaa28a3b370e7b264d04745b3a5f00a2dc2d2fb
 2020-08-04 10:30:33 +00:00
Sunny Shao
e26dae4cc7 [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 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: Ibed79a7c99e5be752b3ebe7505290971ccff1f57
 2020-08-04 10:30:30 +00:00
Mill Chen
8dc494d0f7 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: Ia2e52949a7ecb3a2936ebcfccd698a9c4a1e7e89
 2020-08-04 10:30:20 +00:00
Mill Chen
66dda042e3 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: If2a8c829cb839ebf25e1a6c3d58f9ea5add147bd
 2020-08-04 10:30:05 +00:00
Mill Chen
39d0752789 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: I654aba28b31a01f1be2fab88cdaae7dc8ba9e03a
 2020-08-04 10:30:04 +00:00
Sunny Shao
85f90979f5 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086 am: b20ae29aad -s ours am: 3502b36487 -s ours am: 26aec6ac37 -s ours am: d85d514a63 -s ours am: da316738e0 -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/+/12065565

Change-Id: I77a390b1fd4f52c2a2cfd6d26272145f03b9870b
 2020-08-04 10:29:42 +00:00
Sunny Shao
1fd688bd67 [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 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: I3816f557e640da743989c5e11040cbe46949f447
 2020-08-04 10:29:39 +00:00
Jakub Pawlowski
1afe980769 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484057

Change-Id: I26be433058320294bea75ffdf809863e6cdfd819
 2020-08-04 10:29:32 +00:00
Sunny Shao
9dd2eb94b9 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086 am: b20ae29aad -s ours am: 3502b36487 -s ours am: e308bf80e8 -s ours am: 582fa9ea57 -s ours am: 7c377fbcf6 -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/+/12065565

Change-Id: I714f2291cf22a80b4cee59286b5b689c182e36f5
 2020-08-04 10:29:28 +00:00
Jakub Pawlowski
f8fa5e3831 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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11484056

Change-Id: I70ef98a8224b9289603fbe65bab22b9e450a22ef
 2020-08-04 10:29:19 +00:00
Sunny Shao
c8ad5dc6c4 [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 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: I2c5e208a6367963922bada32823bda320cc45c27
 2020-08-04 10:29:06 +00:00
Sunny Shao
7e4740eddd [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086 am: b20ae29aad -s ours am: 3502b36487 -s ours am: 26aec6ac37 -s ours am: bc79592059 -s ours am: b7102d61d7 -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/+/12065565

Change-Id: I5a8221b2e117d04d09fc351c344f234b334e8a58
 2020-08-04 10:28:59 +00:00
Mill Chen
265af06fb4 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450

Change-Id: I687679f6b0cee0dc91e28bf57f80e3e3f2ba355f
 2020-08-04 10:28:57 +00:00
Mill Chen
1bcd658339 [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 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/8703781

Change-Id: I749f6b386d88d6f6fc7630eb050ca8d23f8d0289
 2020-08-04 10:28:38 +00:00
Bonian Chen
eff795f061 Merge "mainline: remove CarrierConfigManager.init" 2020-08-04 10:20:18 +00:00
SongFerngWang
87af2abc83 mainline: remove CarrierConfigManager.init 
Bug: 147469789
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=\
ApnPreferenceControllerTest (PASS)
make RunSettingsRoboTests ROBOTEST_FILTER=\
CarrierPreferenceControllerTest (PASS)
Merged-In: I2a72d409574fc281e5de57d58a27551dd040d551
Change-Id: I2535275d116887ed4b107fc530c85b4cbc5ad0d5
 2020-08-04 10:18:54 +00:00
Lee Chou
68c0ba35ec Removed reference to PhoneConstant PHONE_TYPE_* 
replaced with TelephonyManager.PHONE_TYPE_*

Bug: 147469330
Test: m RunSettingsRoboTests
Merged-In: I286c4879d55e28707081d4cacba1a2c444f92646
Change-Id: I9941b1ce438a06d05af0276bff2e769ec5e3d438
 2020-08-04 18:15:42 +08:00
Edgar Wang
c2e4513fb6 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: I36829e0055437dab79d9e5339ac002a87a4b874f
 2020-08-04 18:12:48 +08:00
Sunny Shao
da316738e0 [automerger skipped] Enable the filterTouchesWhenObscured in Special app access am: 7359b3840f -s ours am: b37bad4181 am: cd6166b086 am: b20ae29aad -s ours am: 3502b36487 -s ours am: 26aec6ac37 -s ours am: d85d514a63 -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/+/12065565

Change-Id: I765964505d9f71cab5cb52db7af2eaf3666c007c
 2020-08-04 10:04:46 +00:00
Sunny Shao
644c6af4fb [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 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: I925adfc4be68e27c1adde89c781b5ae39b2c296a
 2020-08-04 10:04:36 +00:00