Bill Yi
7b80a39262
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours am: 14e15aaaa1
-s ours am: deec7d5a91
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I7900fdf036a750a0bb3ddb1c16a54d2a115da26a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 20:04:27 +00:00
Treehugger Robot
82dd9c34cd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12
-s ours am: 8667f5efee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I72150161019572481547375a88fd73d9e1e70e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:35:15 +00:00
Bill Yi
54e98aa86e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours am: 3a9e2e401d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I61f1583cdf06f489a89b110324f4d932238daa3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:58 +00:00
Treehugger Robot
e92ac63e41
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours am: 41f417f87b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: I9c8f91fd8dd93cb1aeeb43d9728e55500da6e477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:41 +00:00
Bill Yi
976ce75e87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours am: fa8111eca1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Iecd6456a5d1ffb4233abd2e53951bd4ee129c695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:34:28 +00:00
Treehugger Robot
1539b81ad4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours am: 891c3ab05a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: Ibab1bf0a44759ae952722c2e95ade28d4d5ec93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:20:39 +00:00
Bill Yi
deec7d5a91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours am: 14e15aaaa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: Ia8737c4f76c3ee0cdcf19b27e5f47e9f444c6916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 19:20:34 +00:00
Treehugger Robot
8667f5efee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: I07e5c3448aec9e82e9742aa2b94de373dd46556e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:49:12 +00:00
Bill Yi
3a9e2e401d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1eee9788bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123
Change-Id: Idd2dd91b94e3dd1e59030db9bdc5f176097c8f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:49:01 +00:00
Treehugger Robot
41f417f87b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db2fea9847
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Ie0a7bfc3f350cb049e821416ec1f80ace595c8e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:48:46 +00:00
Bill Yi
fa8111eca1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77827ac6f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326122
Change-Id: Ie432f5295ba262e7caf41fcc33da65d77e9a7395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:48:12 +00:00
Treehugger Robot
891c3ab05a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e1c63ece9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I81ea24c30ed1c174c965e8fde4b3da633eb802e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:24:56 +00:00
Bill Yi
14e15aaaa1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a702ea7b1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326121
Change-Id: I93b034a8d56b908a412475771db25f4bf81dd2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-04 18:24:40 +00:00
Treehugger Robot
939f6eed12
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:53:51 +00:00
Treehugger Robot
db2fea9847
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:53:51 +00:00
Treehugger Robot
e1c63ece9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-04 17:51:55 +00:00
Bill Yi
7192d32538
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 00fadffa56
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20631317
Change-Id: I8eb5c89f0a0ea9d03ae6ec51cdb2ec7ce0cccfd4
2022-12-04 14:20:53 +00:00
changbetty
a6d532cdba
[LE Audio] To remove the broadcast source item that created by receive
...
state
- When the user clicks another broadcast source and wants to join,
we will remove the previous item that created by getAllSource().
And trigger the search again.
Bug: 242267719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothBroadcastSourcePreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothFindBroadcastsFragmentTest
Change-Id: I416f0a39e31276876e63360664555f99dd7297c9
2022-12-04 13:52:10 +00:00
Bill Yi
8433161d48
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie497d67fdc9024e2e54f7580b4fa83778c26e3f3
2022-12-04 00:42:56 -08:00
Bill Yi
00fadffa56
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92dca6b2cc72ae627619370955215ffdf8f3b3d1
2022-12-04 00:34:03 -08:00
Bill Yi
38cec4fba6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifd07a3fec3a401205811b8c013590b519469b78b
2022-12-03 12:00:12 -08:00
Bill Yi
0aeba23203
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I18da1a6fe2a305975c3960be278c69466fbd1e4a
2022-12-03 11:58:48 -08:00
Bill Yi
4076fea0ca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id9d4b1127d0ce707f97a0ee55bfb736f6f3ad979
2022-12-03 11:55:52 -08:00
Bill Yi
1eee9788bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I956252050d37d066f5b03c78321b60b4582e8307
2022-12-03 11:42:11 -08:00
Bill Yi
77827ac6f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8d5d5c19dd13d77dc849aaba050134b5fe4415a
2022-12-03 11:40:56 -08:00
Bill Yi
8a702ea7b1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0775c4d7fba47cd1cf4259bf7b1dcb58b79a1eb9
2022-12-03 11:38:04 -08:00
Chaohui Wang
fb2b9f78dd
Merge "Clean up some UnusedResources detected by lint 8"
2022-12-03 07:11:43 +00:00
Grace Cheng
1db259c72e
[automerger skipped] Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e
am: b7eef9c024
-s ours
...
am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I6a19e890e397e7665c1c446c5b4cd7eb0995eb81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:46:36 +00:00
Grace Cheng
bfa95b98c9
[automerger skipped] Removes duplicate SFPS string and updates references am: 0d74f4b755
am: ebda524556
-s ours
...
am skip reason: Merged-In I259669a09f5535f3a776793659e5bc6bdb90a44c with SHA-1 9d6a869ebe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I03d217f3497a26cfe2d14ba5de4bace0a964ef32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:46:33 +00:00
Grace Cheng
b7eef9c024
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev am: af2896195e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: I97b0ec97c73a85e28f3bb4eaa05d59441188a404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:58 +00:00
Grace Cheng
ebda524556
Removes duplicate SFPS string and updates references am: 0d74f4b755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647
Change-Id: Ifb08c7bdaf0871228620d731c72943ea91272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-03 06:10:47 +00:00
Grace Cheng
af2896195e
Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev
2022-12-03 05:37:34 +00:00
Florian Mayer
cd68fe78a0
[MTE] support force_on for device_control override
...
driveby: remove period for force_off message.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Bug: 245624194
Change-Id: I1c56af377925fd58c90bb346d9d003249c5e547c
2022-12-03 02:27:29 +00:00
Bill Yi
af6c532d9a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
ba52774bcb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Bill Yi
8ece0258d9
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-12-03 01:34:02 +00:00
Alejandro Nijamkin
f31108f11a
Specifies nav destination when opening shortcuts.
...
Doing this will open the correct screen when clicking on "Shortcuts"
under Settings > Display > Lock screen.
Fix: 258471384
Test: manually verified that clicking on it opens the wallpaper picker
experience with the correct page showing.
Change-Id: I627bcb9c9fac7a834f1c9d9cb36b73a6c8817af5
2022-12-02 16:08:32 -08:00
Grace Cheng
0d74f4b755
Removes duplicate SFPS string and updates references
...
Removes duplicate security_settings_fingerprint_v2_home_screen_text string and replaces references with security_settings_fingerprint_enroll_finish_v2_message
Test: Open fingerprint settings on SFPS device where fingerprints are enrolled, observe correct string
Fixes: 259316600
Change-Id: I259669a09f5535f3a776793659e5bc6bdb90a44c
Merged-In: I259669a09f5535f3a776793659e5bc6bdb90a44c
DO NOT MERGE
2022-12-02 23:50:37 +00:00
Dmitry Dementyev
da9c2c2757
Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8
am: 96999068e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506
Change-Id: I6f12ffcadb096c67f4fe94b39dec9addf63775e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 20:45:57 +00:00
Dmitry Dementyev
96999068e9
Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506
Change-Id: Ifcc84304cf3d8a69069792a9d1ace64187f125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 20:05:16 +00:00
Dmitry Dementyev
71dd4b23e8
Merge "Show account name as a single line string." into tm-qpr-dev
2022-12-02 19:30:59 +00:00
Bonian Chen
967bc7b044
[Settings] Code refactor - apply BasePreferenceController
...
Apply BasePreferenceController for better compatible with existing
softawre architecture.
Bug: 260540995
Test: local
Change-Id: I6d69ff878a062299b4d8478f6c0341b37a28532d
2022-12-02 17:23:38 +00:00
David Gutierrez
56475c0747
Updated RecentLocationAccessSeeAllFragment to use a SettingsEnum value rather than a MetricsEvent value.
...
Bug: 260074865
Test: none
Change-Id: I96f7e4d5306d468dd32a9affac28bd8c3f90bb75
2022-12-02 16:11:00 +00:00
David Gutierrez
be120eca3e
Dead code removal
...
Test: on-device testing
Change-Id: I96e7e4d5306d468dd32a9affad28bd8c3f90bb75
2022-12-02 16:10:13 +00:00
TreeHugger Robot
35a3004491
Merge "Add AlarmsAndRemindersAppListProvider to SpecialAppAccess"
2022-12-02 09:08:07 +00:00
Tom Hsu
dca164e800
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
am: 916110007d
am: 9ad53e4e89
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: Ic915dba7e9405bb541a07326b404de5308e3ea9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 08:51:07 +00:00
Tom Hsu
9ad53e4e89
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
am: 916110007d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: I2d1c10ec2cac55485987ac2f5daf38c001800b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 08:12:47 +00:00
Tom Hsu
916110007d
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599
Change-Id: I4864b0cecaae1daebfd05a7b4f8d21adb23c31b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-02 07:42:10 +00:00
Tom Hsu
3b9cb9a7d9
Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails"
2022-12-02 07:16:28 +00:00
Kuan Wang
1e8ca1d7d2
Move fuelgauge_usage_state.proto into fuelgauge folder.
...
Test: make RunSettingsRoboTests + manual
Bug: 20424125
Change-Id: Id0ed25e06258764ec58263c2e2f7dec7bfd81c0a
2022-12-02 15:00:58 +08:00