Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,268 Commits 1 Branch 0 Tags
e9ed192e5d90079d7e4e92c4cb6ab14d6275728c
Commit Graph

35289 Commits

Author SHA1 Message Date
Aaron Huang
e9ed192e5d Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a am: 68bdb8e8b8 am: f31cb783da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf31319d16f5dda7bd6f16d9d5da3062732d7463
 2021-02-03 11:09:51 +00:00
Aaron Huang
f31cb783da Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a am: 68bdb8e8b8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I71dd0c79cdf216746d57ea6686c3d8141c721a57
 2021-02-03 10:23:59 +00:00
Aaron Huang
68bdb8e8b8 Merge "Replace @hide API with public API" am: d52cff9b57 am: 3178dfc76a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b589342e82b22a5a5a960fe94feaca2505adc
 2021-02-03 09:35:49 +00:00
Aaron Huang
3178dfc76a Merge "Replace @hide API with public API" am: d52cff9b57 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
 2021-02-03 08:30:43 +00:00
TreeHugger Robot
300ccc015f Merge "Fix security issue" into sc-dev am: 384cf0e9e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd19afc38b62b9af85244e9c0b0325b98ddc4de
 2021-02-03 06:42:02 +00:00
TreeHugger Robot
384cf0e9e7 Merge "Fix security issue" into sc-dev 2021-02-03 05:56:17 +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
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
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
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
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
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
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
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
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
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
Aaron Huang
3bb961affd Replace @hide API with public API 
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.

Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d

Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
 2021-02-01 19:16:23 +08:00
TreeHugger Robot
25250d48e3 Merge "The wifi list is not null at no signal room" into sc-dev am: 3cdb93cbf9 am: 696d722216 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432400

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7fa6236ba4608d5ea5a4e9c3ddf2c9c1caa9028
 2021-02-01 09:17:10 +00:00
Zoey Chen
4f05555f4f [Provider Model] Add Learn more in the WFC footer 
UX deck: https://screenshot.googleplex.com/4DxGCxgEsujhEpy.png
Implementation: https://screenshot.googleplex.com/5yZhQMQwwRZQkge.png

Bug: 178898044
Test: make
Change-Id: Icfde927e6781303b6016b0ec13201fd7052191d3
 2021-02-01 16:57:57 +08:00
Jeremy Goldman
ba8f1ad06f Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev 2021-02-01 08:16:42 +00:00
TreeHugger Robot
3cdb93cbf9 Merge "The wifi list is not null at no signal room" into sc-dev 2021-02-01 07:53:18 +00:00
Weng Su
65bab8d5f8 Merge "[Provider Model] Fix Internet preference crash" into sc-dev am: 548569e3eb am: 52394b4245 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425304

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1ebca917ca4657bf72a0e3698723d8bae1d9610
 2021-02-01 07:29:50 +00:00
Weng Su
548569e3eb Merge "[Provider Model] Fix Internet preference crash" into sc-dev 2021-02-01 06:12:11 +00:00
SongFerngWang
705f1df886 The wifi list is not null at no signal room 
- check the wifi list's size for error message.
- fix the carrier's summary display "connect" at no signal room

Bug: 177390298
Test: atest ProviderModelSliceHelperTest
atest ProviderModelSliceTest

Change-Id: I692aadd01a290cce2438b0d3c084bef8d8d3fa24
 2021-02-01 13:58:49 +08:00
Jeremy Goldman
b3fc7e5b10 Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." 2021-02-01 05:03:30 +00:00
Jeremy Goldman
3dd2878437 SubscriptionUtil checks that SubscriptionInfo is null before accessing. 
Test: atest -c SubscriptionUtilTest
Bug: 178707680
Change-Id: I03938405929c3307460107671bbe695ee5e0f6e9
 2021-02-01 05:01:49 +00:00
TreeHugger Robot
1e5f36106c Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev am: 7b0563946e am: 0fa4f7b2a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I526dfa0b9f3d64d935dcf45ac232bcb350de02f6
 2021-02-01 03:29:33 +00:00
Manish Singh
becac249e3 Merge "Add Settings UI for MTP transcoding over USB." into sc-dev 2021-02-01 03:17:29 +00:00
Jeremy Goldman
daf7550a86 SubscriptionUtil checks that SubscriptionInfo is null before accessing. 
Test: atest -c SubscriptionUtilTest
Bug: 178707680
Change-Id: I03938405929c3307460107671bbe695ee5e0f6e9
 2021-02-01 10:45:18 +08:00
TreeHugger Robot
7b0563946e Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev 2021-02-01 02:36:29 +00:00