Bill Yi
4ad699717a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours am: 158bf69a42 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: Ic565c19863d34961aef5dcce39ade416e816fcf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:06:50 +00:00
Bill Yi
f1d8ba94d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: Ib5c0d891ea8d91e1e1c1868e90456ff59947772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:06:36 +00:00
Bill Yi
28d6d5a7c2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: Id56eae08a39ddea4e76a27b0bd0887c06d2ef392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:06:15 +00:00
Bill Yi
21d705a708
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: I03897f87ff0fd32328f2de1d6c7f044ca58ab1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 22:05:54 +00:00
Bill Yi
158bf69a42
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 976f702727 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: I77337c147a9468ff174fd851e58cb968723b3203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:58:13 +00:00
Bill Yi
19de182abb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205917
Change-Id: I0357173f1cbe8056bdd872376aeb226a8cddc995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:58:01 +00:00
Bill Yi
5f1549cee7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: I90137c2b7dcdabd0e11ec09548224f59e42b2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:57:38 +00:00
Bill Yi
2fabfd31d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2205916
Change-Id: Id5d7147bdcfb6ed4c19544f572416b3cb9278454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 21:57:17 +00:00
Rambo Wang
31cd5304ab
Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev
2022-09-08 21:57:11 +00:00
Bill Yi
976f702727
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-08 21:31:01 +00:00
Bill Yi
09b685534a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-08 21:31:01 +00:00
Bill Yi
042554a0e4
Merge TP1A.220905.004 to aosp-master - DO NOT MERGE
...
Merged-In: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Merged-In: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Change-Id: I186ff56c007d17ad650b64facfbd4862cc06bf9a
2022-09-08 14:23:20 -07:00
Ganesh Olekar
96f95e7c6f
Update capitalization of preference in app info All Services -> All services
...
Bug: 244216312
Test: Verified manually
Change-Id: Ie3be9b4519ec070fe82fd43893d53a3d7fd7ada6
2022-09-08 21:11:31 +00:00
TreeHugger Robot
d7d4d9db50
Merge "Support AIDL IDumpstateDevice service in verbose vendor logging"
2022-09-08 17:18:16 +00:00
Chaohui Wang
67078e43bd
Clean unused string arrays
...
Bug: 234570979
Test: Make Settings App
Change-Id: I5478bb88a046a21b410283140a35b3931d4c9635
2022-09-08 20:18:56 +08:00
Chaohui Wang
b41fd3afc2
Clean unused image files
...
Bug: 234570979
Test: Make Settings App
Change-Id: I961d508bc1ee1352b6bf5e9efce9cba7efb40696
2022-09-08 19:40:59 +08:00
Stanley Wang
0b72d620a3
Send pre-index intent when developer options changed
...
Bug: 244521263
Test: manually test and review UI
Change-Id: I410dcc8ac8a9e131357a3e186e17b0d6363ad247
2022-09-08 17:00:24 +08:00
Milton Wu
4f93ef7790
Fix incorrect choose screen lock during unicorn
...
ChooseLockGeneneric uses intent extra key to determine correct strings
on "Choose screen lock" screen.
Bug: 219419005
Test: atest BiometricEnrollActivityTest
Test: Manully test SUW as following combinations
1. W/ unicorn flow or W/O unicorn flow
2. Fingerprint only devices or Fingerpirnt+Face devices
Change-Id: I2abf9555676f3fb3b92dd6ddcc091ea8158bfe9f
2022-09-08 07:54:53 +00:00
Shen Lin
e960694a15
Fix compile warnings due to non-varargs call of varargs method
...
Bug: 245384099
Test: manual
Change-Id: Ie25c53b20cad318097ff17b7df0b4dd9ffeb4a32
Merged-In: Ib225d185b6f15463f4fae809e0cdaa25920d52af
2022-09-08 07:02:52 +00:00
Jason Chiu
1adeb1bda6
Merge "Add a config to control whether SettingsIntelligence supports Slice"
2022-09-08 06:56:35 +00:00
Peter Zhang
dc549e42cc
Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev am: 66dee9be82 am: 7572bafb98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19867066
Change-Id: I9279c2ce346cdce722f9c5e4f99df0b8156dc7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 06:00:34 +00:00
Peter Zhang
7572bafb98
Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev am: 66dee9be82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19867066
Change-Id: I058b6b73ec3d92d5d80c4dd59ae0d55954b7c496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 05:30:11 +00:00
Rambo Wang
c9292dc792
Support AIDL IDumpstateDevice service in verbose vendor logging
...
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.
Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
Merged-In: I4a2ec44092804574a60113e5be3df19b586bfa64
(cherry picked from commit 17a9fb6bec )
2022-09-08 05:29:10 +00:00
TreeHugger Robot
94d1718089
Merge "Support accessibility for battery chart (1)"
2022-09-08 05:09:37 +00:00
Peter Zhang
66dee9be82
Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev
2022-09-08 05:07:30 +00:00
Bill Yi
6f7d9ec6c1
[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours am: 62d1c9a527 -s ours am: cdaad5b066 -s ours am: c0ab911f3f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: Ibc5aa3dd388e4ffa417263a82c81b6193ee8bc11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:48:22 +00:00
Bill Yi
74d06206f1
[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours am: d8e775a59d -s ours am: e655a213ec -s ours am: c3d5f88d49 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: I818ed8109a34ff562431a01cad2a050514254ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:48:09 +00:00
Bill Yi
c0ab911f3f
[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours am: 62d1c9a527 -s ours am: cdaad5b066 -s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: Ieabb70af0022d2843f706a0bf251bd8c433d9335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:30:30 +00:00
Bill Yi
c3d5f88d49
[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours am: d8e775a59d -s ours am: e655a213ec -s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: I9baa32d9503d169eb6a090e36d38de1c6c29a698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:30:18 +00:00
Bill Yi
cdaad5b066
[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours am: 62d1c9a527 -s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: I33b90519ccd96615fff46e33542ae440117779ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:18:47 +00:00
Bill Yi
e655a213ec
[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours am: d8e775a59d -s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: I7efd3d9b2e032e746f71e5697bbf041fd351248d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:18:36 +00:00
Treehugger Robot
c5ba381215
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c am: f0c250900c am: fc899d5e64
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I4129c2fce49101a1d569b2cfb91b3684a31fcc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:17:05 +00:00
PETER LIANG
c9a792e54c
[automerger skipped] Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9e5 am: 66816bcbc6 -s ours
...
am skip reason: Merged-In I88c65aa9c3f05281a5c5090c2ca9503327bb580f with SHA-1 4b13620457 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19770084
Change-Id: I9630987563c83920391357a7c697ae67e1711536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:16:55 +00:00
Treehugger Robot
fc899d5e64
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c am: f0c250900c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I6d2cc6fbab002ad366a73dd2241e0afccbe46303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:16:53 +00:00
Menghan Li
c87a456903
[automerger skipped] Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e294 am: 5f9570381f -s ours
...
am skip reason: Merged-In I52425190cce4ab3cf31be025a743bf8b212fa1f9 with SHA-1 d95d799d86 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880529
Change-Id: I796148d3a78b16d315e0e685000a41bdd3ed3427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:15:59 +00:00
Bill Yi
62d1c9a527
[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:14:23 +00:00
Bill Yi
d8e775a59d
[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours
...
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19881163
Change-Id: I8dfba5cb143b8a3e85d5cd486e259b620b133cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 03:14:10 +00:00
Bill Yi
e7e935454f
Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
2022-09-08 02:32:31 +00:00
PETER LIANG
66816bcbc6
Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19770084
Change-Id: I309b5d5fd545ad6289df487669c4dbccdb03526e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:31:54 +00:00
Menghan Li
5f9570381f
Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e294
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880529
Change-Id: I0e107181ccbf59fc80d1b429768f8281128092cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:31:25 +00:00
Rambo Wang
17a9fb6bec
Support AIDL IDumpstateDevice service in verbose vendor logging
...
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.
Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
2022-09-08 02:21:43 +00:00
Bill Lin
6f9bf171a9
Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee am: 37785c81ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527
Change-Id: Id4de390f6bf0276795ca1f73759a2172e25ef7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:18:58 +00:00
Treehugger Robot
f0c250900c
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I63721073b4e8032505b97413cf8064caa3497ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 02:18:57 +00:00
PETER LIANG
240eb5c9e5
Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev
2022-09-08 02:09:13 +00:00
Peter_Liang
e10799c774
Fix the preview section incorrectly ordered of the display size and text.
...
Goals: Set correct order into.
Fix: 233326281
Test: manual test
Change-Id: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
Merged-In: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
(cherry picked from commit 4b13620457 )
2022-09-08 02:07:02 +00:00
Menghan Li
299057e294
Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev
2022-09-08 02:02:26 +00:00
Treehugger Robot
1b69e6b87c
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: I16683a4e78350d713ab8a0f756d69581aa97526d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:46:51 +00:00
Bill Lin
37785c81ce
Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527
Change-Id: I60e52637331ca2801845999334a8d83f4bec04fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:46:49 +00:00
Treehugger Robot
451ced2f5a
Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995
Change-Id: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-08 01:02:07 +00:00
Bill Lin
b9263732ee
Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev
2022-09-08 00:59:09 +00:00