Commit Graph

40562 Commits

Author SHA1 Message Date
Jack Yu
a88ab65024 Merge "NFC support in work profile" am: c2647199ce am: 79675e89f2 am: 3ccf7e29f8 am: 9a0ab00ac4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: Iba1aa937305510540c04468966e62d7d3c5c10f9
2021-11-22 11:34:56 +00:00
Jack Yu
9a0ab00ac4 Merge "NFC support in work profile" am: c2647199ce am: 79675e89f2 am: 3ccf7e29f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: Ib97dd1b197a362258552a45d7d9b40565da96cb5
2021-11-22 11:23:29 +00:00
Jack Yu
3ccf7e29f8 Merge "NFC support in work profile" am: c2647199ce am: 79675e89f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: I6526b8a3f83c72870a93777d37242f1fb191568f
2021-11-22 11:12:20 +00:00
Jack Yu
79675e89f2 Merge "NFC support in work profile" am: c2647199ce
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1856215

Change-Id: Iac30f77fd5d732bb3b50fc531600fed02d477919
2021-11-22 11:00:16 +00:00
Jack Yu
c2647199ce Merge "NFC support in work profile" 2021-11-22 10:45:44 +00:00
SongFerng Wang
af10ccea9b Merge "[MEP] eSIM deprecated API Refactoring" 2021-11-22 06:53:38 +00:00
Jason Chiu
90eef24080 UI refinement of highlighted menu entry for large screen
- Add a new highlight background drawable
- Add two homepage specific preferences for the new layout design

Fix: 207079684
Test: visual
Change-Id: I20c80da090a03129bffa845d443ee5d1ad13b97b
2021-11-22 12:36:05 +08:00
SongFerngWang
73f1633973 [MEP] eSIM deprecated API Refactoring
The telephony APIs were changed, the Settings needs the refactoring.

Bug: 206801604
Test: build pass.
atest QuerySimSlotIndexTest (PASS)
atest SelectableSubscriptionsTest (PASS)

Change-Id: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
2021-11-22 12:03:46 +08:00
TreeHugger Robot
ddb2a57d7a Merge "Redesign homepage layout for two-pane mode." into sc-v2-dev am: 4e78e0923f am: 1e160f1799
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263227

Change-Id: Ie73b68cce81c56a39be87c0da665247bd26d1da1
2021-11-22 02:52:51 +00:00
TreeHugger Robot
1e160f1799 Merge "Redesign homepage layout for two-pane mode." into sc-v2-dev am: 4e78e0923f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263227

Change-Id: I8758e0687986f5ea7ee4afa2a87e4add947fb07d
2021-11-22 02:41:09 +00:00
TreeHugger Robot
4e78e0923f Merge "Redesign homepage layout for two-pane mode." into sc-v2-dev 2021-11-22 02:28:27 +00:00
Weng Su
5c00d3c074 SoftAp: Use toString() API in place of toBinaryString for indexes
Security option index values are currently converted using
toBinaryString() which converts indexes to binary String. Thus
index values doesn't match the expected Security config values in
SoftApConfiguration.

This commit uses toString() API to avoid index mismatch.

Bug: 197497991
Test: manual test
atest -c WifiTetherSecurityPreferenceControllerTest

Change-Id: I43d236d071a8141845f312c63b1a693fde254358
2021-11-19 23:03:32 +08:00
Bonian Chen
a81acf8a26 [Settings] Remove space before WiFiCalling description
Align the description part to upper left corner of the description area.

Bug: 191525963
Test: local
Change-Id: I8bbe6c653c51b8ca43d936e50166f0f8bfb1acdc
2021-11-19 13:13:53 +08:00
Kevin Han
6dc2c76da0 Merge "Unhibernate an app when a user exempts it" into sc-v2-dev am: 83a8b76ec2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16286576

Change-Id: Icacd93b1f5b0cfe950dd4e4ccc0f8081ad1d58c3
2021-11-18 21:58:23 +00:00
Kevin Han
83a8b76ec2 Merge "Unhibernate an app when a user exempts it" into sc-v2-dev 2021-11-18 21:37:46 +00:00
Zoey Chen
54c11f53cc Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d am: ca02377238
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: Id27a7fed84ef5e33edddc4e951b77d7705d8e9be
2021-11-18 20:27:46 +00:00
Jason Chiu
ed406e779c Merge "Start deep link page synchronously in SettingsActivity" into sc-v2-dev am: b4d3278a45 am: e7a681748e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263226

Change-Id: I937db64f2c4ab9dfb82637bc7c775c05c4383fb6
2021-11-18 20:26:23 +00:00
Jason Hsu
ab4e03b75d Merge "Provide ability to link to Color Inversion page via Intent" into sc-v2-dev am: 0a8f978357 am: 105bca800a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013675

Change-Id: Ie658368403f9564a4a5580e55e22ec5862fe6f2d
2021-11-18 20:25:17 +00:00
Zoey Chen
ca02377238 Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: I40d08bd3d76425c504c2f17cf73a36e36d261615
2021-11-18 19:48:11 +00:00
Jason Chiu
e7a681748e Merge "Start deep link page synchronously in SettingsActivity" into sc-v2-dev am: b4d3278a45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263226

Change-Id: Id203bbb5f0d0e0c345494c111ad8c0c296b8e6e5
2021-11-18 19:48:02 +00:00
Jason Hsu
105bca800a Merge "Provide ability to link to Color Inversion page via Intent" into sc-v2-dev am: 0a8f978357
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16013675

Change-Id: Ia9b87f0a221574c54d65700da9f046b301b7d3b5
2021-11-18 19:46:47 +00:00
Matt Pietal
eecacebf5d Merge "Allow a settings override for double-line clock" 2021-11-18 15:14:33 +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
Jason Chiu
b4d3278a45 Merge "Start deep link page synchronously in SettingsActivity" into sc-v2-dev 2021-11-18 09:34:20 +00:00
Betty Chang
8ed7411e88 Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev am: 21967a6ff8 am: 4375590837
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16263228

Change-Id: Ie89df57dc909dd6e7272c799bfd390a476b2a4cd
2021-11-18 06:47:22 +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
21967a6ff8 Merge "Remove feature flag for provider model in wifi settings" into sc-v2-dev 2021-11-18 06:18:08 +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
Makoto Onuki
fcb067b577 Merge "Use different exceptions for different crash reasons" into sc-v2-dev 2021-11-17 17:52:56 +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
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
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
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