Commit Graph

79086 Commits

Author SHA1 Message Date
tom hsu
8249689aed Avoid wrong telephonymanager with wrong sub id. am: ba845f7fe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68a58e6ba10fbae2625ab76ff0f079550b4426c9
2021-01-28 09:57:21 +00:00
TreeHugger Robot
2c4337ac0e Merge "Apply footer icon for Smart Storage" into sc-dev am: f38af98895
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69ff3b23eae88be9b159a81de3ba62076fba8281
2021-01-28 07:01:27 +00:00
tom hsu
ba845f7fe4 Avoid wrong telephonymanager with wrong sub id.
When initialized SimStatusDialogController, also create TelephonyManager
with sub id.

Bug: 174171839
Test: Manual test passed, see b/174171839#25
Change-Id: I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5
2021-01-28 06:26:21 +00:00
TreeHugger Robot
f38af98895 Merge "Apply footer icon for Smart Storage" into sc-dev 2021-01-28 06:09:19 +00:00
Edgar Wang
9178f7cd66 Apply footer icon for Smart Storage
- Apply FooterPreference

Bug: 177968088
Test: manual & robotest
Change-Id: Ie934a139863a7522c6fd38cd27f8814fabcb541e
2021-01-28 04:55:15 +00:00
Zoey Chen
1b604e33ac Merge "[Provider Model] Update the string to latest." into sc-dev am: e1880f026e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13417066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2176df75e15d21bcc35b32cf19343bb8a94f8447
2021-01-28 03:58:25 +00:00
Zoey Chen
e1880f026e Merge "[Provider Model] Update the string to latest." into sc-dev 2021-01-28 03:26:26 +00:00
Peter Wang
2a2f7d4ba4 [automerger skipped] Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 am: b4f375fdc4 am: 003e5dc7c2 -s ours am: 3b414eb10b -s ours
am skip reason: Change-Id I6e87d3a3c75c832354c3a3ad407889e8d2701cbd with SHA-1 0044fee7cb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5ac7329552e6be6a0677a42d9c2654ca7d60685
2021-01-27 23:57:38 +00:00
Peter Wang
3b414eb10b [automerger skipped] Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 am: b4f375fdc4 am: 003e5dc7c2 -s ours
am skip reason: Change-Id I6e87d3a3c75c832354c3a3ad407889e8d2701cbd with SHA-1 0044fee7cb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie55e80a86dcf34b1f06a459ec4161429fb7d958f
2021-01-27 23:20:46 +00:00
Peter Wang
003e5dc7c2 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 am: b4f375fdc4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4dc9ab9b5b990924ad06d206adb9950c3d95552
2021-01-27 22:24:35 +00:00
Peter Wang
b4f375fdc4 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9cd23da0ae90f7f5c38fae54900b30e7ca12bad
2021-01-27 22:03:32 +00:00
Peter Wang
ffccb8a611 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" 2021-01-27 21:39:51 +00:00
Zoey Chen
27ab48c8df [Provider Model] Update the string to latest.
Bug: 178561739
Test: manual
Change-Id: I96a23af83b4a0786cd1e3714d6260008dbdcf081
(cherry picked from commit 2449c03927)
2021-01-27 13:59:59 +00:00
Weng Su
1798f49278 [Provider Model] Pass null to the reason parameter to avoid unnecessary am: 7c041874ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2496abeb90370f67b407597dd44d581b2df972c8
2021-01-27 11:19:26 +00:00
Weng Su
7c041874ce [Provider Model] Pass null to the reason parameter to avoid unnecessary
bugreports

- The reason parameter may be used to generate bugreport

- Pass null to the reason parameter under normal situation

Bug: 178542910
Test: manual test
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Merged-In: I469a8c72fc7a6ab057acef476296285bb8a62713
Change-Id: I469a8c72fc7a6ab057acef476296285bb8a62713
(cherry picked from commit 3c02095c90)
2021-01-27 09:48:16 +00:00
Yo Chiang
4dd8e3af8d [automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49 am: 06bf3f1993 -s ours am: bf238d463c -s ours
am skip reason: Change-Id Ib6b450489c63913c47858cf295e4785fd5d0cfbb with SHA-1 a366690de1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice384768542fda8b45dbc5bf71643ad54e45e820
2021-01-27 08:06:39 +00:00
Yo Chiang
bf238d463c [automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49 am: 06bf3f1993 -s ours
am skip reason: Change-Id Ib6b450489c63913c47858cf295e4785fd5d0cfbb with SHA-1 a366690de1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie82f1568a8b06ed98ebf59c29dbd62f3ac8baa17
2021-01-27 07:52:41 +00:00
Yo Chiang
06bf3f1993 Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d am: 7ac7030d49
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11d9849150aac649b704cfa129256deba6ac862b
2021-01-26 23:08:05 +00:00
Wesley.CW Wang
0457af5347 Reorder Settings Battery main page index (1/2)
- Reorder battery page index
 - Remove option menu
 - Add battery usage preference
 - Remove last full charge and screen usage preference
 Screenshots:
 https://screenshot.googleplex.com/7VMeSVKHGViZyRv.png
 https://screenshot.googleplex.com/7v6wNL4qamfMAgM.png

Bug: 177407113
Test: make SettingsGoogleRoboTests -j40
Change-Id: I8a1fb30cdd3774840bf28d9c84017d946a4244df
2021-01-26 14:01:29 +00:00
Yo Chiang
7ac7030d49 Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
2021-01-26 11:34:53 +00:00
Yo Chiang
df58c6505d Merge "Remove feature flag "settings_dynamic_system"" 2021-01-26 10:53:54 +00:00
TreeHugger Robot
6b603fc5e2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-26 08:33:54 +00:00
TreeHugger Robot
3b61be8766 Merge "Adjust margin to fix title overlapped with arrow" 2021-01-26 08:17:34 +00:00
Manish Singh
aa8bf5993d Merge "Add header to USB power options preference" 2021-01-26 05:31:33 +00:00
Chris Li
c175f356ec Merge "Allow non-resizable apps in split-screen (3/n)" 2021-01-26 02:53:25 +00:00
Bill Yi
c6ad86ae6a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I49757ce99764947b3afff8c87152b89da838ef94
2021-01-26 02:24:29 +00:00
Jiashen Wang
a975202b8f Merge "Add a config flag to control slot change receiver in Settings" 2021-01-26 00:17:27 +00:00
TreeHugger Robot
7d0e81bce9 Merge "[Provider Model] Add connected ethernet network to internet panel" 2021-01-25 22:36:19 +00:00
Yanting Yang
deda4bc359 Merge "Correct the screen title for AppNotificationSettings" 2021-01-25 18:52:42 +00:00
Julia Reynolds
33f4f59b04 Merge "Fix some issues with notif blocking in settings" 2021-01-25 17:18:53 +00:00
Beverly Tai
b6ec17e394 Merge "Don't iterate channel list in bgthread" 2021-01-25 16:47:14 +00:00
Weng Su
ca8a3d7e64 [Provider Model] Add connected ethernet network to internet panel
- Show the connected ethernet network to first item of internet panel

- Screenshot:
  https://screenshot.googleplex.com/teritCBuvxxSyr6

Bug: 176796623
Test: manual test
- atest NetworkProviderWorkerTest \
        ProviderModelSliceTest

Change-Id: I423a7951f403bf86c288da52fc342520fd24f466
2021-01-25 14:46:37 +00:00
Weng Su
e9d44254c7 Merge "[Provider Model] Add connected ethernet network preference" 2021-01-25 14:46:05 +00:00
Yanting Yang
a31dcbb8e3 Correct the screen title for AppNotificationSettings
Add the screen title to resolve showing default title "Settings" on the
AppNotificationSettings.

Fixes: 177968781
Test: robotest & visual
Change-Id: I58e5e4cb6c1445b03d70fbb4e431cdcc9d3a09f0
2021-01-25 22:45:10 +08:00
Jason Chiu
524feaf31c Merge "Adjust homepage styles and layouts" 2021-01-25 09:43:22 +00:00
Jeremy Goldman
09f43be1c6 Merge "SubscriptionsPreferenceController shows the unique sim description." 2021-01-25 09:03:40 +00:00
Mill Chen
01a48cdf3e Adjust margin to fix title overlapped with arrow
When both display size and font size are changed to largest option, a
word in the title of subsetting page will probably be wrapped into
multiple lines. Update the margin end of expanded title to prevent from
wrapping a word into multiple lines.

Fixex: 177969094
Test: visual verified
1) Enlarge both display size and font size as largest
2) Settings -> Display -> Lock screen -> Tap to check phone
or
Settings -> Notifications
3) Observe these titles of pages

Change-Id: Icecdf912e4764cb4592ff460cbc12cc1a7dd6b48
2021-01-25 16:56:39 +08:00
Weng Su
c7003e95a3 [Provider Model] Add connected ethernet network preference
- Show the preference if connected to ethernet network

- Hide the preference if not connected to ethernet network

- Screenshot:
  https://screenshot.googleplex.com/5ZkZXnTr9Hcfsyt

Bug: 176796623
Test: manual test
- atest ConnectedEthernetNetworkControllerTest
- make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I0f062eb2ee4898976f5e7a1c3f2c4061b60a3126
2021-01-25 07:31:52 +00:00
Calvin Pan
e0ee1e1d74 Merge changes Icee8c85e,I98be6f30,I343b705b
* changes:
  [Smart forwarding] Enable/Disable Smart Forwarding flow
  [Smart forwarding] Add UI for Smart Forwarding
  [Smart forwarding] Add string and layout resource
2021-01-25 07:29:45 +00:00
Bill Yi
640010dc63 Merge changes from topic "presubmit-am-0c48db3e6b2d4143bd957df88cfec950"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 83632e4b3d
  Import translations. DO NOT MERGE ANYWHERE
2021-01-25 03:49:42 +00:00
Arc Wang
c6ee2244a7 Merge "Fix battery optimization display problems" 2021-01-25 03:12:11 +00:00
calvinpan
71dd99c767 [Smart forwarding] Enable/Disable Smart Forwarding flow
Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: Icee8c85e71f72f467b2dc11b9b55c674f22d8179
2021-01-25 10:08:33 +08:00
calvinpan
6c21dd470d [Smart forwarding] Add UI for Smart Forwarding
Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: I98be6f307f78b61020a15f72a3d4bf04089ead66
2021-01-25 10:08:02 +08:00
calvinpan
e077e39a1b [Smart forwarding] Add string and layout resource
Add string and layout resource

Bug: 170178144
Test: By manual
1. Test turn on/turn off flow
2. Test enter phone number flow

Change-Id: I343b705b0491003d8a3e77ac65630966f02d3546
2021-01-25 10:07:26 +08:00
Bill Yi
143ab6f64c Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-25 00:19:14 +00:00
Bill Yi
9a51bd76bf Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-25 00:19:02 +00:00
Bill Yi
cbd3f7ab89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442 -s ours am: 195b137800 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa5e20ba241bbbb63586be14fa92013c9ec8abac
2021-01-24 17:57:01 +00:00
Bill Yi
195b137800 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d70a7f7442 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c33d55aab01e1a4bfc168b995dd4f6bd0e452b3
2021-01-24 17:17:21 +00:00
Bill Yi
4fc870219b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id3a0b6565a0a8cf38f65bd9b8f537f4aa1da5d29
2021-01-24 13:39:50 +00:00
Bill Yi
1d403bc951 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I745025a78797cd245725fc33964738d8122f7841
2021-01-24 02:16:48 -08:00