Commit Graph

37964 Commits

Author SHA1 Message Date
YUKAI HUNG
0051f1e3e9 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 am: fab65bcfe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I760b2d0d9a85b271c6a11c0d0255a164d5aba6dc
2021-09-03 02:58:37 +00:00
YUKAI HUNG
fab65bcfe5 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I39400598833b3de8ae60b6c9901fdbcc6015a16f
2021-09-03 02:48:48 +00:00
YUKAI HUNG
3f1d329878 Merge "Hide Camera background running time in the battery usage screen" into sc-dev 2021-09-03 02:33:22 +00:00
Treehugger Robot
e81eb6bd40 Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 am: fb1bf5f85e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I11c518f21390017a8aa93e8c201ecc3da752b5c1
2021-09-02 09:38:25 +00:00
Treehugger Robot
fb1bf5f85e Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I897892c6f9bf29174775917568a9e83714b74af2
2021-09-02 09:25:52 +00:00
Treehugger Robot
6eb3f3bf90 Merge "Support multi-users for NFC payments" am: 6eb702ed63
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I1f20e829bf513d8166458e1749bcc8c9fade07b2
2021-09-02 09:17:20 +00:00
Treehugger Robot
6eb702ed63 Merge "Support multi-users for NFC payments" 2021-09-02 08:56:28 +00:00
Zoey Chen
2d827ddf50 Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev am: f25a00217c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724801

Change-Id: Ie210682def804b99f21e3803d95c4d14828af77c
2021-09-01 04:12:08 +00:00
Zoey Chen
f25a00217c Merge "[Provider Model] Add a cutout for signal icon if the mobilde data is disabled" into sc-qpr1-dev 2021-09-01 03:58:13 +00:00
Joe Bolinger
95626d62f3 Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 am: 46470d911e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Idaec22cc49b17bc088380ec4da7ce51e2f037856
2021-09-01 01:43:26 +00:00
Joe Bolinger
bc188f609c Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: Ifd9ebd5877ce8020c0c977db8f6744c03ca24c70
2021-09-01 01:26:40 +00:00
Joe Bolinger
46470d911e Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: I8423ebeee18eb6e9213a2e45bc5f2eed3a19aabd
2021-09-01 01:25:27 +00:00
TreeHugger Robot
0164a3a724 Merge "Log when DEBUG is on" into sc-qpr1-dev am: 736bce563e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15598813

Change-Id: I527bfca7a4397af216b2abd2b04ab157d1ad1adf
2021-08-31 22:40:47 +00:00
TreeHugger Robot
736bce563e Merge "Log when DEBUG is on" into sc-qpr1-dev 2021-08-31 22:19:19 +00:00
Zoey Chen
35803a3b03 [Provider Model] Add a cutout for signal icon if the mobilde data is disabled
Screenshot: https://screenshot.googleplex.com/57wPkj9pq9hP5WA.png

Bug: 198233143
Test: manual, atest SubscriptionsPreferenceControllerTest
Change-Id: I3caefc7e1ca10dadcad114273edf35d9309502e1
2021-08-31 16:03:23 +00:00
ykhung
4e3f692164 Hide Camera background running time in the battery usage screen
hide camera background running time in the battery usage screen to avoid
users confuse about it, since it will standby in the backgound to sspeed
up launching time, not always running in the background

Bug: 196744910
Test: make SettingsRoboTests
Change-Id: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
Merged-In: Ia391d661bca44435fc5a68b1c86e5ca32dd0fcfe
2021-08-31 13:58:13 +00:00
Weng Su
dc50ca86fb Don't show Wi-Fi icon if the level is -1 am: 1f6f807834
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15720350

Change-Id: Ib8e3164f046f2deeca88e6d31e29058789751edc
2021-08-31 03:21:47 +00:00
Weng Su
1f6f807834 Don't show Wi-Fi icon if the level is -1
Bug: 195893448
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Change-Id: Ifddc9aace42d1f024b7c861b1207f651061d790b
(cherry picked from commit 7e14668094)
Merged-In: Ifddc9aace42d1f024b7c861b1207f651061d790b
2021-08-30 22:55:26 +00:00
Victor Liu
da15cbb50e Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888

Change-Id: If9a8aba1e56a75422b0c2a453673d0cd873d4aa1
2021-08-27 02:14:01 +00:00
Victor Liu
029b6397a8 Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev 2021-08-27 01:57:14 +00:00
Android Build Prod User
0b8ff007b7 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309

Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63
2021-08-26 21:59:26 +00:00
Android Build Prod User
ca8e67d144 Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897

Change-Id: I3d91b11afeb397e7bddea0b82d0cfe4d2faafece
2021-08-26 21:59:11 +00:00
Android Build Prod User
33af17ff31 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev 2021-08-26 21:42:36 +00:00
Android Build Prod User
71327943dc Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev 2021-08-26 21:42:27 +00:00
Joy Babafemi
14aee30625 Initialize UwbManager only if supported on device.
Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
2021-08-26 20:26:11 +00:00
Betty Chang
7e7b237092 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537

Change-Id: I4bc6a5d4d5eeccaf23d4c7da0314ebdfaf4965e4
2021-08-26 02:06:50 +00:00
Betty Chang
6a3b697141 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev 2021-08-26 01:50:56 +00:00
Zoey Chen
e964d73673 Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670

Change-Id: I8eb97e03575fb7b1d69aac24fecc22bc100cca50
2021-08-25 06:19:18 +00:00
Zoey Chen
2a87acf247 Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev 2021-08-25 06:04:30 +00:00
Zoey Chen
5c49db8d8b Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646

Change-Id: Iaae85f03949e22b76390956de127513c2b806863
2021-08-25 04:54:20 +00:00
Zoey Chen
538af552c0 Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev 2021-08-25 04:29:12 +00:00
changbetty
b1b2da9aca Change the Network preference summary for wifi option
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
Merged-In: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
2021-08-25 02:55:38 +00:00
Zoey Chen
5d3e33badf Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202

Change-Id: I9a75c6a772c6033ce5d949eddccd66bf7cf9dacd
2021-08-24 03:01:16 +00:00
changbetty
17f06cc0ed Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496

Change-Id: I49b6bd849d70f57ab3699b771cca36309e935c75
2021-08-24 03:01:15 +00:00
Zoey Chen
8c5611a7ea Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev
* changes:
  Remove some attributes to move the dialog window up
  Set the attribute of the dialog window for overlay QS internet panel
2021-08-24 02:47:23 +00:00
TreeHugger Robot
e1a95327ea Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132

Change-Id: I96c1c2cf4ae52d9fad6c0cdf7d4d20cba013e700
2021-08-23 17:42:50 +00:00
TreeHugger Robot
9436706f92 Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135

Change-Id: Ib777e0648e8b8ca63eb9ac7ca11b34f3ae3408fd
2021-08-23 17:42:33 +00:00
TreeHugger Robot
8e98df31a4 Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev 2021-08-23 17:28:43 +00:00
TreeHugger Robot
0fa8c951e0 Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev 2021-08-23 17:24:38 +00:00
TreeHugger Robot
a0c8d6d6aa Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: Id846fe391823dbfbb8dae0ea40c369d6bb8c92c8
2021-08-23 16:28:07 +00:00
Jack Yu
d2ca4038ce Support multi-users for NFC payments
Configure nfc payment settings based on different users.

Bug: 191851086
Bug: 191845397
Bug: 192994529
Test: nfc payment with 2nd user
      make RunSettingsRoboTests
      ROBOTEST_FILTER=DefaultPaymentSettingsPreferenceControllerTest
Change-Id: I52440e77b6b5837b978b381e1c1694d2b29f048e
2021-08-23 16:18:08 +00:00
TreeHugger Robot
fae29c6b33 Merge "Fix Settings crash issue" into sc-qpr1-dev 2021-08-23 16:12:13 +00:00
Joe Bolinger
f78cec292c Remove sliceable attribute from biometric preference controllers.
This removes the top-level UI switch on some of the boolean preference settings.

Bug: 193438173
Test: atest com.android.settings.biometrics
Change-Id: If1cd2cb9ae456021fcdf0efc5002db4a083b9689
2021-08-20 18:42:50 +00:00
Govinda Wasserman
26f121b673 Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673

Change-Id: Ib92603ae0210aaa025f722d0d734b11e6030386c
2021-08-20 17:31:29 +00:00
Govinda Wasserman
3869aac6d3 Revert "Revert "Add sensitivity configuration to long press power dialog""
This reverts commit c4084d4141.

Reason for revert: Dependant change has now successfully been propagated to sc-v2-dev child graphs

Change-Id: I1f6126a423c72540d219b99e20b464b51ef65923
2021-08-20 17:06:40 +00:00
TreeHugger Robot
ef2c734413 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I9d2819fd3a9a043302295e8f1c6ba9d0e67c86cf
2021-08-20 11:11:08 +00:00
Sam Chang
c4084d4141 Revert "Add sensitivity configuration to long press power dialog"
This reverts commit de2f00df41.

Reason for revert: This CL will cause build break, b/197290948

Change-Id: Ibee2d4bc5e445e863585c291b4b2741bcb4b4c81
2021-08-20 06:46:33 +00:00
Jernej Virag
a4034c602a Add sensitivity configuration to long press power dialog am: de2f00df41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611

Change-Id: I0d94e4a5157dc18fdbe454fe0a3e24377dc78d53
2021-08-19 15:16:26 +00:00
Jernej Virag
de2f00df41 Add sensitivity configuration to long press power dialog
This gives the user the ability to configure the length of the long press power gesture. The configuration values are read from config.xml and can be customized per device.

Bug: 193792060
Test: Manual test on Pixel 6 and Pixel 4 hardware devices
Test: Unit tests with make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.gestures.*"
Change-Id: Ia6595c1337244b01e9c8b2ef04dd97a9a0f03de2
2021-08-18 19:41:10 -04:00
TreeHugger Robot
9def67d894 Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: 27f9d9ce04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: Ic349cb0e82e5c6a596ab232d3b23e333b1723241
2021-08-18 22:09:41 +00:00