Bill Yi
c46e0e3d6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If66addd4f08126800df1980cf1adba4cd71788e1
2022-09-23 00:58:17 -07:00
Bill Yi
c262175b3c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic95f826a9d15e46a6ba2543659b5e01c292f0bab
2022-09-23 00:56:12 -07:00
Bill Yi
61485ad3cb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifaef026541f8fd24c8c2c1476cb22f5024b25dac
2022-09-23 00:53:12 -07:00
Tom Hsu
7c813dced4
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:32:19 +00:00
Tom Hsu
7e610abd3c
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Icd4cb165939b49e24ebbc83059c55914610e7eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:01:01 +00:00
Tom Hsu
8a9dc9ca90
Merge "[Settings] Update UI when bluetooth connection is down."
2022-09-23 06:39:35 +00:00
Bill Yi
faa0e7298c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b775443aa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20029095
Change-Id: I503b6ebefbf71fe8b5f2d53f34a6e241d8d5f095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 04:23:03 +00:00
Bill Yi
627c3d311c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddab089dab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20029095
Change-Id: Idbcfa8115e14211b8d05110362858f167ee01a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 04:22:44 +00:00
Bill Yi
b775443aa1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-23 03:53:13 +00:00
Zekan Qian
f1fabd488f
Add EntryProvider in SettingsGoogle
...
Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I8232361633698f4186c0fda12fb44f221426db9c
2022-09-23 10:44:41 +08:00
Ats Jenk
618876c6c9
Add support to hide developer tile based on a flag
...
Define new meta-data option for development tiles that can be used to
specify a sysprop flag.
If this meta-data is present, the value will be used as the flag name
that has to be enabled for the preference to show up.
Bug: 248363970
Test: atest SettingsRoboTests:DevelopmentTilePreferenceControllerTest
Change-Id: I66d56777a6290d7fee739492bd2871f637791d75
2022-09-22 19:31:47 -07:00
Grace Cheng
f9b0a270db
Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5
am: 0676835aa0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169
Change-Id: I2a1350fbcaf999657217eb9de4fd0bd2d1b888f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 21:43:15 +00:00
Bill Yi
ddab089dab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9bcf14095ff5043e49a327a29e3c48731336d78a
2022-09-22 14:14:21 -07:00
Grace Cheng
0676835aa0
Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169
Change-Id: I0eb173743779ac3a88bbdfa56e77e610dc834131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 21:11:25 +00:00
TreeHugger Robot
2342c0feda
Merge "Add phone, tablet, device fp deletion strings."
2022-09-22 20:44:30 +00:00
Grace Cheng
afa2bb1ea5
Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev
2022-09-22 20:28:33 +00:00
Grace Cheng
5951349839
[automerger skipped] Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972
am: 59f4b7bdc9
-s ours
...
am skip reason: Merged-In I26bea8e1870f08b413a4ec2a9e6e83015facd004 with SHA-1 415314113b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253
Change-Id: Iba2bf8d72028f0f33cefb829f537c61731e3701e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:41:19 +00:00
Grace Cheng
658652bf0b
Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697
am: 94f6a76ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253
Change-Id: I2e870d5f3105a49546a2e7777cb520f84cada5bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:41:10 +00:00
Gil Cukierman
340c2c3fb4
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
am: ccfd44162f
am: 02ef8722be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: Ife21ec23f145a7d4c52f2f6109cba514a9779370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:40:18 +00:00
Grace Cheng
59f4b7bdc9
Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253
Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:38:19 +00:00
Grace Cheng
94f6a76ea1
Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253
Change-Id: I9d17ad0d79285590ae460146f056b59a0d46066b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:37:41 +00:00
Grace Cheng
a738eba09f
Adds null-check on finger animation in enrollment
...
Adds a null-check before setting the finger animation during SFPS
enrollment
Test: Change display size to highest setting (sets mShouldShowLottie to
false), and verify that user can enroll finger successfully
Fixes: 247044864
Change-Id: I3d7f0bd3078e3a4516f656a8ee897387b0ca15c6
2022-09-22 17:54:27 +00:00
Gil Cukierman
02ef8722be
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
am: ccfd44162f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 17:50:11 +00:00
Grace Cheng
108b73d972
Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev
2022-09-22 17:37:13 +00:00
Grace Cheng
8669dc3697
Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev
2022-09-22 17:26:22 +00:00
Gil Cukierman
ccfd44162f
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 16:12:54 +00:00
Bill Yi
efb92b159f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617
-s ours am: 4ee0f9853a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016648
Change-Id: Iea0d77cb207776d0230bd43c090c797a572e263c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:49:45 +00:00
Bill Yi
168eee8d2b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c
-s ours am: 1315b49ed8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016648
Change-Id: If20b43644523aef2976d998052ea483407916b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:49:34 +00:00
Bill Yi
6c9cede2aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326
-s ours am: 23f515945d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016647
Change-Id: I07293c561c9682962b936c3ed640bbe4f0a9aecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:49:15 +00:00
Bill Yi
2764b149e2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea
-s ours am: 119210d456
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016647
Change-Id: I624989fd9b587020c4243646cae82b68deeb195d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:48:59 +00:00
Bill Yi
4ee0f9853a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016648
Change-Id: Ib71a13fda76003373003419c38365936facf1de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:31:35 +00:00
Bill Yi
1315b49ed8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016648
Change-Id: I5bf66796217c585bbc76674f0f865f7cc169d16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:31:16 +00:00
Bill Yi
23f515945d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016647
Change-Id: I896b5355f873b97256d021112dd74de1fd550899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:30:58 +00:00
Bill Yi
119210d456
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016647
Change-Id: I184dedbce3f2588a9e15359ab6155403f42c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:30:43 +00:00
Gil Cukierman
1f750fcba6
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I50305e27b205160d85825143f614cd52b1bab2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:23:54 +00:00
Gil Cukierman
24ac97a0bf
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: Ib46bd4f287a80582afb67f7ef052a3ff25862b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 14:30:53 +00:00
Bill Yi
65c5abe617
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-22 14:30:33 +00:00
Bill Yi
4c5b5a7326
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-22 14:30:33 +00:00
Gil Cukierman
594002e21a
Merge "Use AAPT2 For SettingsUnitTests"
2022-09-22 13:40:19 +00:00
TreeHugger Robot
0f86f86a70
Merge "Fix checkcolor_hook error"
2022-09-22 12:44:26 +00:00
Ayush Sharma
a00393015a
Merge "For top layout use FrameLayout than GlifLayout"
2022-09-22 12:41:37 +00:00
tom hsu
3d138b372b
[Settings] Update UI when bluetooth connection is down.
...
- When Airplane mode on, all connection shall be disconnected. In
current design, when bluebooth disconnected, network page in Settings
does not udpate the UI.
Bug: b/246925011
Test: Maunal
Change-Id: I1bf56e96737157d8e76057028b22e94e0e8d76e4
2022-09-22 19:34:35 +08:00
Sunny Shao
f35d7f5f0e
Fix checkcolor_hook error
...
Bug: 247692342
Test: repo upload OK
Change-Id: I8fc4db6f880b073e44a78d63fcd99cc86c2255d8
2022-09-22 19:26:59 +08:00
PETER LIANG
93a613f2f6
Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea
am: dace33e3c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091
Change-Id: I2de86b0a6b8eac29e04fb8ce6c77750d88321322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 09:20:28 +00:00
Jason Hsu
fef9587cfe
[automerger skipped] Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
am: b161bade37
-s ours
...
am skip reason: Merged-In Ic0be940c8466b5e1e301255868c29d06bd4428bd with SHA-1 cfec092373
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465
Change-Id: I167132c5bd4fc2d6ec7af7575f05e18a704a57c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 09:19:39 +00:00
PETER LIANG
dace33e3c3
Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev am: 71c3e06bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19997091
Change-Id: I735fa2d96c60a92c270208620909353c25619960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 08:51:25 +00:00
PETER LIANG
71c3e06bea
Merge "Fix that display size and text preview is going blank while scrolling the page in landscape view." into tm-qpr-dev
2022-09-22 08:29:50 +00:00
Jason Hsu
b161bade37
Merge "Fix not on the top when entering device detail page" into tm-qpr-dev am: 9ac1712145
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20008465
Change-Id: I2a8dd8e4bb9f11ab239ec7a4e420b38c52623a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 08:27:44 +00:00
Jason Hsu
9ac1712145
Merge "Fix not on the top when entering device detail page" into tm-qpr-dev
2022-09-22 07:37:28 +00:00
Zekan Qian
daceb0cabb
Merge "Explicitly set parameter name when call SettingsPage.create function"
2022-09-22 07:18:03 +00:00