TreeHugger Robot
14c0c0aa7b
[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: Ie6a1c125560a9f5229b848442427748f0922ee5c
2021-02-03 19:30:51 +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
6f1c1e4541
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: Ie9f2afed1e931e097c40069386bc8085440c31f5
2021-02-03 16:31:49 +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
6c0e445f11
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: Icbd995392f5974503d1db5bfc90c2aeb305c524a
2021-02-03 11:09:37 +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
4d7deb9873
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: Id40706da32a3d5517fa28b73990362a179945a0a
2021-02-03 08:29:43 +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
7b0815d729
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: I1793b301bf854cc8f198a8e9beb4c86f4035937b
2021-02-03 06:42:34 +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
d6192516e0
[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: 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: I08aceed18621db28ff1775e42911e92577b39808
2021-02-03 02:56:53 +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
4e3c7eb670
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: Ia064ca7cecc0e9d1c3ebcd376b10e7dc205e6476
2021-02-03 01:22:36 +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
f18fa186e9
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: I88e8a5631f0c580ddad86d16f2f2a0957e379b5d
2021-02-03 01:12:04 +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
61f68f1dde
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: If389d852205609d455e6ad505b08099c26ff72b5
2021-02-03 00:46:25 +00:00
Jiashen Wang
1125a7600f
Merge "Fix ANR issue for SimSlotChangeReceiver" into sc-dev
2021-02-03 00:31:48 +00:00
Yi Jiang
fcda9ef314
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: Iff5cbf2aeabf04b4e853ca2c36070687a4ed26e8
2021-02-02 23:16:48 +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
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
4a1954592a
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: Ia127d0eb8c774ba01c03c8a5d7bb7edd0ab9272a
2021-02-02 13:00:01 +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
5aaf550781
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: I400e4990880d05f54c335cbf40e5622403682de0
2021-02-02 08:09:36 +00:00
Wilson Wu
70864998c4
Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev
2021-02-02 07:35:56 +00:00
Wesley.CW Wang
e79da0b12b
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: I4fad863e34ab5fa974a19eb07b575523b53d7421
2021-02-02 06:38:07 +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
cd2b9b16c6
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: I32b1e440072315b639756ccc9694c3d4b391b4d1
2021-02-02 00:53:24 +00:00
Jiashen Wang
ca43233c6c
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: Ib2d018e1ba0d8a6e1526c92b59e85dccd663d286
2021-02-02 00:07:45 +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
1a356f2425
[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: Iec3106b0896f60b5baa9dfb8c77e2ac7743257aa
2021-02-01 19:34:28 +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
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
2250b7762c
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: I7cf6a8b2e96155f7a3c7f777f50aa2137da682ce
2021-02-01 17:41:46 +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