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
Bonian Chen
ee0756f684
Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle"
2022-04-20 16:54:04 +00:00
PETER LIANG
15809b88a7
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: eff73403b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: Iee16bf249ba960089108f55ff76d30e0c6bfc8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 16:13:49 +00:00
TreeHugger Robot
6f996f5299
Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: a02cd9a9a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265
Change-Id: Id223c21c0a2ebccd023996568753b8dd62b1a327
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 16:11:43 +00:00
Bill Lin
37e401cf1a
Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 2f571e625b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713
Change-Id: Iadca46cc270eeb5aa6672f37cea43cd0fab9d3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 16:04:59 +00:00
Bill Yi
4f244d1285
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours am: 1387d55ef6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I9efcd4d0ed7fbde9ef8964bef9dcff7af1e927ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 15:59:43 +00:00
Bill Yi
86481bed5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours am: e40f48737c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I0f127347eebb3af9f07ea37c9fcaa69eaa46a4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 15:59:39 +00:00
Bill Yi
86286d9d90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours am: 58b1768062 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801771
Change-Id: Id574c0669d405cf567cb7fbe6ab8bb2dee9e9c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 15:52:59 +00:00
PETER LIANG
eff73403b7
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: I543d48929fffe3e7da4f218bcf99a7feeca143e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 15:01:57 +00:00
TreeHugger Robot
a02cd9a9a6
Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265
Change-Id: I4da83ee7f9175771ae83660daacffd9528911e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:58:39 +00:00
Bill Lin
2f571e625b
Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713
Change-Id: If52256798af1ea847e4106939a424695c8ca27e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:56:37 +00:00
Bill Yi
1387d55ef6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: Idd019c9a58d2d6c6ae77e7cbb7fe49caab4a969c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:54:39 +00:00
Bill Yi
e40f48737c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 442f62eb55 -s ours am: 5e99e584f5 -s ours am: a20fed1d1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: Ifbbfd334549063018382a15eadf92793eefe1df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:54:38 +00:00
Bill Yi
58b1768062
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64a0937f54 -s ours am: 9d597ae5b0 -s ours am: cc6641c043 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801771
Change-Id: I1a275c4accf1366db2fe012dc11202a1ab30bfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:51:11 +00:00
PETER LIANG
b579c1aa43
Merge "Should popup the confirmation toast after clicking the reset button." into tm-dev am: 8cb0439d9c am: cc4af05607 am: 37fa12e2d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822267
Change-Id: I078115b77edc9cd16a8ac4c5eb56f88b2048f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:07:51 +00:00
TreeHugger Robot
747e75a53a
Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: 7906685ce3 am: b52b7e797a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265
Change-Id: Iad90429168b95b1f972fb85e7cfb0cfb3f7469b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:03:24 +00:00
Bill Lin
be2b0b652e
Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev am: 426f8a58e1 am: 7f0e76eed5 am: b8e2c1c1d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799713
Change-Id: I7d2ece7318a9b2364265d8c564ecc75d03b6b38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 14:00:54 +00:00
Xin Li
b7dacb658f
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 99d834b0b8 -s ours am: 024fe4b39a -s ours am: 39e1357748 -s ours am: f6cf1a9647 -s ours
...
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 d0a23dc840 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17805671
Change-Id: I614fa3b0d22969f47b7320d7ab562cb17e7f9b29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:49:46 +00:00
Bill Yi
523852d4a9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 052970997d -s ours am: c88b882013 -s ours am: 2e39766a1f -s ours am: 15e7eb7203 -s ours am: 338893d6bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801571
Change-Id: I97ca6478d749a96880eac0e3d949cd8ea1cd0acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 13:34:48 +00:00