Bill Yi
12a74965ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I44beba09fcaff9c0d6d7b5de4879d9781c9e98dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:21 +00:00
TreeHugger Robot
6e5e22c0a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours am: 98e097b2e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I79b712d8dea6ad2f66600ef28a2f1d3e1afe4d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:16 +00:00
Bill Yi
9de21738be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I7db0e8366e5f1d3b963a19be1265fa41a8855323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:17:59 +00:00
Bill Yi
3e8d456279
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: Ica41031b95d61fb60cbf20f1a8a826db19b7679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:17:40 +00:00
Bill Yi
0f86c524c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I4c75ab1453ac6d2491881c6981ff5d6ca393f12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:55 +00:00
TreeHugger Robot
98e097b2e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I94fb8806123683ab43a3f75fdeefda6a191b75c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:40 +00:00
Bill Yi
49c2652453
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Id472fd8a72cf62a383942953901c18e13570dc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:27 +00:00
Bill Yi
8f600b3932
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I43d982ef1c633b0fb592a81b3cd49c55cc20862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:11 +00:00
Bill Yi
934826d8d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I4c800f6e4828b492ee35ba09492fac1f388f3fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:33 +00:00
TreeHugger Robot
62a6197006
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ib76fbcdf3c4c9a282bcb659941d0ea465d1ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:29 +00:00
Bill Yi
47d7d69611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ib27e69a8c83f8a538a387a3b95d137d68841d739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:17 +00:00
Bill Yi
5d6536ce44
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I8aea0e66f39df752b06ba85adc5201a8bd1ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:05:41 +00:00
TreeHugger Robot
3f75c80642
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
William Leshner
c60c7e70a1
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: I42bc75b052b758d20e598fd3d0da9aa00a5403e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 17:57:14 +00:00
William Leshner
01dfbcc297
Merge "Restrict screen saver settings searches to enabled users." into udc-dev
2023-02-27 17:30:48 +00:00
Bill Yi
a2cbc7ea7c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15d98108201d7c114ffd7e30f3141af4e8fc0497
2023-02-26 20:37:26 -08:00
Bill Yi
c253ffe61a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic10f43fb3b99fbf09a56366b4d0e0fd864741d05
2023-02-26 20:36:20 -08:00
Bill Yi
99b4d024d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I48f351db5e5fb38e3ea5f197f7648c805d21c487
2023-02-26 20:34:24 -08:00
Weng Su
b0e3972f8c
Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044
Change-Id: I6fa29502a440a88303b17cbeb09dfbe653ede340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:59:03 +00:00
Weng Su
d078d1f00a
Merge "Refer to the last Hotspot password when generating the password" into udc-dev
2023-02-25 02:33:55 +00:00
TreeHugger Robot
4f191d9588
Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175
Change-Id: I55e21038d89b5322e8c04f3c4729b25070b967c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:28:38 +00:00
Henri Chataing
8a77c25623
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
am: c2c408f3b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I00eabf4a0f6278d5ef6a241f3d7b27ec9a8cb5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:19:11 +00:00
TreeHugger Robot
887a733ebb
Merge "Update strings based on UX/product feedback" into udc-dev
2023-02-25 01:05:32 +00:00
Henri Chataing
c2c408f3b4
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I4edc194d398c13b80df97c682c7494fb1962a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 01:02:19 +00:00
Henri Chataing
5bb48d9250
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: Ia03c857e442f801d7fb042dda4c186aeb1dce1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 23:54:34 +00:00
Will Leshner
ca1379f0b3
Restrict screen saver settings searches to enabled users.
...
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.
Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.
Change-Id: If2f465b2acb548455f0868507cf47217ea1a626f
2023-02-24 15:36:48 -08:00
Henri Chataing
1325de7875
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 23:02:43 +00:00
Becca Hughes
b52fb4ce0b
Update strings based on UX/product feedback
...
Update settings strings for cred man based
on feedback.
Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
(cherry picked from commit 0172ff6942
)
Merged-In: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
2023-02-24 19:50:50 +00:00
TreeHugger Robot
d9d0d1bb7a
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373
Change-Id: I3cb57e455477a21b130862be572b421663d16dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 19:46:05 +00:00
Henri Chataing
fa88ad84be
Merge "Nfc: Rename system properties in Nfc settings"
2023-02-24 18:57:25 +00:00
TreeHugger Robot
3a445a3ea1
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev
2023-02-24 18:54:44 +00:00
TreeHugger Robot
f52774ec73
Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803
Change-Id: I9cb9e491dd4f356ac9fc3c0e67a180d45a8230e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 17:55:37 +00:00
TreeHugger Robot
f9ef8e39f5
Merge "Fix b/270656372 unit test failure." into udc-dev
2023-02-24 13:06:28 +00:00
Zaiyue Xue
ae0d935dcc
Merge "Fix b/265387286: The total percentage of all apps is not 100%" into udc-dev
2023-02-24 12:55:21 +00:00
Vincent Wang
d17704196f
Merge "Refactor FingerprintEnrollEnrolling to fragment" into udc-dev
2023-02-24 11:42:26 +00:00
Zaiyue Xue
6d939b34dc
Fix b/265387286: The total percentage of all apps is not 100%
...
Bug: 265387286
Fix: 265387286
Test: manual
Change-Id: I654f8211a45c818f9a2d4867ac679e72c9ce6eb1
2023-02-24 19:19:28 +08:00
Zaiyue Xue
d4dbf039ea
Fix b/270656372 unit test failure.
...
Failed test: sendBatteryEntryData_nullBatteryUsageStats_sendFakeDataIntoProvider
Bug: 270656372
Fix: 270656372
Test: presubmit
Change-Id: Idd1b3be07ec72c3cf7050b96e5320d67dcdc5463
2023-02-24 19:13:50 +08:00
TreeHugger Robot
fa57dd3f2e
Merge "[Settings] Re-enable previous work on data saver" into udc-dev
2023-02-24 10:15:32 +00:00
Tom Hsu
7e2ea92559
Merge "Switch off Calendar UI fo regional preferences" into udc-dev
2023-02-24 09:47:01 +00:00
Vincent Wang
882b49c8fb
Refactor FingerprintEnrollEnrolling to fragment
...
Bug: b/260957933
Test: NA
Change-Id: I281ec7a7373f6863e2e6f8f20bbbb01fa01e009a
2023-02-24 08:43:17 +00:00
Arc Wang
1596a2838d
Allow Magnification Settings launch from outside of AccessibilitySettings
...
Before this CL, Magnification Settings can only be
launched from MagnificationPreferenceController.
This CL initializes FooterPreferenceController if the
parent class does not initialize it from Intent extras.
Bug: 268411305
Test: manual
make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationGesturesPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: I954739c39c823ce7fe0daa711743f729d182571b
2023-02-24 15:56:43 +08:00
Bonian Chen
c9cca5940b
[Settings] Re-enable previous work on data saver
...
Previous work on data saver performance got disabled, this is a change to re-enable it.
Bug: 249502488
Test: build pass
Change-Id: I7264b1e8c21a789db358e0aae70a2cf0ce09ebba
(cherry picked from commit 2115d0e495
)
2023-02-24 06:27:18 +00:00
tom hsu
22dff773fa
Switch off Calendar UI fo regional preferences
...
- Due to unsupported calendar type in java lib, it may happen
unexpected exception. Hence switch off this function till we find a
better way to improve.
Bug: b/270650444
Test: Manual test.
Change-Id: If380dbe5d98b915f3e288eb668df573ef2971ae2
2023-02-24 14:03:45 +08:00
Charles Chen
4aaf6c191b
[automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247
-s ours am: dce4259653
-s ours
...
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546835
Change-Id: Ie31e3ef8ec302bb85de93b937546141e5ea41b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 03:24:08 +00:00
Weng Su
d7bbd4505c
Refer to the last Hotspot password when generating the password
...
- Query the last Hotspot password when security type is SECURITY_TYPE_OPEN and it will be used when the user changes to another security type
- If the last hotspot password is an empty string, then generate random password
Bug: 201789473
Test: manual test
atest -c WifiHotspotRepositoryTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest
Change-Id: Id3a846099238433e7b6c8b934fa26a74df0dcb61
2023-02-24 11:22:40 +08:00
TreeHugger Robot
802bff9092
Merge "Fix b/265364351: Light theme icons opacity is too light" into udc-dev
2023-02-24 03:10:42 +00:00
Charles Chen
dce4259653
[automerger skipped] Make Settings show in two-pane on portrait tablet am: 159b42a247
-s ours
...
am skip reason: Merged-In I0c26a7443882cc28edb5500f8d135c5f00dee515 with SHA-1 1881749f09
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546835
Change-Id: Icdf326ddcf7fa2edc60f9e7b84c581d8a626e0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 02:44:21 +00:00
TreeHugger Robot
6d3a9b40d4
Merge "Clarify string for translation" into udc-dev
2023-02-23 20:28:58 +00:00
Zaiyue Xue
ea5b49f799
Fix b/265364351: Light theme icons opacity is too light
...
https://screenshot.googleplex.com/Avqsw3gb2tjKqrK.png
https://screenshot.googleplex.com/46AZuJMjp2HMyqd.png
https://screenshot.googleplex.com/9mE3XutRUNaGckg.png
https://screenshot.googleplex.com/5rNUKMJjhNBNShZ.png
Bug: 265364351
Fix: 265364351
Test: manual
Change-Id: I7521030f1a5d84cd88027fb84a465623610707fb
2023-02-23 21:12:29 +08:00
Daniel Huang
6e6b067863
Merge "Change key name "Meta" to "Action key"" into udc-dev
2023-02-23 12:50:31 +00:00