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
e4dca4c6db
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a
am: 2fc75eba80
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888
Change-Id: Ib2df8aa1538faf51d375dc92cc978039f0da9768
2021-11-18 03:52:25 +00: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
Jason Chang
a40471e4bf
Merge "(3/n) Handling long-pressed action for One-handed mode Quick Settings tile"
2021-11-17 23:38:03 +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
Matt Pietal
a5415907ea
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 19:29:19 +00:00
Makoto Onuki
694d374a9c
Merge "Use different exceptions for different crash reasons" into sc-v2-dev am: fcb067b577
am: 0fefda6870
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276438
Change-Id: I81b0c86610090a295801fb13295b15b94a501ba6
2021-11-17 18:11:17 +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
TreeHugger Robot
8027459563
[automerger skipped] Merge "[DO NOT MERGE] Allow a settings override for double-line clock" into sc-v2-dev am: b13b2fd8ee
am: 6274ca81fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: Ieede0d8433136aac3c6585c9b060d60264e9b2b5
2021-11-17 18:00:07 +00:00
Matt Pietal
4942988d02
[automerger skipped] [DO NOT MERGE] Allow a settings override for double-line clock am: cb4836b486
am: d8ca5298ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16276359
Change-Id: I0babc7ed0c88806d5763cb97af0fe43f4c43c59c
2021-11-17 18:00:04 +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
ac655e430e
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 938a8bbd26
am: b84a0ed81a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: I6a61887e8b6af8f80a41eb7588ec89a33ce1950c
2021-11-17 14:41:11 +00:00
ykhung
57a9e1b17e
Update "Mobile network standby" attribute label into "Mobile network" am: 13a52a081e
am: 3c1da6b2af
am: 394a0c96fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16279909
Change-Id: Ic035904fd3d9084d5cb82e274bb451510d4fd2bd
2021-11-17 14:41:04 +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
TreeHugger Robot
69df012025
Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50b5
am: e837096e38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533
Change-Id: Id31d0aa8a6a50ca8d4b7c997b06ee86b19e0866e
2021-11-17 09:25:32 +00:00
TreeHugger Robot
e837096e38
Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533
Change-Id: I87216a56ee6cd70ccf6af2318ccafec50642161a
2021-11-17 09:15:06 +00:00
TreeHugger Robot
0d96dc50b5
Merge "Fix the CtsVerifier issue" into sc-v2-dev
2021-11-17 08:58:43 +00:00
SongFerng Wang
ff0058b256
[automerger skipped] Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
am: 9a7f3aaf0e
-s ours
...
am skip reason: Merged-In I163ab8e966de57ddff7939a46fc47b05bea029e3 with SHA-1 f0575366c4
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279
Change-Id: I93656395e0b051dd536c5bbf5f268e4de82c3cf7
2021-11-17 07:14:36 +00:00
SongFerng Wang
9a7f3aaf0e
Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev am: f0a3348ceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262279
Change-Id: I38ea72134e9f0bf453d6125763e4d6af6f323487
2021-11-17 06:55:17 +00:00
SongFerng Wang
f0a3348ceb
Merge "Lost the registered cellinfo item after the aggregation" into sc-v2-dev
2021-11-17 06:42:29 +00:00
SongFerng Wang
f5e2d52f43
Merge "Revert "Device do network scan after user rotates NetworkSelection page""
2021-11-17 06:24:53 +00:00
Bonian Chen
f9c230bdc8
Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050
am: a77928c6f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16278918
Change-Id: I24fe78f83a7fea2e9baa1269b017a55ed3bdfc2c
2021-11-17 06:12:21 +00:00
Bonian Chen
a77928c6f4
Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev am: fd6ddcd050
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16278918
Change-Id: I80c2ae9f28c8b34579dd883f1976116ac47c47de
2021-11-17 05:55:21 +00:00
Bonian Chen
fd6ddcd050
Merge "[Settings] Avoid from dialog disappear when click outside" into sc-v2-dev
2021-11-17 05:28:34 +00:00
SongFerng Wang
14351731fa
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: 6b81329fc2
am: df8cc34945
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259258
Change-Id: I1973f7d7c2aefe5932e916b1c125d3348a437bda
2021-11-17 05:22:07 +00:00
SongFerng Wang
df8cc34945
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev am: 6b81329fc2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259258
Change-Id: Iea2dd1448309721f3a57cba3c8c04a0dbae6b4a5
2021-11-17 05:06:07 +00:00
SongFerng Wang
6b81329fc2
Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev
2021-11-17 04:56:04 +00:00
TreeHugger Robot
40c0a41756
Merge "Fix suw display size flicker problem" into sc-v2-dev am: 943d68127c
am: 579723b4b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234666
Change-Id: I4454ecfdf367df1c47ac2412d2d75019342d887d
2021-11-17 02:19:59 +00:00
TreeHugger Robot
579723b4b4
Merge "Fix suw display size flicker problem" into sc-v2-dev am: 943d68127c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234666
Change-Id: Iad78a38a429be9a353176c4fcc529d34ec1023bc
2021-11-17 02:08:45 +00:00
Gary Jian
13a0a175f2
Merge "Added KEY_VONR_ENABLED_BOOL to obtain VoNR availability status" into sc-v2-dev am: 7f809bda12
am: 782506f61c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16259269
Change-Id: I20b4111b21ea17e7502745974b5bc93710d79c43
2021-11-17 02:02:33 +00:00
Bonian Chen
7dff8c7210
[Settings] Avoid from dialog disappear when click outside
...
Avoid dialog from unexpected close when click out of dialog area.
This create better user experience since user might not click to the
correct area all the time.
Bug: 204020202
Test: local
Change-Id: Ice5cde73eb849f3e5722ab778be41615746210c0
(cherry picked from commit 3cb6a7a705
)
2021-11-17 02:01:42 +00:00
Bonian Chen
9281bed78a
Merge "[Settings] Avoid from dialog disappear when click outside"
2021-11-17 02:01:15 +00:00
TreeHugger Robot
943d68127c
Merge "Fix suw display size flicker problem" into sc-v2-dev
2021-11-17 01:51:52 +00:00