Hao Dong
81587b1864
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev am: 6cb1f9401d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23418521
Change-Id: Ifd0ca0b6881b2e8d0ff8f57e9fa4876208f9e520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:05:55 +00:00
TreeHugger Robot
a14d53163c
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
am: 6e9b0d97da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I93be3c2d16321bacec5253332a6dc83e4e0b2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:02:34 +00:00
Julia Reynolds
6ff2b3296c
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
am: d9cc409fca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I548af73340c2a3a3d5c8e32c85e39289859e7ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 23:02:09 +00:00
Hao Dong
6cb1f9401d
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-qpr-dev
2023-05-26 20:35:34 +00:00
TreeHugger Robot
a6f32e2cb3
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I343c82faae3d9fb135d4e9e500923a3fec91de4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:20:45 +00:00
Julia Reynolds
f27723619a
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Id39f2abef660120d8dfd2904af5b27d41ac5b38e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:19:48 +00:00
TreeHugger Robot
6e9b0d97da
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
am: 1efd1f6d3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I150a607f7d37f89224ab2aa0aadad7d2242ecbff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:40 +00:00
Julia Reynolds
d9cc409fca
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
am: 19c2f617aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: Ic06bc743e3903e60b8e1bcdb67ed655518df4fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 20:17:23 +00:00
TreeHugger Robot
1efd1f6d3c
Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010
Change-Id: I3c68a806fa8849b68f0e853a181d3f2859e485a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 19:13:08 +00:00
TreeHugger Robot
1df5ad89ee
Merge "Update bad calibration error message" into udc-dev
2023-05-26 18:59:46 +00:00
Julia Reynolds
19c2f617aa
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739
Change-Id: I2fa505654e3e7efdec2457cedb7773df9894d737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 18:52:29 +00:00
Diya Bera
1069105558
Update bad calibration error message
...
Test: Manual - send bad calibration error in code and observe the
strings
Bug: 280786940
Change-Id: I999750b98fcfd83a6fd265bac0aa334342c9f536
2023-05-26 10:26:59 -07:00
Julia Reynolds
3ab478416d
Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev
2023-05-26 16:46:50 +00:00
Julia Reynolds
bbef903b88
Revert "Update theme for ChannelPanelActivity"
...
This reverts commit 41eeb31b20
.
Reason for revert: b/284380876
Change-Id: Ia06bf047db187091753e560f70427abb5b26378a
2023-05-26 15:32:08 +00:00
Chaohui Wang
6a6e3b848b
Merge "Move unrestricted data summary to DataSaverController" into udc-qpr-dev am: 97963e8389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442437
Change-Id: Ic6338fc2c629944f4c8baf560becec13e63db03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 07:55:20 +00:00
Chaohui Wang
3e35cff7ba
Move unrestricted data summary to DataSaverController
...
DataSaverController currently used in 2 pages,
- Network & internet > Data Saver
- Apps > Special app access
This helps unify the logic, and instead of showing on "Special app
access", this summary shows on "Unrestricted data" is make more sense.
Bug: 280280596
Test: Manually on above pages
Test: Unit test
Change-Id: Ia151ed8179a250f8f20cc5041f9383fffebdab10
2023-05-26 13:05:48 +08:00
Hao Dong
2eadf68438
Fix Fingerprint enrollment UI when display size is largest.
...
1. Remove land/udfps_enroll_enrolling and use the default land layout
instead. Swap header and content when necessary to avoid overlap.
2. Add UdfpsEnrollEnrollingView.java
Test: manual test - 1. Set system display and font size largest
2. Launch fingerprint enrollment and check UI.
Test: atest FingerprintEnrollEnrollingTest
Bug: 269060514
Bug: 283169056
Change-Id: Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec
2023-05-25 21:54:07 +00:00
TreeHugger Robot
8163f3d93b
Merge "Add a footer message for battery cycle count" into udc-qpr-dev am: 810659f82d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23419678
Change-Id: I906471b83c8554e65de2ba3d4e34468cdb6a5c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-25 06:23:46 +00:00
TreeHugger Robot
810659f82d
Merge "Add a footer message for battery cycle count" into udc-qpr-dev
2023-05-25 05:53:19 +00:00
Yi-Ling Chuang
20c5966bf4
Add a footer message for battery cycle count
...
Bug: 276399056
Test: rebuild
Change-Id: I3aea252ace55edbde117698c17f1b4e0ab601b89
2023-05-25 12:24:24 +08:00
Diya Bera
e196e903b3
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
am: f868f3fdda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ic2e7cbf81d6893d3a6f921c808374e4327718ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 21:22:03 +00:00
Diya Bera
573a59f8d0
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Ia96b5aa1a9cd700b15ddf9aa986856ff4aee5f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:59:04 +00:00
Diya Bera
f868f3fdda
Fingerprint Error Dialog am: 71dd391e4d
am: 565ce9eaae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: Iea6e58fda55aadc31aef0aca6736f874e9c9ed1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:56:45 +00:00
Diya Bera
565ce9eaae
Fingerprint Error Dialog am: 71dd391e4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197
Change-Id: I614f3cbc3845d463c83605bb62c007180408834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 20:14:53 +00:00
Diya Bera
71dd391e4d
Fingerprint Error Dialog
...
Add "Try Again" for UNABLE_TO_PROCESS error. Change default title
string. Custom strings for Settings and Setup.
Bug: 280786940
Test: Try to enroll fingerprint, trigger a corresponding error and check
the error dialog
Change-Id: I5975d169e1d33cff87f58fb8882261bb1bd3520e
2023-05-24 10:15:52 -07:00
Bill Yi
5ee6cbb95c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Bill Yi
62106c3d13
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-05-24 17:14:01 +00:00
Jason Hsu
f722b86318
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3
am: 8d3885408e
am: 1a0508c538
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078
Change-Id: I8f82f4c50e09cb5b92cadc5e5f7fdb5ae6c0d8ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 09:28:50 +00:00
Jason Hsu
4cf40a5c0b
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3
am: 8d3885408e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078
Change-Id: Ia45341b54d04e4a912f3e2392281c95eda237608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 08:50:56 +00:00
Jason Hsu
1a0508c538
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3
am: 8d3885408e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078
Change-Id: I73d4b6241b88b5a4d14024aa79193f13ebcec4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 08:47:21 +00:00
Jason Hsu
8d3885408e
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078
Change-Id: If6543b0d84f5399010b97693e87007aa8b0e1bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 08:09:13 +00:00
Jason Hsu
fe00702ab3
Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev
2023-05-24 07:38:09 +00:00
Yi-Ling Chuang
9736f648de
Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081
Change-Id: I9359ab804d13a008f5c5863f4b9443998cf7d77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 07:28:08 +00:00
Yi-Ling Chuang
75af9aa3f5
Merge "Refactor battery related feature provider" into udc-qpr-dev
2023-05-24 06:55:17 +00:00
Yi-Ling Chuang
ee97eaf2d9
Refactor battery related feature provider
...
Merge BatteryInfoFeatureProvider to BatterySettingsFeatureProvider. Also
add a new string to indicate the unavailability when there's error
fetching the cycle count value.
Bug: 276399056
Test: robotests
Change-Id: Ic6a641d72d5bb295f2a0766dcebdcbe855d91125
2023-05-24 11:26:07 +08:00
Daniel Huang
392bf8cc1c
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
am: 35d25a92d1
am: 1dd13430cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: Ie4987f04dd579e9782b1325a5991a4fdea250913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 03:07:59 +00:00
Daniel Huang
e72e0efb06
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
am: 35d25a92d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: Ic0663ef448be422ec63cdd469fe3833fdc4cfcb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:31:05 +00:00
Daniel Huang
1dd13430cc
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
am: 35d25a92d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: Iefd86e0d9ef6f948d634d8c89580362e0324d35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 02:26:43 +00:00
Daniel Huang
35d25a92d1
Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079
Change-Id: I622fae34b50f1a07963d2ada5e6b0d5445d3635c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 01:47:42 +00:00
Daniel Huang
e51bbfcbbd
Merge "Update summary for Languages and Keyboard" into udc-dev
2023-05-24 01:09:38 +00:00
Bill Yi
29ffda8638
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-23 23:08:38 +00:00
Bill Yi
c13633d1d0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-23 23:05:26 +00:00
danielwbhuang
d591a0ee2c
Update summary for Languages and Keyboard
...
move speech to Languages
Bug: 283744490
Test: manual
Change-Id: I2df0aff11bb8e9b78f9816cd0ae1d1d56c438898
2023-05-23 17:24:32 +08:00
jasonwshsu
a0b2bcb2e0
Remove 'Media' type Audio output in Hearing devices settings
...
Root Cause: Media type Audio output has inconsistent result with Output Switcher, and it needs to be resolved from Audio Policies API.
Please see more details in b/279003337.
Solution: Remove 'Media' type in Android U temporary.
Bug: 283907809
Test: flash rom & check UI
Change-Id: Id64866f7dc12ca5429e0b961cbafe51329b4eef1
2023-05-23 16:34:50 +08:00
Bill Yi
803df51b41
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5d61db1c098c36144558a0931248f0fb7ec43dbc
2023-05-22 18:39:26 -07:00
Bill Yi
7e27faf3b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I41e046a7592cee9cd908794c8e8dd12d0ac26552
2023-05-22 18:34:53 -07:00
Bill Yi
853e7ddba0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaa1e63c891ede7a0ca591b18add3f148d24ef79e
2023-05-22 16:50:05 -07:00
Bill Yi
d2e8c8077b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I01fb08b35dda455c5bc8e2b7d35173f854babcd4
2023-05-22 16:48:04 -07:00
Bill Yi
11ab2c74b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I49f7f773f723b854cf11bfeb5553edcb247be150
2023-05-22 16:45:40 -07:00
Bill Yi
81564a8384
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2bd1ccafeb60d4eb8e1a9abcbeee5ad1083d0714
2023-05-22 16:44:40 -07:00