Hall Liu
adcd5250f0
Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev am: 3717d5feda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13459906
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia73599147013f5afad3f71e4ceb8eca017f6b2a5
2021-02-03 21:54:45 +00:00
Hall Liu
3717d5feda
Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev
2021-02-03 19:54:14 +00:00
TreeHugger Robot
e80c6e362d
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec
am: 15cd80a3b5
-s ours am: e14dc177f3
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 d47d8e4fc5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia694926c0078a0b02f721fd427fc1411b6a40088
2021-02-03 19:28:30 +00:00
TreeHugger Robot
e14dc177f3
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec
am: 15cd80a3b5
-s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 d47d8e4fc5
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4535cb790898cc014d951800efb77c3c9bb6caeb
2021-02-03 18:42:49 +00:00
TreeHugger Robot
15cd80a3b5
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432622
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I935c42a6c063f5a2a881aea48b33576b3a2ae572
2021-02-03 17:59:37 +00:00
TreeHugger Robot
6dc9f825ec
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev
2021-02-03 17:24:05 +00:00
TreeHugger Robot
205b724081
Merge "WifiCallingPreferenceControllerTest migrated to junit" into sc-dev am: aa172787de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472005
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52abed1a3a85760e8e3534a5e63d4dfa5eb03e03
2021-02-03 16:31:32 +00:00
TreeHugger Robot
aa172787de
Merge "WifiCallingPreferenceControllerTest migrated to junit" into sc-dev
2021-02-03 15:47:31 +00:00
SongFerngWang
6ac2e7e04b
WifiCallingPreferenceControllerTest migrated to junit
...
Bug: 179246773
Test: atest -c WifiCallingPreferenceControllerTest
Change-Id: I9a097db77f71b31d8c92d5596ecf1794fe61a042
2021-02-03 22:11:56 +08:00
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
Yanting Yang
bfd96258be
Merge "Fix divider missing with AppButtonsPreference" into sc-dev am: 09010fe9f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13451892
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia36a2b15e69a2fe1e849969b4b81485f51285113
2021-02-03 08:29:29 +00:00
Yanting Yang
09010fe9f2
Merge "Fix divider missing with AppButtonsPreference" into sc-dev
2021-02-03 08:08:54 +00:00
Aaron Huang
d52cff9b57
Merge "Replace @hide API with public API"
2021-02-03 07:37:33 +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
Yanting Yang
868eb6410d
Fix divider missing with AppButtonsPreference
...
Symptom:
The divider below of the AppButtonsPreference is missing on the
Storage & cache and Battery pages of app.
Root cause:
The PreferenceCategory divider has been hidden for Android S design.
If we put the AppButtonsPreference and the PreferenceCategory together,
the divider will be default hidden by PreferenceCategory.
Solution:
To add back the divider for AppButtonsPreference, override the
allowDividerAbove in the PreferenceCategory.
Fixes: 179118594
Test: visual
Change-Id: I74ba7679a69a578a87734b9920f53a20c79d6567
2021-02-03 14:38:50 +08:00
TreeHugger Robot
384cf0e9e7
Merge "Fix security issue" into sc-dev
2021-02-03 05:56:17 +00:00
Bill Yi
789e943007
[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420
-s ours am: d5c30053f5
-s ours am: 95e0060abb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13462033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9991337dbac32a4e30c6f0870617f950ee6d531e
2021-02-03 02:56:10 +00:00
Bill Yi
95e0060abb
[automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 3e1fb17420
-s ours am: d5c30053f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13462033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I064b66ba616f5ec30a9f7360135e2372b526b12a
2021-02-03 02:20:17 +00: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
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