Commit Graph

41974 Commits

Author SHA1 Message Date
Betty Chang
571ef48801 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ib1cf8d4fbfeaee40c46574d995c112341bdb3b5a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 11:03:52 +00:00
Betty Chang
af1e12cf26 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: Ieb87da91f486efe72ef5cff43aa99982e8ad9f9f
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:57:16 +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
Jason Chiu
031dfc79a9 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: 89f5d2d442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: I0d3bb825b7f11c4763b3ad1762eb4edc07ecfc8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:08:58 +00:00
Jason Chiu
89f5d2d442 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: I6944c307eba807fc351a0acd404edac6ddd1e22b
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:46:48 +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
2f29b5be0f Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: 78a9701de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I413c08fc365319302f5a5885c846523404e1f942
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:14:01 +00:00
Prabal Singh
c771c8bf94 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: 888deb9328
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: Ie60a5a246352930881c50774b61197ced7f7c5ce
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:13:53 +00:00
SongFerng Wang
78a9701de0 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: I91a231d6c86a2f594feb5eb9604653247273e6ae
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:49:45 +00:00
Prabal Singh
888deb9328 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: Ic3d77ecb6d22e632feefc75773b84e6d7da270c8
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:49:38 +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
Prabal Singh
591c2c3b38 Merge "Use settingslib util methods for work policy info" into tm-dev 2022-04-25 07:33:09 +00: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
a72a931706 Fix 'Documents & other' missing problem am: 03b1b23c74 am: a3b164bcc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929

Change-Id: I662f75beb94a6e75c3208f9098e9027d4f71cf07
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 04:18:05 +00:00
Arc Wang
a3b164bcc4 Fix 'Documents & other' missing problem am: 03b1b23c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910929

Change-Id: Ibe6da087880153d6da8e3ab4827768300f4a1076
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:54:00 +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
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
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
Ricky Wai
cbeee15903 Merge "Apply enhanced confirmation mode OEM config to Settings" into tm-dev am: fd7153ed39 am: 8f61acd8c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615240

Change-Id: Ic8af009c1dd59d59d45139379c2d66c4d8992baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:44:59 +00:00
Ricky Wai
8f61acd8c2 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: I8342a30b9e86699fcce7f8f5858572def92c30ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 15:18:58 +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
TreeHugger Robot
172e1f5958 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: fb74f218a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346

Change-Id: I50c8138aa47d696e68f1d45059de7da4ca0a38ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:34:50 +00:00
TreeHugger Robot
fb74f218a9 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346

Change-Id: Ia682eb788f6ecc8c7f7f9b1533f1e78d0b8c93b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:08:49 +00:00
TreeHugger Robot
49cc66afd3 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev 2022-04-22 05:50:05 +00:00
Chaohui Wang
e6adea223c Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 956f0a8cc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I5e359cdb6af0e6845544c03dba06d1fd2b8cf520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:11:39 +00:00
Stanley Wang
0f2adc2166 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 18206def81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: I56cca0c9d5d7baf8b316a22ba6e5125874cb5395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:11:33 +00:00
Chaohui Wang
956f0a8cc2 Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I36dbc24d358252cbc935eec76e23287e774823dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:35:55 +00:00
Stanley Wang
18206def81 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: Ia0b0ec3b7a772d241112cc7f45d42a677de4a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:35:46 +00:00
Chaohui Wang
932d5deaff Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev 2022-04-22 02:15:23 +00:00
Stanley Wang
2e2a484a88 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev 2022-04-22 02:08:12 +00:00
Abel Tesfaye
8814d96884 Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver
Controllers are automatically bound to a lifecycle if registered in the xml file. Manually binding a lifecycle can cause multiple receivers to be unregistered/registered. Removing the manual binding will prevent this case from causing a potential exception.

Bug: 227762968

Test: none
Change-Id: I9c8ddc6f82b19cd4a9c8a4aec3c9c744935cd542
2022-04-21 21:31:03 +00:00
Menghan Li
c79146f0e4 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: 86b7b541c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: Ia07708a483017cf91aca1d2ad873a1eb154a249c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:42:02 +00:00
Menghan Li
86b7b541c8 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I6a57775ebb2b49067e6488c8f9526d069abc9ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:25:23 +00:00
Menghan Li
1ce6beb80f Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev 2022-04-21 13:06:30 +00:00
TreeHugger Robot
5ff02d62de Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb am: c3ea2c20d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: I5015dec25f994cce0193da3c9a87c14a94dc3593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:41:40 +00:00
TreeHugger Robot
c3ea2c20d2 Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: Ifa819b3296a90f9b15ff0246ada10530fb6534db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:18:20 +00:00
menghanli
0d47c548d9 Fix Live Caption does not follow caption size if caption is not enabled
Root cause: Changing captions style without turning on the preference WHILE Live Caption is running works when it shouldn't.
Solution: Turn on the show caption if users change caption size and style by UX suggestion.

Bug: 221051127
Test: Manual testing
  1. Turning on/off Live Caption and Caption Manager
  2. Changing styles when Caption Manager is off
Change-Id: Ie6cfb9e0b7325c2e469ac8b6a7d359b843cc173a
2022-04-21 17:01:15 +08:00
Neil Fuller
131d297dbd Merge "Fix logic used for auto time zone settings" into tm-qpr-dev 2022-04-21 08:33:06 +00:00
TreeHugger Robot
a7e03159cb Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev 2022-04-21 08:07:49 +00:00
Stanley Wang
2b7cadac12 Fix the problem that apps can read SIM card information through
screenshots.

Fix: 217377618
Test: manually test and review the UI
Change-Id: I645c4acc9943a17430889dfeee064a42178870ec
2022-04-21 14:02:11 +08:00
Menghan Li
8b1f3b0628 Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c am: bf9232739a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712

Change-Id: I7e00f6edb80abef178d39f8eda3016de35632a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:46:36 +00:00
Menghan Li
bf9232739a Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev am: ef9178146c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799712

Change-Id: I94c80193a6e51effbb21fcb53d4126628f352172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:28:32 +00:00
Menghan Li
ef9178146c Merge "Fix quick settings tooltip changed when color correction fab clicked" into tm-dev 2022-04-20 21:05:29 +00:00
PETER LIANG
37fa12e2d6 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I74bb43797299b183a40f9050b6256e768361c7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:20:24 +00:00
PETER LIANG
cc4af05607 Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267

Change-Id: I14be163454ca16655f88e1d9195e891e065c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:01:07 +00:00
Bonian Chen
3856ac4be9 [Settings] Code refactor for async Lifecycle listening
This is an extension of LifecycleCallbackAdapter.
A postResult(T) and a Consumer<T> is designed for supporting pass result
back to UI thread, and is invoked only when required.

Bug: 229689535
Test: unit test
Change-Id: I0ef5afc31cd23aa865a2dd1d05f9b212242c2e41
(cherry picked from commit 5d2a76cbb4)
2022-04-20 12:47:39 +00:00
Bonian Chen
37a326bd3e [Settings] Code refactor for Lifecycle listening
This is an abstract class for building a set of callback behavior
based on Lifecycle status change.

Through extending this class, the implemented methods are invoked
only when required.

Bug: 229689535
Test: unit test
Change-Id: I7534393546f821738a63ebde121a5a88ee03b23b
(cherry picked from commit 9a4c66d23b)
2022-04-20 12:46:26 +00:00
PETER LIANG
8cb0439d9c Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev 2022-04-20 12:37:22 +00:00
TreeHugger Robot
b52b7e797a Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: 7906685ce3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: I5ffe17cbfb8f0ce475866c786d8423e9ac11ccae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 12:23:32 +00:00