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

79239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
181c387dcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe25d2494e -s ours am: 44e8570dc9 -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: I6a31391dc1475c82a19e6c7a3150c98ec40e62e5
 2021-02-04 18:43:39 +00:00
Bill Yi
a3fea95b0d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d1da30897 -s ours am: e00f3ea0a9 -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: I1a3da8b0ea3f6d1872229f2874ee557099cfea7f
 2021-02-04 18:40:14 +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
Weng Su
6463ee3b4f [Provider Model] Internet Panel - Airplane mode is on am: 7a62ab1fff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13461408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4699f0a556aa64c345ad2168ff454a12bf0cf74c
 2021-02-04 15:19:57 +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
e28a517416 Merge "[Settings] Add owner into Settings/network" am: 18b440997f am: 14993282f1 am: 93726f4de6 am: bcfd351521 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48b576783fe35f4443adb1d320be8f9595637920
 2021-02-04 10:09:41 +00: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
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
Jeremy Goldman
230b6cb4e8 Unique display name util uses available, rather than active, subscriptions. am: 9e949b1920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13472808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a8866ca37e6792d22c34f99661a8044f22db637
 2021-02-04 05:13:27 +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
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
Hall Liu
00a3a070f0 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: I8aa91a4547cc6466fe0c384c3af635b4ef1b3e37
 2021-02-03 20:17:15 +00:00
Hall Liu
3717d5feda Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev 2021-02-03 19:54:14 +00:00
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
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
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