PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,401 Commits 1 Branch 0 Tags
73becab67217341775ee123d89e2a348d1276d0c
Commit Graph

112401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi
38de5c85af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52b4eb39a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe4514e280b94d37ea66c683ba46dd71be83deec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 19:34:43 +00:00
Bill Yi
52b4eb39a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I602961ddf48ee427f7e7ae975fbe721fae03c744
 2023-05-16 21:41:43 -07:00
Bill Yi
fe5e3598df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I084ff09f7787723e81b5dabff4c5a0660c7da1ad
 2023-05-16 21:35:21 -07:00
Bill Yi
bc60e81eca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b28ec85ac06812a818962c01acf6a18dd395239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 22:55:09 +00:00
Bill Yi
a27aa2d884 Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-12 22:29:01 +00:00
Bill Yi
efe3ce5660 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-12 22:29:00 +00:00
Fangqiu Su
1cc65c8dce Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I4350f048408914f3d46bfb54a546fc9861c565bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:00:02 +00:00
Fangqiu Su
942671e18a Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I4d7c2aa70600ffecdda7aa467926993732e1fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:19:48 +00:00
Fangqiu Su
0a3a5b74a1 Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" 2023-05-11 19:50:53 +00:00
Bill Yi
40fae6e492 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 
Blank merge reason: commit message contains skip directive

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

Change-Id: I21afad7371cf360d1020f485d5f133027cc6545b
 2023-05-10 14:35:36 +00:00
Bill Yi
7e3f3fd34d [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1fec88fb5de606aeac7328fa48a5ca15349c5c2e
 2023-05-10 14:35:05 +00:00
Bill Yi
13c4c2accb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4df0fe515c3acf2eddfeabef5b6088f437ad1b8d
 2023-05-09 19:15:29 -07:00
Bill Yi
7a494fc7c5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I041ed592d479aeb038cb23092fa85b14d71df157
 2023-05-09 19:08:51 -07:00
Evan Laird
ff6f9337c8 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: Ifd81c0ea3c845d9f48b5eef143357960f21a66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:25 +00:00
Evan Laird
b4d2e7da30 Merge "Set default value of battery percent preference" am: 145caf7d4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:37:47 +00:00
Evan Laird
145caf7d4e Merge "Set default value of battery percent preference" 2023-05-09 15:53:08 +00:00
Bill Yi
bdeb587767 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours am: eb890c8bf8 -s ours 
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

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

Change-Id: I1912e8a1b21aae82c5ebd9c3f7daa14235d66978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:01:08 +00:00
Bill Yi
649fb33ad4 [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours am: 3f186b6b1c -s ours 
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

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

Change-Id: Ib13a4b9830161df33f6d36827fbdb6e584d9e54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-05 00:00:53 +00:00
Mattias Nilsson
03a0bdd030 Set default value of battery percent preference 
Read config_defaultBatteryPercentageSetting to set default
preference value for battery percentage in SystemUI.

Bug: 189235242
Test: Set resource and check device at boot
Change-Id: I6427a3b76f5641b387dc19f45e17b30820911e3a
 2023-05-04 23:23:48 +00:00
Bill Yi
eb890c8bf8 [automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c19f -s ours 
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

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

Change-Id: I93c612069bd783894cfbc07e1f7e1028dd1a7780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:21:20 +00:00
Bill Yi
3f186b6b1c [automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 82c92ce15c -s ours 
am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b687 is already in history

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

Change-Id: I9fd542fb1505109f1e68ce2849d06061b7498093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 23:21:02 +00:00
Bill Yi
e48fa8c19f Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" 2023-05-04 22:39:57 +00:00
Treehugger Robot
b960f4535f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida1fee638445f0441db8f0c9409346e90f6d2f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:05:01 +00:00
Treehugger Robot
663a43e79f Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-04 04:36:14 +00:00