Commit Graph

103221 Commits

Author SHA1 Message Date
Chaohui Wang
1a39660de0 Merge "Update Personal / work selection UI." into tm-dev 2022-04-26 06:34:37 +00:00
Jason Chiu
50893331e5 Merge "Renew the highlight state color" into tm-dev am: 81ee2037ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910935

Change-Id: I2d6f4e17cda08de25b4963e729048bc70ee48deb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:11:58 +00:00
TreeHugger Robot
4e3f5c9253 Merge "Change the alignment of the foreground preferernce controller" into tm-dev am: 5a083d2bfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910933

Change-Id: I9d3a483b648c9a8f55943c18e5388541a3749abb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:11:51 +00:00
Jason Chiu
81ee2037ed Merge "Renew the highlight state color" into tm-dev 2022-04-26 06:08:40 +00:00
TreeHugger Robot
5a083d2bfe Merge "Change the alignment of the foreground preferernce controller" into tm-dev 2022-04-26 05:44:37 +00:00
Ben Murdoch
cab2b2c4d0 Fix NPE in Bluetooth Settings.
Bug: 230347816
Test: Manual
Change-Id: I210ce81217466897c59509a31fb53d57eed71118
2022-04-25 18:40:54 +00:00
TreeHugger Robot
62b2539aae Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Icd32bbd11e1bcd24503b59659d05d4c3484bf0af
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4 Merge "Allow intent into Privacy Controls page" into tm-dev 2022-04-25 18:09:39 +00:00
Jason Chang
f38cec326a Fix the description of one-handed mode doesn't change immediately in
Gestures page after users turn on/off in Quick Settings

Add ContentObserver URI for observing when settings key
"one_handed_mode_enabled" changes.

Bug: 230041450

Test: manually verified on System > Gestures >
One-handed mode item when turned  on/off in Quick Settings

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures.
OneHandedEnablePreferenceControllerTest"

Change-Id: Id6bb53692181dfc3c8a1006017b5a22462dc4ad9
2022-04-26 01:50:43 +08:00
Lais Andrade
cc8790f7b3 Create separate On/Off string resources for Vibration & haptics
Some translators need to be able to adapt the text for On/Off preference
state to match the preference title "Vibration & haptics", which
requires a different inflection and plural form on some languages.

This change separates this resource string from the more generic one
that was used before to allow this flexible translation.

Fix: 228342641
Fix: 229060423
Test: VibrationPreferenceControllerTest
Change-Id: Ib46b3e0d0a980ff57e91f55c73348c440327bad7
2022-04-25 17:15:39 +01:00
Jan Tomljanovic
70c4143751 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I08a4ffc1e1c0c4b71a3a2292c58e9545e3bf3b36
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:23:01 +00:00
Jan Tomljanovic
e22fa138aa Merge "Don't show back arrow in Security when in split mode." into tm-dev 2022-04-25 13:52:31 +00:00
SongFerngWang
e5fff060a2 [MEP] show the DSDS mode selection dialog for user when user insert esim
If device has esim, then user inserts esim in SS mode. Then, UI should show
the DSDS mode selection dialog for user.

Bug: 230050990
Test: build pass and manual test.
Change-Id: Ia4e695ae2c4e86d6039e03738378989a0879cc71
2022-04-25 21:07:26 +08:00
Chaohui Wang
f250493787 Update Personal / work selection UI.
Implement the new-look by using AlertDialog's
custom title and custom view.
Using the RecyclerView so we can display profile
horizontally.

Bug: 174626616
Test: manual & robolectric
Change-Id: I9f5a7685d9217fc62e01799ad73f9b9a3ddbf19a
2022-04-25 19:12:38 +08:00
Betty Chang
38ca4482f7 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: I89b3eaa44f88f4a3a86eeb295e3760446f115a5e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:55:28 +00:00
Betty Chang
662a45bc0a Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev 2022-04-25 10:39:42 +00:00
Jan Tomljanovic
ef817325bc Don't show back arrow in Security when in split mode.
Test: manual
Bug: 224427042
Change-Id: I0b0daa3981c56ba99bebda2cd34a51f3877f37a6
2022-04-25 10:37:55 +01:00
Jason Chiu
286048f638 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: Ie8eceb4941bd4775994b9fe2e5d640a1fda978fa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:45:51 +00:00
Jason Chiu
346a40a6f5 Merge "Relaunch the account page after removing a work account" into tm-dev 2022-04-25 08:28:43 +00:00
SongFerng Wang
a7a5061f08 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: Iaea308bce7c671764a8a8922cd7559849f253d5b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:48:48 +00:00
Prabal Singh
9fa00378f7 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: I367725b607bc93181341a14a06d376ef50f59521
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 07:48:39 +00:00
SongFerng Wang
564c88485a Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev 2022-04-25 07:40:43 +00:00
Jason Chiu
880471a1b0 Renew the highlight state color
Fix: 230283855
Test: visual
Change-Id: I725422518d07a0b0676731bd9da8384ab149ab1b
2022-04-25 15:34:42 +08:00
Prabal Singh
591c2c3b38 Merge "Use settingslib util methods for work policy info" into tm-dev 2022-04-25 07:33:09 +00:00
Jack Yu
bf3a207fb5 Change the alignment of the foreground preferernce controller
Set left align to the nfc foreground preference controller.

Bug: 223073535
Test: manual
Change-Id: I0d4ffcedb2646b9d3fd7f4d56adb0d000cfd5987
2022-04-25 15:27:05 +08:00
Jason Chiu
9c1a1cb884 Relaunch the account page after removing a work account
Removing a work account goes back the previous page.
However, this closes Settings app in dual pane mode since the account
page is in the 2nd layer.

Bug: 223755141
Test: manual, robotest
Change-Id: I40407cb052c0474f62254bcb2216e33496c901c8
2022-04-25 12:39:51 +08:00
Arc Wang
fec02dd404 Fix 'Documents & other' missing problem am: 03b1b23c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929

Change-Id: I5cd5ff4c3c8a5a00a9e286d6f831c82812f91366
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 03:53:06 +00:00
changbetty
d1d9798a5d [LE Audio] Add entry point in Media Volume slice for broadcast sink
Bug: 228274114
Test: make RunSettingsRoboTests
Test: Manual test
Change-Id: I331232c30291348faf7166d4de8060a1cfe12bff
2022-04-25 02:42:46 +00:00
jasonwshsu
e48ebb9755 Correct Magnification shortcut title
Root Cause: Magnification has its own ShortcutPreference, but we did not
update correct title with getShortcutTitle()

Solution: Call setTitle(getShortcutTitle()) in initShortcutPreference()

Bug: 228752572
Test: manual test
Change-Id: I85b09a22032bad0a0c840590a98be88538a0499b
2022-04-25 02:53:15 +08:00
Bill Yi
0c2f84941f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9751d68c866e0a2d4fb7875884e506a0406c24e5
2022-04-24 11:07:35 +00:00
Bill Yi
35705d94c8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7f7b9a0d0a9e6a46aa83fb414c35f71012b80d86
2022-04-24 10:59:49 +00:00
Bill Yi
3f51a847ff Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic5d11353374e71949e9ef2300c55c90958c2cb06
2022-04-24 09:15:34 +00:00
Bill Yi
aaa5c995b4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I281c7a22ec286bafd8776557ec99bf5d93ee72f2
2022-04-24 09:06:06 +00:00
Bill Yi
12b3ef3439 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ief5d8f3856cfe12f42c4cb151058207607e1c575
2022-04-24 08:59:20 +00:00
Arc Wang
03b1b23c74 Fix 'Documents & other' missing problem
Should check if 'Documents & other' is visible
when mVolume is updated.

Bug: 230215783
Test: manual visual
      Settings -> Storage
Change-Id: Ife36b71bee66ff16802e352785824e10c17dceb8
2022-04-24 15:30:16 +08:00
Bill Yi
eec01885fe Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:53 +00:00
Bill Yi
f5ea12c99d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-23 23:26:53 +00:00
Prabal Singh
67007e5933 Use settingslib util methods for work policy info
Bug: b/229889270
Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40
Change-Id: I0d968732a4dd601955e18b2ebb2af365638b450f
2022-04-23 20:35:41 +01:00
Nate Myren
d1749cfbab Allow intent into Privacy Controls page
Test: manual
Bug: 222127397
Change-Id: If98ce8b89332eaaaa9be70885afe9d8465c191dd
2022-04-22 13:58:50 -07:00
Ricky Wai
3ab907b968 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: I6a88065f868d567bd7771a8e44ac65e23ee12999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:18:19 +00:00
Ricky Wai
fd7153ed39 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev 2022-04-22 14:53:00 +00:00
SongFerngWang
b76feffe4f Gray out the network mode UI before the carrier config is ready
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
Bonian Chen
aeac0619df [Settings] Code refactor for combining TelephonyCallback with Lifecycle
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad)
2022-04-22 10:39:04 +00:00
TreeHugger Robot
2b2fab41f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I52f5e12c78b60eccf6adde49a51b7cde996b6d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:18:41 +00:00
Bill Yi
52294cceea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I7306e7016fe40a97f23d2072b657112e1a83a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:18:24 +00:00
TreeHugger Robot
7d5cc42c81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17846024

Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:52:01 +00:00
Bill Yi
77893f9b81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663

Change-Id: I837f50c29d924b84ae438fd630813338a0d50e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:20:10 +00:00
Bill Yi
772186e057 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17838663

Change-Id: If2a2da1244c5302bc3421db1a5570cb5a674cffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:19:42 +00:00
Bill Yi
cfd4e0e395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17837668

Change-Id: Ie301565e0ffb8d2630c42235d47c1afa64e85be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:19:17 +00:00