Yanting Yang
c698e3d6dd
Merge "Update the homepage icons" into sc-dev am: 1e1c813354
am: c1247a111e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413819
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31561a17b7f0770ef436b1f1fddbec1423c2bab9
2021-01-28 14:56:41 +00:00
Yanting Yang
c1247a111e
Merge "Update the homepage icons" into sc-dev am: 1e1c813354
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413819
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3377dcf79282fdee579a45b8c811696341b6e2f8
2021-01-28 14:15:03 +00:00
Yanting Yang
1e1c813354
Merge "Update the homepage icons" into sc-dev
2021-01-28 13:50:48 +00:00
tom hsu
a835609bf0
Avoid wrong telephonymanager with wrong sub id. am: ba845f7fe4
am: 8249689aed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422724
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If14458d1aeaae0df381f12d32f492e529614d540
2021-01-28 10:17:06 +00:00
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
6c495776cc
Merge "Apply footer icon for Smart Storage" into sc-dev am: f38af98895
am: 2c4337ac0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422710
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iadc4d28caabfa179902ca1bfa9bede55b91fd785
2021-01-28 07:20:40 +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
e239f2f064
Merge "[Provider Model] Update the string to latest." into sc-dev am: e1880f026e
am: 1b604e33ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13417066
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e7eaea4f90b14535810f030e337a881815f513b
2021-01-28 04:18:45 +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
8d00c39397
[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: 2a2f7d4ba4
-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: I608c89b01972a5a80be5b35bce217208af501827
2021-01-28 00:46:05 +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
Bill Yi
5f80ceb40a
Merge changes from topic "presubmit-am-3026cc3ac2ee43e8aae3ff78e79cf010"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3d1da30897
Import translations. DO NOT MERGE ANYWHERE
2021-01-27 16:10:59 +00:00
TreeHugger Robot
cb2c604789
Merge "The UI is not immediately updated"
2021-01-27 15:42:30 +00:00
Yanting Yang
ff6a87458f
Update the homepage icons
...
Based on the Android S design to update the homepage icons in Settings
codebase.
Bug: 178363516
Test: visual
Change-Id: I4f83912d118f85d7f13feb023d30431852efe065
2021-01-27 22:30:30 +08:00
SongFerngWang
59958e663d
The UI is not immediately updated
...
Solution: Add Data Connection State listener by PhoneStateListener.
Bug: 178350321
Test: atest NetworkProviderWorkerTest
Change-Id: I692209035332bfd463537988f4e3ce166414031e
2021-01-27 22:22:29 +08: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
Zoey Chen
8f6cdd5d19
Merge "[Provider Model] Update the string to latest."
2021-01-27 13:56:44 +00:00
Weng Su
65c09ec3c1
[automerger skipped] [Provider Model] Pass null to the reason parameter to avoid unnecessary am: 7c041874ce
am: 1798f49278
-s ours
...
am skip reason: Change-Id I469a8c72fc7a6ab057acef476296285bb8a62713 with SHA-1 3c02095c90
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413810
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied6758fc7333a9e9e78be1d89de66ea5bf3f753e
2021-01-27 12:06:47 +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
e0532bf10e
[automerger skipped] Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
am: 7ac7030d49
am: 06bf3f1993
-s ours am: bf238d463c
-s ours am: 4dd8e3af8d
-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: I8c6d18fedab2d22098cb86de1d89b0e840755cbf
2021-01-27 08:31:27 +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
Zoey Chen
2449c03927
[Provider Model] Update the string to latest.
...
Bug: 178561739
Test: manual
Change-Id: I96a23af83b4a0786cd1e3714d6260008dbdcf081
2021-01-27 15:38:40 +08:00
TreeHugger Robot
da41482f96
Merge "[Provider Model] Pass null to the reason parameter to avoid unnecessary bugreports"
2021-01-27 05:02:28 +00:00
Weng Su
3c02095c90
[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
Change-Id: I469a8c72fc7a6ab057acef476296285bb8a62713
2021-01-27 10:55:54 +08:00
Yo Chiang
373e6d7f28
[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: Id9b65c4041b1a36875510ad6e93d6c103375e36d
2021-01-26 23:47:07 +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
Bill Yi
33f7fa9d05
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3d1da30897
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13407414
Change-Id: I8352f93e0a5fe95312f4c8446790d23e3f6734a0
2021-01-26 17:43:14 +00:00
Bill Yi
3d1da30897
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9d9adce35398e4f2b80e97233034ef15cf5c81b
2021-01-26 09:42:53 -08: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