PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,296 Commits 1 Branch 0 Tags
3deffe9f04b61cb0160d197aa9dac9defa41e81c
Commit Graph

79296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
573a375a5a [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours am: 21cea68a24 -s ours 
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e093144665318f408cf8031422b8b0ab06101a
 2021-02-04 18:40:34 +00:00
Bill Yi
44e8570dc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe25d2494e -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b5392b3bca474937a5515a45a0f0dea2934087a
 2021-02-04 18:33:53 +00:00
Bill Yi
e00f3ea0a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d1da30897 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If293bbaadd6761441027ebdc81e058d797e8253b
 2021-02-04 18:21:07 +00:00
Bill Yi
21cea68a24 [automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a -s ours 
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4a3153c551d622287caed126207c367a8427c0d
 2021-02-04 18:19:16 +00:00
Manish Singh
f8b9101314 Disable MTP transcoding by default 
BUG: 178769134
Test: manual
Change-Id: Ib87d0f499bd699276326a41b37f42c7a85893afe
 2021-02-04 17:41:20 +00:00
Bill Yi
0e0360963a Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:42 +00:00
Weng Su
7a62ab1fff [Provider Model] Internet Panel - Airplane mode is on 
- Add "Airplane mode is on" to sub-title
  - Set the header layout to CENTER_HORIZONTAL if it's no icon

- Hide "Settings" button

- Screenshot
  https://screenshot.googleplex.com/6m5dFVZu7ar4nKW

Bug: 178717651
Test: manual test
atest InternetConnectivityPanelTest \
      PanelFragmentTest \
      ProviderModelSliceTest

Change-Id: I899a817fd99415e9cad608aa4deac1e45365696a
 2021-02-04 18:48:34 +08:00
Treehugger Robot
bcfd351521 Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1 am: 93726f4de6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icab0aeb6a8141489a70f80d4f39b54e09c16319a
 2021-02-04 09:47:58 +00:00
Treehugger Robot
93726f4de6 Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibec0968f801f6a0d581394f06b41f26204277c37
 2021-02-04 09:19:27 +00:00
Wesley.CW Wang
8cd4fd329e Remove battery usage column icon (1/2) 
Bug: 179236309
Test: make RunSettingsRoboTests -j40
Change-Id: I89b741e4cd5c8c53e3c67f4702eff0d95200731f
 2021-02-04 09:12:53 +00:00
Treehugger Robot
14993282f1 Merge "[Settings] Add owner into Settings/network" am: 18b440997f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cd2673f9d2daea6de8c3329172e1f65590a03e1
 2021-02-04 08:26:11 +00:00
Treehugger Robot
18b440997f Merge "[Settings] Add owner into Settings/network" 2021-02-04 08:01:46 +00:00
Zoey Chen
f74551eb47 [Settings] Add owner into Settings/network 
Bug: None
Test: Not required
Change-Id: I7cc22c9455f4f074c1e22dd27e1f9cb4028376a8
 2021-02-04 13:11:04 +08:00
changbetty
acdb2d29e9 [Telephony settings] Settings crashes when rotate screen in Preferred network type 
When activity is recreated, fragments are automatically reattached.
Need to check the savedInstanceState is null or not when we want to add framgment in MobileNetworkActivity.
(lost to check in ag/9667137)

Bug: 154087690
Test: Manual
      make RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: Id169353f6dc10306dddd823a904f0803b26a6ddc
Merged-In: Id169353f6dc10306dddd823a904f0803b26a6ddc
 2021-02-04 12:53:16 +08:00
Jeremy Goldman
9e949b1920 Unique display name util uses available, rather than active, subscriptions. 
Test: atest -c SettingsUnitTest
Bug: 178560175
Change-Id: Ief035cf3de3ac03fe348095f36bfb78a41f93d2c
(cherry picked from commit c14e3b3115)
Merged-In: Ief035cf3de3ac03fe348095f36bfb78a41f93d2c
 2021-02-04 03:15:41 +00:00
Bill Yi
0f8ac7d168 Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE 
Merged-In: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
Merged-In: I402b212594a9e9f4c118d94008f53177d3430361
Change-Id: I19cd6d4c1152270a8936d7a9b999c870415f4221
 2021-02-03 17:01:33 -08:00
Hall Liu
3717d5feda Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev 2021-02-03 19:54:14 +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
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
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
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
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
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
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
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
9a33929b45 Merge "Move the additional settings to the top of AppInfoDashboard" into sc-dev 2021-02-03 01:06:35 +00:00
Jiashen Wang
1125a7600f Merge "Fix ANR issue for SimSlotChangeReceiver" into sc-dev 2021-02-03 00:31: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
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
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
70864998c4 Merge "Apply ResultCallback to DevelopmentTiles" into sc-dev 2021-02-02 07:35:56 +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
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
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
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