Commit Graph

105400 Commits

Author SHA1 Message Date
Menghan Li
c8ad8d1095 Merge "Fix Live Caption does not follow caption size if caption is not enabled" into tm-dev am: 1ce6beb80f am: d14121e919
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859333

Change-Id: I1326f80afb4db7ac3dbce3b44bf93b9138a813e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:41:44 +00:00
Menghan Li
ec2bf30db9 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195 am: be78d76b8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I693b7b52baf23cf0980b41766a9d0179e1856920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:41:26 +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
3209314649 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I85691ff2e25e3fc10ccec6d5e09cdfb864655752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:24:58 +00:00
Menghan Li
d14121e919 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: I490ca541e33e0c65ecac53700c2d248fcd496f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:24:29 +00:00
Menghan Li
be78d76b8b Merge "Fine tune Caption size and style preview height for tablet" into tm-dev am: 2090748195
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17886944

Change-Id: I76c9b76862f6a9c416acbc83f434610f18f69c6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 13:24:00 +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
Menghan Li
2090748195 Merge "Fine tune Caption size and style preview height for tablet" into tm-dev 2022-04-21 13:06:13 +00:00
Bonian Chen
7d5161b850 Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" 2022-04-21 12:44:45 +00:00
TreeHugger Robot
33ad77a4d3 Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb am: c3ea2c20d2 am: 5ff02d62de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: Ia256d762b0d63b0ca109a372abf68f7bc3ad4654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 10:03:54 +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
b27eb37231 Merge "[Settings] Code refactor for Lifecycle listening" into tm-dev am: a7e03159cb am: 6e1d390e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859345

Change-Id: I48e80addbe4c53a59a437ebd13d04f0e80683476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:31:47 +00:00
menghanli
d44da3b959 Fine tune Caption size and style preview height for tablet
Root cause: We introduce the material design illustration in Android S. The most of illustration preview height is 300dp, but the SubTitleView preview keep 200dp in the phone and 150dp in tablet. The value is defined in 2017.
Solution: Align material design illustration height which looks a lot closer to an actual video, without pushing too much content below the screen.

Bug: 227264630
Test: Manual testing
Change-Id: I1a9040f50dfb6fb95c1cadbe4e7e4d24ff8ab058
2022-04-21 17:24:37 +08: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
Neil Fuller
3d0fd9fc08 Merge "Fix logic used for auto time zone settings" into tm-qpr-dev am: 131d297dbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17819250

Change-Id: I903322122213f13701173ed55adf9cb30743e2da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:16:34 +00:00
TreeHugger Robot
6e1d390e2f 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: I56837b44d3a33b846fe1e44ea969cc3166081360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 09:15:53 +00:00
Peter_Liang
7f67e278ca Fine-tune the location and style of the reset button in the “Display size and text” page.
Bug: 222419452
Test: manual test
Change-Id: I9099f13c715ce29cce8d52f6ca9cc47a4fa22306
2022-04-21 17:09:10 +08: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
Joshua McCloskey
10d0cd52d6 Modified Fp -> Face setup flow
Test: Skip FP, Enroll Face, hit back button, observe that you will go
back to Fingerprint enrollment.
Test: Verify that after completing a biometric enroll we no longer
show the introduction activity with a "Done" button.
Fixes: 229813512

Change-Id: Ie0d7ce5d5cef084b3614afce10e05dc72c86b492
2022-04-21 03:59:39 +00:00
Bonian Chen
887ec6c32c [Settings] Code refactor for monitoring voice call status
This is for monitoring the status of voice call when Lifecycle state
STARTED or RESUMED.

Bug: 229689535
Test: unit test
Change-Id: Ifa3e0c5aa474a2539ad66338ea8c3564ea33744e
2022-04-21 11:13:48 +08:00
Bonian Chen
7c5259efad [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
2022-04-21 11:04:44 +08:00
PETER LIANG
7ced1f7171 Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba am: 01655dec4f am: b68aa851ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: I4c089ea50c078650865d05b5ce6df814c167b5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:50:29 +00:00
PETER LIANG
8590f061e8 Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c am: 9e608223e2 am: e12ddd0efb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I934dee17e2657d22b8b856873654cec17b1329b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:50:21 +00:00
PETER LIANG
b68aa851ea Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba am: 01655dec4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: I18239a84c15f1c9ea078afe885533a8983adc619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:32:23 +00:00
PETER LIANG
e12ddd0efb Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c am: 9e608223e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I87eddeac1b52dffbffacf9278780fef676dff09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:32:17 +00:00
PETER LIANG
4c4e06bf4e Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba am: a70eecc2b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: Id49cce5ab448b64a6a6cf12e9136d7591d0db440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:31:50 +00:00
PETER LIANG
3bdd82f75b Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c am: 50a6b46f51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I939a5bde83a2e23aa1c20b5e726a974e6c648b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:31:28 +00:00
PETER LIANG
01655dec4f Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: Ia6502d8639ef27d0a70a10217797a39dfe9dff47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:04:14 +00:00
PETER LIANG
9e608223e2 Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I04cd5142410af1d2d948cc33abe0c83ea8f4900b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:04:00 +00:00
PETER LIANG
a70eecc2b3 Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev am: e774a70cba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822266

Change-Id: Iad200b4be8e8f4e819f60e431f9b0cb7e35da1f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:03:21 +00:00
PETER LIANG
50a6b46f51 Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f278c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268

Change-Id: I2e7d352611f8ee628ec532fdda5e82431a2dca0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 02:03:10 +00:00
PETER LIANG
e774a70cba Merge "Prevent cutting the thumb of the LabeledSeekBarPreference from different themes." into tm-dev 2022-04-21 01:35:25 +00:00
PETER LIANG
62be1f278c Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev 2022-04-21 01:28:10 +00:00
Quang Luong
168e2f8f4b Use WifiEntry.getBandString() to show band for Frequency preference
Display string for Wifi band is now available via
WifiEntry.getBandString(), so use this for the Frequency preference in
the Network Details page. This API also allows the band string to be
shown for disconnected but in-range networks.

Bug: 190390803
Test: manually verify Frequency preference is populated in Network
Details page for both connected and disconnected but in-range networks.

Change-Id: I83bec35c659a9ba04964675e3d800f1dd051d155
2022-04-20 22:50:18 +00:00
Abel Tesfaye
2b72b76b64 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 am: 6aa417f742 am: cf601f574b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

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

Change-Id: I5d79787f41bb3a7fe8850f616e2fb3bbf1a4a0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:03:26 +00:00
Abel Tesfaye
cf601f574b Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 am: 6aa417f742
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: I02147541619d5d5220687ddedf59bf33b2681a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:46:46 +00: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
Abel Tesfaye
ea25009e67 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449 am: 6cda44f810
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

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

Change-Id: Ic889b5a640662656b0b9ab3790a1cf685f5ade69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:46:03 +00:00
Abel Tesfaye
6aa417f742 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: Ic7821af2b92a2d93dac0533ee9b13e9ff8babf4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:37:53 +00:00
Abel Tesfaye
6cda44f810 Merge "Add accessibility string description for auto rotate" into tm-dev am: 3adc967449
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835757

Change-Id: I2d2fe276a2d0841da10c15e6a3a7dada1dc69d9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:36:44 +00:00
Abel Tesfaye
3adc967449 Merge "Add accessibility string description for auto rotate" into tm-dev 2022-04-20 21:31:23 +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
caf42f2cc7 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: I7a88099ca0aac552e8608bf3d066ff1030f9f1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:27:14 +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
Bonian Chen
81d230b250 [Settings] Code refactor for BroadcastReceiver under Lifecycle
This is an implementation of BroadcastReceiver which supported by
LifecycleCallbackConverter.
Registration of BroadcastReceiver only take place when Lifecycle in
RESUME status.

Bug: 229689535
Test: unit test
Change-Id: Ia2af82d5cbb391034627e5259a9e0c8683a0c5a1
(cherry picked from commit c2030898ef)
2022-04-20 16:54:41 +00:00