Joanne Chung
16a3800902
Merge "Update OWNER file to new owner" am: 6c84f9128d
am: e7b01f0ce8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630
Change-Id: I7dd7e11968e601d180cb928dd6dcb0803dedf523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 08:05:03 +00:00
Joanne Chung
e7b01f0ce8
Merge "Update OWNER file to new owner" am: 6c84f9128d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2618630
Change-Id: Ie7ac04781ba486dd74af1df57a995636453eb21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 07:23:35 +00:00
Joanne Chung
6c84f9128d
Merge "Update OWNER file to new owner"
2023-06-08 06:40:49 +00:00
Joanne Chung
674ae4ae93
Update OWNER file to new owner
...
Bug: 177641730
Change-Id: I68e9986338e04bb81a11a495f6de1657399b5742
Test: n/a. Only update owner
2023-06-08 06:40:41 +00:00
Treehugger Robot
763b15231f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I67802f22ec2b6c9181294a2bede4a125f59d9514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:36 +00:00
Bill Yi
32fce5403f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398
Change-Id: I635434e235c73d3db56a56183e0c9b442f2da8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 14:43:29 +00:00
Treehugger Robot
f996cfceba
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-06-06 14:19:16 +00:00
Treehugger Robot
fc0e5b8a0c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6cb0b2c68e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: If8ea7a60b6773ba33f29bc9a1dfba0ad5bf013ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:30:02 +00:00
Bill Yi
eabe8621e3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cb99dd3e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556175
Change-Id: I1d37a0e038be918b973722f7ef5496a3fd08aa3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:29:42 +00:00
Bill Yi
e68afc2727
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 59cfc8ae14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23556174
Change-Id: Ib4c87cb28adc652f306b2101984d13301242b1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:29:21 +00:00
Bill Yi
f108c63394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b5824f6c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559400
Change-Id: I2e93a216a570bf7cd685e691e593ba8163089f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-05 20:13:06 +00:00
Treehugger Robot
6cb0b2c68e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-06-05 19:36:58 +00:00
Bill Yi
1b5824f6c9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia19dd8b4893160c436ed2a4b548b1c0a18ac5642
2023-06-04 18:44:23 -07:00
Bill Yi
506e105fdb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I61f515a3a5cd45df467240ef7cc38e098fd184ae
2023-06-04 18:39:29 -07:00
Bill Yi
8cb99dd3e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8d72c85deddd4bbb0a4fb49b71c6c929bf253db
2023-06-04 12:26:25 -07:00
Bill Yi
59cfc8ae14
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib2c29e2e9c358a14b63738fba13a296d7d49f9ed
2023-06-04 12:24:22 -07:00
Jason Chiu
2b8067e797
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa
am: 390c348d4b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: I2e223f815b9d96f0766a139cdee53884f47d849b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 09:34:10 +00:00
Jason Chiu
390c348d4b
Merge "Do not init dashboard categories when SetupWizard isn't finished yet" am: 428e97cdfa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608473
Change-Id: I3d1b66a4288434d52075538af737c2d1ac33f4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-02 08:49:21 +00:00
Jason Chiu
428e97cdfa
Merge "Do not init dashboard categories when SetupWizard isn't finished yet"
2023-06-02 08:05:32 +00:00
Jason Chiu
2225729ce2
Do not init dashboard categories when SetupWizard isn't finished yet
...
The generated category cache during SetupWizard flow is invalid.
Bug: 261885832
Test: manual
Change-Id: Id2108b2cc4ab557b086c4dbbd5dc7722c73e74d3
2023-06-02 04:55:20 +00:00
Treehugger Robot
2ccf9d9560
Merge "Fix resource leakage caused by cursor" am: 662ba59a47
am: 381ac521bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471
Change-Id: I4196b9cff84c09c18f16010d5ea43d918b835459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 23:28:00 +00:00
Treehugger Robot
381ac521bd
Merge "Fix resource leakage caused by cursor" am: 662ba59a47
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2608471
Change-Id: Idebb2842aa83cabc6d85e9d277cdb29bbd45362d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 22:44:05 +00:00
Treehugger Robot
662ba59a47
Merge "Fix resource leakage caused by cursor"
2023-06-01 22:10:34 +00:00
Cao Peng
38f1b45d50
Fix resource leakage caused by cursor
...
Change-Id: I9507658cc82a2b9760507530920a37044f7de2fd
Signed-off-by: Jia Jia <jia.jia@zte.com.cn >
2023-06-01 18:16:26 +08:00
TreeHugger Robot
a93397786a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: Ic209ddcfd7417e43f1bbb2934fb97d21086eaa61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:27 +00:00
Bill Yi
13df8b2d97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467681
Change-Id: I8bc84d7b3f6821476666db24e11855e15a103f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:14:23 +00:00
Bill Yi
2d3730c6e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467801
Change-Id: I80facf9912d1fccb9e1b9e6264d9bb699112d2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-31 18:13:31 +00:00
TreeHugger Robot
34ee142399
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-31 16:55:11 +00:00
Bill Yi
adefb73221
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I783506712d5b1c5887f9d955cbd838f44cde34b7
2023-05-29 00:59:12 -07:00
Bill Yi
3f97401447
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7a3f1cb5958809c0b34692b456170a921df0a7dc
2023-05-29 00:54:17 -07:00
Treehugger Robot
2bb637fcc2
Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956
Change-Id: I2f9d6bba0bad509cbe0ca2b42dea01a697e2c80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-26 17:44:52 +00:00
Treehugger Robot
5fa6d3b7dc
Merge "Restrict Printing Settings" into tm-qpr-dev
2023-05-26 16:28:03 +00:00
Treehugger Robot
b41ce7e248
Merge "Owners updates" am: b2b16851ef
am: 340fde1f0f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706
Change-Id: I2c96e422679634b05d576ac12eae4cdbd4d715ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 09:28:47 +00:00
Treehugger Robot
340fde1f0f
Merge "Owners updates" am: b2b16851ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706
Change-Id: I1877aa7d17aa8d93e7e665d8f12e7c7ac2739926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 08:49:15 +00:00
Treehugger Robot
b2b16851ef
Merge "Owners updates"
2023-05-24 07:54:26 +00:00
Weng Su
e12733d72f
Owners updates
...
- English prefix order update
Test: N/A, just owners update
Change-Id: I8faae968bc0860be2f2cb8503949938a82d2abbd
2023-05-24 07:41:50 +00:00
Treehugger Robot
d0af78bc76
Merge "Owners updates" am: 21bc49159a
am: e638ec642f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705
Change-Id: I5194c7401859dfcae05a1729c9fdc95d118e9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 04:32:15 +00:00
Treehugger Robot
e638ec642f
Merge "Owners updates" am: 21bc49159a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705
Change-Id: I78863e0d04c593a97e49aa176d0469a3b2ac8418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-24 03:53:00 +00:00
Treehugger Robot
21bc49159a
Merge "Owners updates"
2023-05-24 03:08:29 +00:00
Bill Yi
0fd5495eff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I745db34aa1424c03aa178f29e6e5835729cb1f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:29:45 +00:00
Bill Yi
2ab5a7908f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379721
Change-Id: I097e940965f9aac9a61784520bbe937961dd8f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 23:29:07 +00:00
Bill Yi
27d96e91e7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-23 23:01:47 +00:00
Weng Su
09bcf96bcd
Owners updates
...
- Add Pixel Settings owners
Test: N/A, just owners update
Change-Id: I3821380595857b0b2b2687ceb7191f7b6e0b2018
2023-05-23 21:04:29 +00:00
Bill Yi
1c5a35aa3e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0229581abb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23379715
Change-Id: I136558263e2793555345546749aa6f9c1901f366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-23 17:11:18 +00:00
Bill Yi
3c2e4800c6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib1c6d99be35bbe92e24a2060046717bc26397934
2023-05-22 16:52:00 -07:00
Bill Yi
0229581abb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I001817a76ffa02590155c033d1f7fb87c79832cb
2023-05-22 16:46:36 -07:00
Weng Su
4c1dd91695
Restrict Printing Settings
...
- Don't show Printing Settings if the user is restricted by UserManager.DISALLOW_PRINTING
Bug: 269122009
Test: manual test
atest -c PrintSettingsFragmentTest
Change-Id: I15db778ebc4de3c8a76505043fab1ee02db3f290
2023-05-18 18:40:48 +08:00
Treehugger Robot
ef7d5b407c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: I9c45339402f3217ba4b9efce60bceba8849cdc87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:18:49 +00:00
Bill Yi
1686903bde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280838
Change-Id: Ib7e14ca0a58437c78fddf82d7dbc8eaa23f5fbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 23:18:44 +00:00
Treehugger Robot
19935236b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-17 23:08:03 +00:00