Commit Graph

117217 Commits

Author SHA1 Message Date
Bill Yi
1b68f107cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959

Change-Id: I39d93229b5aa9287c75457e4ff245d24a028b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 03:24:36 +00:00
Bill Yi
fa5c30b611 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959

Change-Id: I84b37db6b17af0d646b7855a3e2243ef4b917dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 03:24:19 +00:00
Bill Yi
44f10293dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958

Change-Id: Id841745bd202fd7524b6707bd44260d4160cc22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 03:23:59 +00:00
Bill Yi
b9925d6346 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958

Change-Id: I41d225d2cf538ae26bdfc4a8a0aa65fddc36c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 03:23:36 +00:00
Bill Yi
5419d3f04e Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-26 03:07:25 +00:00
Weng Su
aaa65fc6f0 Restrict Wi-Fi configuration if settings UI is restricted
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).

Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
2022-09-26 03:35:12 +08:00
Bill Yi
2b38f742e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 751384c381 -s ours am: bb51df31b4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035810

Change-Id: Iddf759bd6ca70c3fec5be01a52d314347997064d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-25 18:09:22 +00:00
Bill Yi
bb51df31b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 751384c381 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035810

Change-Id: I986d17bf3773a1abb0301cfb91da042a5a818ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-25 04:30:14 +00:00
Bill Yi
b5273ac080 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-25 04:13:04 +00:00
Bill Yi
19edfdd6cb Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-25 04:13:04 +00:00
Weng Su
d0cd5492e4 Separate Tether summary "Off" to dedicated string ID
- Separate Tether summary "Off" to dedicated string ID for special language translation

Bug: 228573128
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherPreferenceControllerTest

Change-Id: I0615eb03d6329ef73b714af39e78836ae17ea408
2022-09-24 23:03:53 +08:00
Treehugger Robot
eff730475e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e am: 5d95b855dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I147a3065c4b214508b325c02e95da68ad22fec0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 10:57:12 +00:00
Treehugger Robot
5d95b855dc Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7 am: 984e74a32e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0 am: 41e0e6fea7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef am: 61d8dee2a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0 Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259

Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef Merge "Settings: Protect sensitive data on the about phone" 2022-09-24 08:23:53 +00:00
Bill Yi
65607e2870 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5717c61b030e6fd59c90eb32059ab1c9633b4639
2022-09-23 12:01:04 -07:00
Bill Yi
8ac2386e75 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96d30e86a9d27729037d579b1013e4ce814c3d55
2022-09-23 11:57:10 -07:00
Bill Yi
a068e61a94 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0ad02e480a4a792ddeaa12e07a12f968659d3faa
2022-09-23 11:04:43 -07:00
Bill Yi
53322b1886 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4a5a43e5ad52047121da5fc18e8cdfb7a84e1556
2022-09-23 11:01:33 -07:00
Tom Hsu
f2a63608ba Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70 am: db0ec844f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: I399a80e1e609a14c2f6c821e8e3df36fa8983dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 17:12:22 +00:00
Bill Yi
0ebebf22f6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b775443aa1 -s ours am: faa0e7298c -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: I212a243f97e83f2adf9287804724d1597e4209ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 16:57:56 +00:00
Bill Yi
b6e338ddc1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddab089dab -s ours am: 627c3d311c -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: I26c8becbed3932544290e9bca1dd9b2d65cd9c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 16:57:36 +00:00
Tom Hsu
db0ec844f2 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4 am: 1a4f16cd70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Idc4f0c59df19b6f0cc9a8a1db70ba546f12fafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 08:40:25 +00:00
Bill Yi
c8be26784c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3903a5eb2bf9afbef9e01a6c8a2dd2ace0c5c371
2022-09-23 01:09:13 -07:00
Bill Yi
751384c381 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifaf8bc76ea5a8afb638a8305cd0ec1873a0e3754
2022-09-23 01:06:15 -07:00
Bill Yi
4aae182edf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
e0c4e5bdc5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia10e24de0e735de77ae7be26c0febfccf589825c
2022-09-23 01:00:36 -07:00
Tom Hsu
1a4f16cd70 Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90 am: 7e610abd3c am: 7c813dced4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845

Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 07:59:37 +00:00
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