Commit Graph

79411 Commits

Author SHA1 Message Date
Jiashen Wang
85109678b2 Post SUW Slot Change Receiver Migration
Implement the case when user inserts / removes pSIM during the SUW.
Bug: 153811431
Bug: 170508680
Test: Manually tested

Change-Id: Iccc3a2fd416ccfb57c3b4f9dc7b32c0b7681c90b
2021-02-02 17:57:40 -08:00
Bill Yi
d5c30053f5 [automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420 -s ours
am skip reason: Change-Id Ia1d85c7136b824e69077ea06c68d142a706c2b11 with SHA-1 62f6b96b51 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I402b212594a9e9f4c118d94008f53177d3430361
2021-02-03 01:34:44 +00:00
Yi-Ling Chuang
3880419481 Merge "Fix robotests fail if turning on silky home by default" into sc-dev am: 1b0823b89f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13461409

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68ebdddb5a34d0399bc38238397a2db4546875c2
2021-02-03 01:22:22 +00:00
Yi-Ling Chuang
1b0823b89f Merge "Fix robotests fail if turning on silky home by default" into sc-dev 2021-02-03 01:14:24 +00:00
TreeHugger Robot
8232a6b1dc Merge "Move the additional settings to the top of AppInfoDashboard" into sc-dev am: 9a33929b45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc6356cb24cdfb82dcb539786bb3eeae6e6e5293
2021-02-03 01:13:07 +00:00
TreeHugger Robot
9a33929b45 Merge "Move the additional settings to the top of AppInfoDashboard" into sc-dev 2021-02-03 01:06:35 +00:00
Jiashen Wang
43a1325e34 Merge "Fix ANR issue for SimSlotChangeReceiver" into sc-dev am: 1125a7600f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13459631

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I349139dbda57455e27a74a9dea2457d3981dc588
2021-02-03 00:47:12 +00:00
Jiashen Wang
1125a7600f Merge "Fix ANR issue for SimSlotChangeReceiver" into sc-dev 2021-02-03 00:31:48 +00:00
Yi Jiang
fb8fd1e6c9 Merge "Makes screen attention unsearchable on the devices that don't have the feature" into sc-dev am: e47e8ec5dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13460155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ff069f3482e4cf162ce1dcbd97de599ad8453be
2021-02-02 23:16:37 +00:00
Yi Jiang
e47e8ec5dd Merge "Makes screen attention unsearchable on the devices that don't have the feature" into sc-dev 2021-02-02 22:29:54 +00:00
Hall Liu
68931a6911 Rename setMobileDataPolicyEnabledStatus
Rename to setMobileDataPolicyEnabled per API council comments

Fixes: 171804465
Test: atest TelephonyManagerTest
Change-Id: Ib9ff4ee01e2af4d3fd368afffa36226100f11e2d
2021-02-02 12:36:14 -08:00
Yi Jiang
77647ea977 Makes screen attention unsearchable on the devices that don't have the feature
Bug: 178866004
Test: make RunSettingsRoboTests
Change-Id: I8881f6b87be73b2ff75e7dfe294d2dbb75ff73d4
2021-02-02 11:55:10 -08:00
Yanting Yang
6778fe74bd Fix robotests fail if turning on silky home by default
Bug: 179136903
Test: robotests
Change-Id: Ic620a5061fe7b778076970fd01f212a7aa95bf9e
2021-02-03 03:36:08 +08:00
Jiashen Wang
1ef16831b6 Fix ANR issue for SimSlotChangeReceiver
Bug: 179109464
Test: Manually tested
Change-Id: Ibcb5eb57cdb5a238f9e49945fea3da20b2ffb2ab
2021-02-02 11:23:13 -08:00
Bill Yi
3e1fb17420 Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
Merged-In: Ia1d85c7136b824e69077ea06c68d142a706c2b11
Change-Id: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
2021-02-02 09:44:11 -08:00
Stanley Wang
3f6c9dc1e4 Use MainSwitchPreference to replace the button style switches. am: 10b7a7d483
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a38f9068927cb866132635740d1aea74f701dc4
2021-02-02 13:00:32 +00:00
Tsung-Mao Fang
159bd0e966 Fix security issue
Settings#CredentialStorage could be overlaid to
trick user into clearing all credentials.

Disallow non-system overlay on activity.

Test: Trigger the debug apk again, and no overlay
Bug: 176753731
Change-Id: I657de039d667f5aee0941336e9361ae04f056c33
2021-02-02 18:24:00 +08:00
Yanting Yang
a599dbcc84 Move the additional settings to the top of AppInfoDashboard
Based on the Android S design, move additional settings preference
above the Notifications preference and use SpacePreference to draw
the horizontal divider below AppButtonsPreference since the additional
settings preference is only visible by condition.

Also remove initialExpandedChildrenCount to expose all preferences.

Bug: 174964524
Test: robotest & visual with turning on/off silky home
Change-Id: Ife1d37820e44f8e12af4ed37ed66a29281366b50
2021-02-02 16:58:08 +08:00
Stanley Wang
10b7a7d483 Use MainSwitchPreference to replace the button style switches.
Fix: 177967926
Fix: 177968295
Fix: 177967925
Fix: 177968078

Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
2021-02-02 08:39:37 +00:00
Wilson Wu
fb718d4f95 Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev am: 70864998c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaefc138d6691a0cb7de5e0e3e5a8e291445fcc63
2021-02-02 08:09:16 +00:00
Wilson Wu
70864998c4 Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev 2021-02-02 07:35:56 +00:00
Wesley.CW Wang
62eabdb6f2 Update battery saver column to PrimarySwitchPreference (1/2) am: 8d9fe815b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413813

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95996112b18e49d8696d3f3a6de5dc0779323f68
2021-02-02 06:37:41 +00:00
Wesley.CW Wang
8d9fe815b0 Update battery saver column to PrimarySwitchPreference (1/2)
- Change battery saver entry column to new design
 Screenshot: https://screenshot.googleplex.com/9a9Gxm3McJVmLkD.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: I513bc4371518645f4e725df27f2cb978cec284e8
2021-02-02 06:13:08 +00:00
Chen Xu
f7e3d57023 UK emergency alert app rename
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
2021-02-02 12:55:03 +08:00
Sarah Chin
123205e141 Update onSubscriptonOverride listener
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
2021-02-01 18:33:34 -08:00
Jiashen Wang
1c205502ef Merge "Slot Change Receiver Migration" into sc-dev am: 428273765b am: e6da71456f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13411837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I506f49bf863d8f32b07dd93a5ce5ef27a5bc1d27
2021-02-02 01:17:07 +00:00
Jiashen Wang
43714a0c71 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev am: 8cfa4c8c97 am: 966973f422
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13431258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6d8f22db3a18610ca2110cca1cced61abda2566
2021-02-02 01:15:47 +00:00
Jiashen Wang
e6da71456f Merge "Slot Change Receiver Migration" into sc-dev am: 428273765b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13411837

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb64c4ec83ccafb0f04d2554b791f5ab6bd2047b
2021-02-02 00:54:50 +00:00
Jiashen Wang
966973f422 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev am: 8cfa4c8c97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13431258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id66f32bc60a016ec2d31a632e68076b5248ea68f
2021-02-02 00:09:25 +00:00
Jiashen Wang
428273765b Merge "Slot Change Receiver Migration" into sc-dev 2021-02-01 23:57:09 +00:00
Jiashen Wang
8cfa4c8c97 Merge "Change Settings to be able to receive timeout values from LPA" into sc-dev 2021-02-01 23:56:37 +00:00
Tom Hsu
b00c7722c5 [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours am: 58e6563250 -s ours
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic50215d4f07d0d6498fd58644771bedcd75bd405
2021-02-01 19:58:41 +00:00
Tom Hsu
58e6563250 [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours am: fd8531400d -s ours
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43e7917951351bcf7ebe868f1a044a663d8dfaed
2021-02-01 19:36:45 +00:00
Tom Hsu
fd8531400d [automerger skipped] Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3 am: 62f6b96b51 -s ours
am skip reason: Change-Id I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5 with SHA-1 ba845f7fe4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I317d66aebf3fc45800a062cd34f9aa3f5eec90bf
2021-02-01 18:28:23 +00:00
TreeHugger Robot
fbdfc8fcb0 Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc89d am: 953dc45f77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d691374d9ff85d56e9032bab1ece092ca1c56a0
2021-02-01 18:27:33 +00:00
TreeHugger Robot
953dc45f77 Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev am: b40e5dc89d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451766

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64e4d969380bb87315347a1ee5812039474da0c1
2021-02-01 18:01:24 +00:00
Tom Hsu
62f6b96b51 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev am: 6ec886a0e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d85c7136b824e69077ea06c68d142a706c2b11
2021-02-01 18:00:38 +00:00
Tom Hsu
6ec886a0e3 Merge "Avoid wrong telephonymanager with wrong sub id." into rvc-qpr-dev 2021-02-01 17:26:47 +00:00
TreeHugger Robot
b40e5dc89d Merge "[Provider Model] Fix InternetPreferenceControllerTest failed issue." into sc-dev 2021-02-01 17:00:04 +00:00
Tsung-Mao Fang
0942bf2582 Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa am: fdd8331363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd7dfb3f5e3bf0f26f1b6c525ffa80256b9227a4
2021-02-01 15:19:40 +00:00
Zoey Chen
9657379d70 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev am: 68c2d0bdf6 am: 81941b9aa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf3c92e01b5445a8829d84daecf0929599d09281
2021-02-01 15:19:15 +00:00
Tsung-Mao Fang
fdd8331363 Merge "Tweak the ui based on the Android S design" into sc-dev am: 77382001fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448953

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic608677db8d11500f70940839b677c98ece6b230
2021-02-01 14:51:44 +00:00
Zoey Chen
81941b9aa3 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev am: 68c2d0bdf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448951

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0462678ce051c984784359b56da4f51269891898
2021-02-01 14:51:28 +00:00
Tsung-Mao Fang
77382001fa Merge "Tweak the ui based on the Android S design" into sc-dev 2021-02-01 14:39:04 +00:00
Weng Su
5cf4cf2660 [Provider Model] Fix InternetPreferenceControllerTest failed issue.
- Bypass system resource

Bug: 179016907
Test: manual test
- atest InternetPreferenceControllerTest
Change-Id: I860eb3173f112a7d3f820701afb1a96a06d4a296
2021-02-01 14:37:38 +00:00
Zoey Chen
68c2d0bdf6 Merge "[Provider Model] Add Learn more in the WFC footer" into sc-dev 2021-02-01 14:10:29 +00:00
Zoey Chen
29dd5f9ec3 Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570f7 am: 39dbfb91bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1999858a985b1ae59732e7320fd3739833a1a37a
2021-02-01 14:05:26 +00:00
Zoey Chen
39dbfb91bd Merge "[Provider Model] Update the preferred status to the latest" into sc-dev am: 28f3a570f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448950

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7d832333fefd71e4f6c07727e5efddc57134dc5
2021-02-01 13:49:10 +00:00
Zoey Chen
28f3a570f7 Merge "[Provider Model] Update the preferred status to the latest" into sc-dev 2021-02-01 13:18:59 +00:00
Tsung-Mao Fang
23e77a557a Tweak the ui based on the Android S design
- Use TopIntro preference to show introduction text

Change-Id: Ic2304dab188848dfa6ef8a0429fd5b7ad40cf0af
Test: See the screenshot- https://screenshot.googleplex.com/AMS64EGe5Fcdfn8
Fix: 177997785
2021-02-01 20:46:43 +08:00