Milton Wu
f2567364d6
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85 am: bb7036142e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I9a25ce05ddd2093d9ab9740ffc9507bacacb5004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 02:25:45 +00:00
Milton Wu
bb7036142e
Merge "Update SUW biometric string product" into tm-dev am: 887d590e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186094
Change-Id: I606d68143b628b445fcc6377717a1035b1a57a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-07 01:58:21 +00:00
Milton Wu
887d590e85
Merge "Update SUW biometric string product" into tm-dev
2022-05-07 01:27:27 +00:00
Ayush Sharma
1376048722
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 938200e3a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ic92fb8bfd1fcb7a3cf9252b0036989b834b09af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:38:16 +00:00
Ayush Sharma
2f5f7c96d1
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ieaafe1022101cc6d66e5e3518846e3c68b71cd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:10:14 +00:00
Ayush Sharma
938200e3a8
Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207
Change-Id: Ib944ba6daa832409c6f5ae2b6b3921e4038dea33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 11:08:55 +00:00
Ayush Sharma
6e4579a816
Merge "Move set work lock message from header to footer" into tm-dev
2022-05-06 10:42:10 +00:00
TreeHugger Robot
a636c1e104
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I4da85f0178f60d6fb9c692e900f25bb333c1f8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 03:00:47 +00:00
TreeHugger Robot
a64b3585c2
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: I7830bae523e7fe0464af2c4ff821c87e46ca4a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:42:35 +00:00
TreeHugger Robot
01afe2287f
Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642
Change-Id: Ieb6aa225ddbae799d999bb018e659d7514bf014d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 02:41:16 +00:00
TreeHugger Robot
b2dd7913c0
Merge "Fix Learn more link not work" into tm-dev
2022-05-06 02:27:19 +00:00
Milton Wu
2cb52b2353
Update SUW biometric string product
...
Fingerprint strings for SUW is not consider product. Update string to
use 3 different products. They are tablet, device, and default.
Bug: 228021544
Test: Check SUW fingerprint string in tabet and phone
Change-Id: I728f52360e0c7e4972190caf47bea75a64f873ec
2022-05-06 09:59:26 +08:00
TreeHugger Robot
e4ebac3480
Merge "Add missing settings strings." into tm-dev am: af5a015198 am: b3130cd857
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I25d30bd384eefec6661be219aeae5dfa6108a59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:58:46 +00:00
TreeHugger Robot
f01fbbcec3
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: I1c10f70954313ca7a15cd83e8d0663440fb1d3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:44:42 +00:00
TreeHugger Robot
b3130cd857
Merge "Add missing settings strings." into tm-dev am: af5a015198
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17692465
Change-Id: Ib407602d7bdba7e7b60fada3ce53e3418b47efda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:42:38 +00:00
TreeHugger Robot
af5a015198
Merge "Add missing settings strings." into tm-dev
2022-05-05 13:19:07 +00:00
YK Hung
5accce3e05
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709 am: 5f597a5f18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Ifa54a030b0f028553effdc42965dbab09718515a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:11:15 +00:00
YK Hung
5f597a5f18
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: Id5e216edab65a83c6c7836e719e8dd11c500acb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:41:20 +00:00
YK Hung
75238622bf
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev am: 434009d709
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158878
Change-Id: I70e5ed6a5d04f20d0d6364cd3522a35ae0407920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:39:40 +00:00
YK Hung
434009d709
Merge "Support special tethering and removed apps UID in the usage list" into tm-dev
2022-05-05 12:18:10 +00:00
SongFerng Wang
c5618a37b4
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: 411d3acb66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I58c8d789e9e9b01c1e97acebbbf7d7c4503f6d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:28:03 +00:00
Jonathan Scott
b7f4f56cad
Add missing settings strings.
...
Also re-enable and fix tests.
Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624
Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
2022-05-05 09:12:59 +00:00
SongFerng Wang
e00cbc7885
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: I051e905d4a216f57aa2b9244cf93df203b6e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:25 +00:00
SongFerng Wang
411d3acb66
Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624
Change-Id: Ifeb0c8ee95410f9555650078a396ca0728fb9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:22 +00:00
ykhung
be10538a09
Support special tethering and removed apps UID in the usage list
...
There is a special UID for network data tethering usage, we will handle
it in a special case to avoid the current rule considering it as an
invalid UID case without showing in the usage list. We will disable the
click behavior to protect the optimization mode page first.
Bug: 227395125
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I8d96473d382ebc3253748cce8345d6f2261a233d
2022-05-05 16:17:41 +08:00
Milton Wu
130a64779e
Fix Learn more link not work
...
Old span text shall not be used in preference footer. Change
implementation to use footer learnMore APIs
Bug: 228101275
Test: Make sure "Learn more" can be clicked on Fingerprint setting page
Change-Id: Ied2326b1a75fc02e7a3fe2321735f2f9f5ac066f
2022-05-05 15:15:48 +08:00
SongFerngWang
1709c80eff
[LE broadcast sink] Add the source list in boradcast sink UI.
...
Add the source list in boradcast sink UI.
Add the password dialog.
hsv link1: https://hsv.googleplex.com/6256032201310208
hsv link2: https://hsv.googleplex.com/5934966820044800
hsv link3: https://hsv.googleplex.com/6238095344140288
Bug: 228258236
Test: manual test
Change-Id: I698c2f7aba9baa9f143a98629b8796eda57fb379
2022-05-05 06:00:45 +00:00
Ayush Sharma
322d401aa8
Move set work lock message from header to footer
...
Also update the string.
Bug: 206083998
Bug: 230625178
Test: NA
Change-Id: I3e442f6a43e01f3633255551aa42902bf24e4aa8
2022-05-04 14:29:43 +00:00
Chaohui Wang
58b70b17f7
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: 5f99fad806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I9a7101fdd4ce16c34d2ad04e36c0272f72c509a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 10:00:07 +00:00
Chaohui Wang
c2ff0c7b74
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I0c1cc0c3dce818db23d6de7dbb1b99445aebae72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:02:04 +00:00
Chaohui Wang
5f99fad806
Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791
Change-Id: I3f40513425cd4023139e93cad954caa93979011e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 09:00:07 +00:00
Chaohui Wang
22cda47705
Merge "Fix a11y label for LE Audio Battery" into tm-dev
2022-05-04 08:28:00 +00:00
YK Hung
b0d2eefa2a
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435 am: 082c193751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: I1d83fd019e7cd6826d0a686ae04f4520c06c4865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 07:08:56 +00:00
YK Hung
082c193751
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: Ia40a2a689b005e2362909cc293573d89a3f42639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:42:17 +00:00
YK Hung
475ea0e01e
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824
Change-Id: I5c0f83ed5365e8abe4a2404348dc0293674df822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 06:40:57 +00:00
YK Hung
eb4acf8435
Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev
2022-05-04 06:19:43 +00:00
Chaohui Wang
ca4920090f
Fix a11y label for LE Audio Battery
...
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.
After fix, "Left" & "100% battery" are grouped together.
Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
Stanley Wang
2559f546b8
Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023
Change-Id: I0e54eb4ca589c880b5c2b3bbd7bb5b6316bcb965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:51:15 +00:00
Stanley Wang
766828b6f5
Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023
Change-Id: I22b633d74bca78f1e0816b8b41d96a39e6c71c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:07:10 +00:00
Stanley Wang
99c08f3167
Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023
Change-Id: I54136d376ce65122dcee68571be5f423992eff90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-04 04:05:45 +00:00
ykhung
3d1b6fd065
Add a mechanism to configure whether the summary should be set or not
...
Add a mechanism to customize whether the summary information in the
battery entry should be set or not. We can consider is as the extension
for the ag/18062824.
Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I3c21148d288f29ce65378f59f9086dab90c14a7b
2022-05-04 11:42:26 +08:00
Stanley Wang
32fa5502ca
Merge "Update the title of Model page" into tm-dev
2022-05-04 03:15:45 +00:00
Victor Chang
09a7871c30
Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f am: e12caf5c9b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567
Change-Id: Id21cf24c3006b91f7518a580100b6fb1868ad6db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 14:15:59 +00:00
Victor Chang
e12caf5c9b
Merge "Titlecasing time zone summary" am: 1d6e9cfdf2 am: 16aca1db9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567
Change-Id: I03fa697dd0ff7197852b6c8aee1256e549ca52d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 13:57:43 +00:00
Victor Chang
16aca1db9f
Merge "Titlecasing time zone summary" am: 1d6e9cfdf2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2077567
Change-Id: If1ab5d3f0934a3803ae81b45aedbcfa41bcc8590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 13:32:43 +00:00
Stanley Wang
61b960f787
Update the title of Model page
...
The title of the page should be the same as the clicked preference.
Fix: 216250776
Test: manually test and see the UI
Change-Id: I6599375fe7b3043f5b48fdc2497ee351136d0629
2022-05-03 18:28:52 +08:00
Betty Chang
c6df4e4c63
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: e076e599b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: I1d6f0633d64a3ad0ecefa943e59455d3c1a69211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 08:14:55 +00:00
Betty Chang
b1fa93e7ef
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886
Change-Id: Ifde61888817130fd5902812a1230ba07f732c670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:34:14 +00:00
Edgar Wang
22f7ab59c0
Merge "Revert "Update data_usage_bytes_editor spinner background"" into tm-dev am: 37ad451324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029962
Change-Id: I21dc53385d41f1bfc5db2e11535b11902434d3e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-03 07:34:07 +00:00
Betty Chang
5dea2176a2
Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev
2022-05-03 07:21:11 +00:00