PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,839 Commits 1 Branch 0 Tags
d8f61dc2a3ae694d8a430d7951fb39a823fac082
Commit Graph

111839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darrell Shi
d8f61dc2a3 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841

Change-Id: I404de08142653608ff054be43c70d4323b063861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 12:38:18 +00:00
TreeHugger Robot
488d3adb81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -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: Id7f81ddfe5f308de358950a5eba75a2852f29f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-28 00:06:37 +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
8e002f962e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2023-02-27 23:59:16 +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
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
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
Henri Chataing
fa88ad84be Merge "Nfc: Rename system properties in Nfc settings" 2023-02-24 18:57:25 +00:00
Darrell Shi
6b6c68fd94 Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev 2023-02-24 16:10:13 +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
Charles Chen
159b42a247 Make Settings show in two-pane on portrait tablet 
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
 2023-02-23 08:38:52 +00:00
Anvesh Renikindi
bdd54472a8 [automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 am: 3b08c0d9db -s ours 
am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 bfc95e7ba1 is already in history

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

Change-Id: Icaaedb8fd5f585ce7c632a6c52fdb286fc60eb9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:12:07 +00:00
Anvesh Renikindi
fc43a1156c [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours am: 928a3c22a6 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I0871de1f2f49e376caa48efbcc1b18c3dfb3f46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:12:04 +00:00
Jiaming Liu
8b4f036a3f [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours am: 47c2b78f94 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I2fde4d7e483d101e99e4b9274f6bda3454c39031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:12:02 +00:00
William Escande
6ea3322de4 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I34edde4f5dc5b5290f796d1bd8b5e8f07eab9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 08:11:05 +00:00
Anvesh Renikindi
3b08c0d9db Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919

Change-Id: Iff9e2012e64c7776ccfeba98b69afca280ef13b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:18 +00:00
Anvesh Renikindi
928a3c22a6 [automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I57bf736b9fdc9cf9100139a65c0df5d5fd88f7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:13 +00:00
Jiaming Liu
47c2b78f94 [automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours 
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history

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

Change-Id: I6ab1de1556098dc77963331f2f0c2dc14c7aef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:27:11 +00:00
William Escande
57f3e9428f Merge "Snoop Logger: fix descriptions" am: 5fd265405c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-23 07:21:57 +00:00
Anvesh Renikindi
60763d6941 Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" 2023-02-23 06:22:15 +00:00
Anvesh Renikindi
a54ecedde3 Merge changes from topic "androidx_ae" 
* changes:
  Fix build for jetpack update
  Update ActivityEmbedding usage.
 2023-02-23 06:22:15 +00:00
William Escande
5fd265405c Merge "Snoop Logger: fix descriptions" 2023-02-23 05:58:19 +00:00
Henri Chataing
b2e4e3c85f Nfc: Rename system properties in Nfc settings 
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.

Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b)
 2023-02-23 01:48:42 +00:00
TreeHugger Robot
24c843fb30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I181ec169fe63702914c012f349dbe327bfbbbe15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:13:57 +00:00
Bill Yi
07b4ad75b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55edf94ba4c2952f50d2757ee3de2eac8236eccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:13:49 +00:00
TreeHugger Robot
95d0cc1766 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I516ae5d20d4f21a3bc455c02328b873d18a9a427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:13:44 +00:00
Bill Yi
881db50b16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1d40a8aad4b268384097ce8ca3e310aeb31bb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 21:13:13 +00:00
TreeHugger Robot
0e28d1212e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-22 20:59:45 +00:00
TreeHugger Robot
decc8d0759 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-22 20:59:45 +00:00
Henri Chataing
6a7031515e Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I938ce76f23b82ffc4f4b0f95364120dadc7cdb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:49 +00:00
Jack Yu
252dd209b3 Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: I7225161683a0b68b6eebf188ec99f39e57a33851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:48 +00:00
Jack Yu
86a6c6a9a7 Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Id9fd40284b018c8cc3424d6a77c6f6f7bf43da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:16:45 +00:00
Jack Yu
08c64a4414 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: I28561bde03b8dd3cbf2394ea5c851b15b584da49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 19:15:02 +00:00
Treehugger Robot
a14b3c6be2 Merge "Change API name" am: a0642974a4 am: f9d1535640 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: Id8b6e017f93933b3b64b66be9639b203b0fa9e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:37:55 +00:00
Henri Chataing
4886f28aba Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I082c6fda1b1420dd49a2507ea87e8262b341be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:31:00 +00:00
Jack Yu
e1dfe3d417 Show reboot dialog when users disable developer options am: d91e7a0565 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:54 +00:00
Jack Yu
0797feaf7b Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203

Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4 Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202

Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:30:37 +00:00
Treehugger Robot
f9d1535640 Merge "Change API name" am: a0642974a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:21:01 +00:00
Diya Bera
65721576d8 Merge "Remove duplicate code" into tm-qpr-dev am: 041d00afac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21487844

Change-Id: If6a80674fa3d00f6d5a82110df1f2bab50693ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 18:15:52 +00:00
Henri Chataing
4de9ff1a8f Merge changes from topic "nfc_logging_control" 
* changes:
  Add test cases for NfcSnoopLog and NfcVerboseVendorLog
  Show reboot dialog when users disable developer options
  Add a new NFC developer setting option for NFC vendor verbose log
  Add a new NFC developer setting option for NFCSNOOP
 2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4 Merge "Change API name" 2023-02-22 16:59:10 +00:00
Diya Bera
041d00afac Merge "Remove duplicate code" into tm-qpr-dev 2023-02-22 16:44:06 +00:00
Jeff DeCew
05c43c2edc Merge "Do not cache the bubble settings illustration" into tm-qpr-dev am: 3c5bbbdb0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21483805

Change-Id: Ie06a7625785dd3c82a50d5e3b1e24b44b54c02ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 01:38:58 +00:00