Bill Yi
ad566bfccb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9bf84d822
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739238
Change-Id: I5afaca68733eba118875ab8ffe8c35d71caccbd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:22:00 +00:00
Bill Yi
1eb0406eff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 548e038af7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235
Change-Id: I885fd6af7a8d76ac440e54f3026482de588bab2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:21:46 +00:00
Bill Yi
00a98ec423
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d3e63f1ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739235
Change-Id: I01a66f9a0e5e1b649f31ab2ab7538e5d8b62aedf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-28 02:21:32 +00:00
Bill Yi
d60d670ccc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-28 01:55:00 +00:00
Bill Yi
548e038af7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-28 01:55:00 +00:00
Bill Yi
de9f76aac8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ed96a6cb86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739242
Change-Id: I2f8bd4d32158fa4b48ed1fe47759ed1b6e04f161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 21:30:44 +00:00
Bill Yi
747bfb7aed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6577aa89b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739242
Change-Id: Ib0653896c3db62e2746e39148f9152c3e8ce4b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 21:30:33 +00:00
Bill Yi
dbeef33d53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 15380dd7b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739237
Change-Id: I2d630c93b5d0f5ee5e049c5b36c09fb5c93dfa5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 21:30:18 +00:00
Bill Yi
15cbfb8456
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 631dfab65d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739237
Change-Id: I13d8bd9f82dc4159982de668ca7daabbf1b77579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 21:30:02 +00:00
Bill Yi
ed96a6cb86
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-27 21:05:56 +00:00
Bill Yi
15380dd7b4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-27 21:05:56 +00:00
Kedar Chitnis
82a33ac452
Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev
2022-08-27 04:36:58 +00:00
Bonian Chen
6854fcd20d
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev am: 45051bb169
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746893
Change-Id: I61ba7cfbc14f8972a0a8d74055893f5807c73a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 04:12:06 +00:00
Bonian Chen
45051bb169
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-d1-dev
2022-08-27 03:58:07 +00:00
Bill Yi
5a6b0cdb09
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-26 18:49:15 +00:00
Bill Yi
31c69075a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-08-26 18:49:15 +00:00
Oli Lan
f70e351d1a
Prevent exfiltration of system files via avatar picker.
...
This adds mitigations to prevent system files being exfiltrated
via the settings content provider when a content URI is provided
as a chosen user image.
The mitigations are:
1) Copy the image to a new URI rather than the existing takePictureUri
prior to cropping.
2) Only allow a system handler to respond to the CROP intent.
This is a fixed version of ag/17003629, to address b/239513606.
Bug: 187702830
Test: build and check functionality
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
Change-Id: I98eea867f926c508456ec9bc654e24eeeffa0e54
2022-08-26 19:46:02 +01:00
TreeHugger Robot
9d4e8e6017
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours am: 2810928518
-s ours am: c006955815
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I9804d8e73a7e90c179ff73bfadb004ae90959f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:29:36 +00:00
Bill Yi
300674131a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours am: c9ac950159
-s ours am: 58ea31040c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I5f26dd38c6860f52da1a026e23ce65fbac51842e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:29:24 +00:00
Bill Yi
b79c294840
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours am: bfd43e8459
-s ours am: 7a3ffa65cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: I7b68d9c23a11cce7099036f1366940d994504adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 18:29:13 +00:00
TreeHugger Robot
c006955815
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours am: 2810928518
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I7b05ab7b867f2acb4b71038db45864e69ce28d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:53 +00:00
Bill Yi
58ea31040c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours am: c9ac950159
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I6c6697a911ebd5b1cc0dea82c85e82f009919803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:40 +00:00
Bill Yi
7a3ffa65cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours am: bfd43e8459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Idb18a7c53c6222bf52f71b26ab064c9f2547b9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:56:29 +00:00
TreeHugger Robot
2810928518
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ecbf9be9a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I75db89938d39c6c1c576a31ecbd8d5bf7868991d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:47:08 +00:00
Bill Yi
c9ac950159
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e5669b82f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19746133
Change-Id: I48e41e88032dfe727058fbce95de2efaf618757a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:49 +00:00
Bill Yi
bfd43e8459
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ccb75281f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745590
Change-Id: Ie0bbb18017f81853c962c6cb34ee6eabaf9e619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 17:46:35 +00:00
TreeHugger Robot
ecbf9be9a4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-26 17:25:46 +00:00
András Kurucz
64eb84bd7b
Merge "Fix RTL layout for Notifications history" into tm-qpr-dev
2022-08-26 14:54:54 +00:00
András Kurucz
711dc8f9e2
Fix RTL layout for Notifications history
...
Using ConstraintLayout Guideline is causing an issue with RTL languages.
Test: check the Last 24hrs Notification history using forced RTL layout direction and different Display and Text sizes
Fixes: 243029840
Change-Id: Ia0807d94da4ad5aac7c8000460388ddb6ddbe987
2022-08-26 13:14:53 +00:00
Bonian Chen
d2644b4ea9
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev
2022-08-26 10:52:02 +00:00
Bonian Chen
8c6c1ca236
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 243664439
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:52:42 +00:00
Bonian Chen
9202260a42
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:50:51 +00:00
TreeHugger Robot
6b5dc07b95
Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev
2022-08-26 05:36:37 +00:00
Zaiyue Xue
fb3ebf8dc7
Fix b/243746796 Crash when mouse hangs over an empty battery chart
...
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
Merged-In: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
2022-08-26 12:32:05 +08:00
TreeHugger Robot
9c39783771
Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev
2022-08-26 04:19:51 +00:00
lbill
e944661955
Cancel UDFPS enrollment on overlay focus loss
...
Integrate onWindowFocusChanged() to FingerprintEnrollEnrolling
When the activity window lost focus, we just cancel this enroll
session, and create a dialog to notify user.
* Keep legacy rotation behavior, do not cancel enrollment if user
rotate device.
* This change will cancel enrollment when user interrupted by
1) Swipe down Notification Shade
2) Heads up notification expand
3) Bubble Expanded
4) Google Assist
5) PIP expand
6) Recents
7) Launch Power Menu(Global Action)
Test: manual test above scenario
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Bug: 228261883
Bug: 242478941
Bug: 227905887
Change-Id: Id097e6b15928646cd5ab91c2a1f6eb1bb9bf190b
2022-08-26 01:30:33 +00:00
Bill Lin
37dfb4c46d
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev
2022-08-26 01:19:04 +00:00
Xiaowen Lei
3d41a009c8
Set page_id when logging ACTION_DREAM_SELECT_TYPE.
...
To differentiate from the same action logged on other pages.
Bug: 243553826
Test: on device via statsd_testdrive
Change-Id: If722e8ffa417aac11d92e7519d89bd459ddc5eeb
2022-08-25 23:48:36 +00:00
Menghan Li
b5ee432b4b
Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev
2022-08-25 23:37:50 +00:00
Joshua Mccloskey
128746648e
Merge "Replaced fingerprint finish strings." into tm-qpr-dev
2022-08-25 22:20:32 +00:00
Bill Yi
4e5669b82f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
2022-08-25 08:40:29 -07:00
Bill Yi
6ccb75281f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I222a6fa89b2ba5da975e473b52c7ebb70e5e607f
2022-08-25 08:36:52 -07:00
Les Lee
c6c6ef3a58
wifi: Handle wifi ap initial state before register intent
...
The intent WIFI_AP_STATE_CHANGED_ACTION is not sticky intent after
SC-V2, query wifi ap state and run intent handling after registering intent.
Bug: 231214355
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Hotspot
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Tether
Test: Manual test, the state shows correctly even if resume hotspot settings page from recent app.
Change-Id: Iab6b2b8628d725b003d5e5c4086420a329611745
2022-08-25 23:07:40 +08:00
Zaiyue Xue
87db35205a
Fix b/243485315: NullPointerException when getAppBatteryUsageData().
...
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
2022-08-25 13:36:44 +00:00
lbill
b77c2639d9
Refine face enroll & remove button layout padding
...
The button include in the security_settings_face.xml
When FaceSettingsRemoveButtonPreferenceController#updateState(),
the margin of Button will be overrided by FooterButtonStyleUtils.
So we should set listPreferredItemPaddingStart or End for Button's
parent view instead.
Test: manual Security > Face Unlock > Delete face model
> Set up face unlock > Back > Check the button layout
Bug: 202091542
Change-Id: I2b3815f5484ae1e5d256a43b432384e5f0f0f96a
2022-08-25 10:24:09 +00:00
Tom Hsu
12377854b1
Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
34cb6d3237
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3
Merge "[Languages] Add new information to system language page." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Bill Lin
fd8e54e391
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev
2022-08-25 04:36:14 +00:00
Bill Yi
6577aa89b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7db8155cb74847cc3a16d49793c7018b2d3c6e77
2022-08-24 21:02:51 -07:00