TreeHugger Robot
0b90ee1161
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev am: 1ed1be15d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I72bf940f930e719a477f6b42b20b50274055c77b
2021-11-18 18:08:19 +00:00
Bill Yi
6caa602d7c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
am: d86da91c3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: Ib53980b3ddd22ced1afceb89619d41b7a2f4f2d1
2021-11-18 18:08:17 +00:00
Bill Yi
931145f30e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
am: d86da91c3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: Ia5da598d10ce0cf7df291b92b5965363eb878b42
2021-11-18 18:08:17 +00:00
TreeHugger Robot
1ed1be15d8
Merge changes from topic "presubmit-am-c2ea559653ab4e82ba8bececc8170921" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
Import translations. DO NOT MERGE ANYWHERE
2021-11-18 17:51:48 +00:00
TreeHugger Robot
17896e0e7c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78
-s ours am: 6e7435398e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294814
Change-Id: I0a7fc5c781d8d73fbccf99b4409ba2985f253c33
2021-11-18 17:20:03 +00:00
TreeHugger Robot
ff7e972fa7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266
-s ours am: 0b17afd619
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294864
Change-Id: I3f0a50f7dd8d75e9d82cb7a820d0d6bd69e87d74
2021-11-18 17:19:56 +00:00
TreeHugger Robot
6e7435398e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294814
Change-Id: Iabd4701965c8f88c200a616310481fd330114671
2021-11-18 17:02:48 +00:00
TreeHugger Robot
1570dd46ac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: fda2135c78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294814
Change-Id: If66bb532425e4939edaad9cd436fd98c21be3e05
2021-11-18 17:02:41 +00:00
TreeHugger Robot
0b17afd619
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294864
Change-Id: Ia12ac51a8a17c860a38f10da88ed70a73928394b
2021-11-18 17:02:38 +00:00
TreeHugger Robot
008f9a695a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 277f726266
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294864
Change-Id: I1f3d6faedc496c21d83922fe84dd4b4809a54732
2021-11-18 17:02:35 +00:00
TreeHugger Robot
fda2135c78
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-18 16:57:43 +00:00
TreeHugger Robot
6def0ab1ed
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-18 16:51:55 +00:00
TreeHugger Robot
3b9da31dfb
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-18 16:50:12 +00:00
TreeHugger Robot
277f726266
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-18 16:49:54 +00:00
Zoey Chen
c8ee867f2d
Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev
...
* changes:
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
2021-11-18 13:26:31 +00:00
Tsung-Mao Fang
251e326d21
Redesign homepage layout for two-pane mode.
...
In a high level, I created two versions of app bar layout.
One for single pane design, another for two-pane design.
Then, app initilizes two different layouts in the beginning,
we simply show/hide one version while app is receiving the
configuration changes update.
Test: Rebuilt apk and observed the screen.
Bug: 195293058
Change-Id: Icd19ea02ab1be4e964701b22ae9e20c9e00d3c0d
2021-11-18 21:07:26 +08:00
Bill Yi
54d766df82
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1047bd6af56fc7b7f07d8940746587e318dc86fa
2021-11-18 11:18:16 +00:00
Bill Yi
2c292c3bd0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1374d712733e84b14c7e8d7a030e5a2925e8fa7d
2021-11-18 11:14:31 +00:00
Bill Yi
61505e7824
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10928bfba9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16294832
Change-Id: I1ba27aa6206d0f3397fa2368b2e0a7aee2872242
2021-11-18 11:11:02 +00:00
Bill Yi
10928bfba9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic2a76b26c01ac12d38805cfe0e587bc6578cb031
2021-11-18 11:10:53 +00:00
Bill Yi
2f4d199eca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I19870a385eb66624394e0c7c9e2b09adeb3c175f
2021-11-18 11:03:03 +00:00
Bill Yi
c3da08f9b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I14e8407dfd64beac27fc43769f7009427f477027
2021-11-18 11:01:28 +00:00
Bill Yi
d86da91c3e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b8b0bef8f9
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16292440
Change-Id: I1988d2aea846cc00ec8929d7e898f821a686c5cc
2021-11-18 11:00:03 +00:00
Bill Yi
b8b0bef8f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iab997959a48aa05243e0d7029dc6a7262414a46d
2021-11-18 10:59:55 +00:00
Jason Chiu
b4d3278a45
Merge "Start deep link page synchronously in SettingsActivity" into sc-v2-dev
2021-11-18 09:34:20 +00:00
Jason Hsu
0a8f978357
Merge "Provide ability to link to Color Inversion page via Intent" into sc-v2-dev
2021-11-18 06:33:55 +00:00
Betty Chang
4375590837
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228
Change-Id: I06611c86c0db787198031edcf10d1d60217d577c
2021-11-18 06:30:27 +00:00
Betty Chang
023e325653
Merge "Remove the string for wifi toggle summary" into sc-v2-dev am: 34ff040431
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279915
Change-Id: Id0a6f3124c0df3332f4b808ba7251a181f0bb483
2021-11-18 06:30:05 +00:00
Betty Chang
21967a6ff8
Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev
2021-11-18 06:18:08 +00:00
Betty Chang
34ff040431
Merge "Remove the string for wifi toggle summary" into sc-v2-dev
2021-11-18 06:17:52 +00:00
Jason Chiu
a3b21cf017
Start deep link page synchronously in SettingsActivity
...
- Use a synchronous API to make SettingsActivity start deep link intent
in onCreate
- Change SettingsHomepageActivity from an alias to a real activity
- Clean up redundant codes
Fix: 206585572
Test: Manual, robotest build pass
Change-Id: Idf42c026f593bb5801a13cae250d1523030b7092
2021-11-18 12:20:08 +08:00
TreeHugger Robot
2fc75eba80
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768
2021-11-18 03:41:27 +00:00
TreeHugger Robot
b84b7d586a
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev
2021-11-18 03:25:05 +00:00
Kevin Han
39f038137e
Unhibernate an app when a user exempts it
...
When an app is exempted from hibernation, we unhibernate as well. This
prevents confusing situations where a user may return to the "Unused
Apps" page and sees that the app is still there even after exemption.
Bug: 205641871
Test: atest HibernationSwitchPreferenceControllerTest
Change-Id: I4f98a2212eefdb6c456a0de36d428021b262cca3
2021-11-17 22:38:45 +00:00
Makoto Onuki
0fefda6870
Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438
Change-Id: I8629b6ad36ffc18364a09f859497fecd93368b98
2021-11-17 18:05:05 +00:00
Makoto Onuki
fcb067b577
Merge "Use different exceptions for different crash reasons" into sc-v2-dev
2021-11-17 17:52:56 +00:00
TreeHugger Robot
6274ca81fa
Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: I243c8725d48e167e32785ab08ce40864588f1746
2021-11-17 17:41:28 +00:00
Matt Pietal
d8ca5298ec
[DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: Ic95e5a3863b64a2fda813500335ac04db8d6ae56
2021-11-17 17:41:24 +00:00
TreeHugger Robot
b13b2fd8ee
Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev
2021-11-17 17:12:37 +00:00
changbetty
39ebb7c9a8
Remove feature flag for provider model in wifi settings
...
Bug: 206338507
Test: manual test
Change-Id: I1ec83c94f801b489bcc716a6d78cbe7beab9638f
2021-11-17 15:57:14 +00:00
changbetty
14d1b41464
Remove the string for wifi toggle summary
...
Bug: 204124091
Test: Manual test
Change-Id: I0d1d7d6061b756a09942ce7cb0f66a1b1c962eb1
2021-11-17 15:18:22 +00:00
ykhung
b84a0ed81a
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 938a8bbd26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I522a6d7cf980aa12cfd1362c6b901470001ade6c
2021-11-17 14:31:09 +00:00
ykhung
394a0c96fb
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 3c1da6b2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I8ded2a15907927eaf5efb90e59405cd22d885ee8
2021-11-17 14:29:25 +00:00
ykhung
938a8bbd26
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: Id3d70a338b081edd45c8ca6c1f7fc7e4e41707e9
2021-11-17 14:19:23 +00:00
ykhung
3c1da6b2af
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I7588c48981e0a4f351302fd1b38f8c943509375a
2021-11-17 14:19:22 +00:00
Matt Pietal
cb4836b486
[DO NOT MERGE] Allow a settings override for double-line clock
...
This setting allows users to always show a single-line format clock,
regardless of notification status.
Fixes: 194905512
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I94ade1b2d968e5783750e7a98a9a5d28cc22b659
2021-11-17 13:34:36 +00:00
Zoey Chen
e714654c94
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3
...
Test: atest DefaultSubscriptionControllerTest, NetworkProviderSettingsTest
Bug: 197066557
Change-Id: I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
2021-11-17 13:09:48 +00:00
ykhung
13a52a081e
Update "Mobile network standby" attribute label into "Mobile network"
...
Bug: 205051643
Test: make SettingsRoboTests
Change-Id: Ia8f5c3e76d72ffa6fd0601c58b1b3d157b711b30
(cherry picked from commit 22dc875ba7
)
2021-11-17 12:35:23 +00:00
Zoey Chen
439bc7f9dd
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2
...
Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
2021-11-17 10:37:41 +00:00
Zoey Chen
5515e9bde5
[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI
...
Test: atest NetworkProviderCallsSmsFragmentTest, SubscriptionsPreferenceControllerTest
Bug: 197066557
Change-Id: I55e0fa2ca7317cd8c9d1bce7c229b8344f43cc92
2021-11-17 10:37:20 +00:00