PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,776 Commits 1 Branch 0 Tags
613a20b60bac4bf1de5956f5097ba03fde344ae6
Commit Graph

100776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
613a20b60b Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d am: 2ac592070e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I7e0985fc314757b8fd6038bbaeca703dec98d911
 2022-03-03 10:21:55 +00:00
Bill Yi
4737c96916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours am: 73f7e22809 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7389eeca0c9d899530d206767802029ba6d6a23
 2022-03-03 10:21:49 +00:00
Bill Yi
8c84908a44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours am: d529bb6864 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65db0a7196bf7917c5251a0e8b8514e728347319
 2022-03-03 10:21:39 +00:00
TreeHugger Robot
10960dc3ff Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 am: aa7bb23dd7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: Ifdfb4dc97e336806152c715400bc81e060d7f1b5
 2022-03-03 10:21:32 +00:00
Bill Yi
294fc6d0be [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours am: 7e5988a9b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f7871c90a137cb0ecc1c61f9d2eb386862397f7
 2022-03-03 10:21:31 +00:00
TreeHugger Robot
7497fe7e00 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours am: 1cda28b22c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a0a2db13b9ef1bee72497f58e5af9f79bff58cb
 2022-03-03 10:21:10 +00:00
Bill Yi
2946142cdf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours am: 71ea2a5db3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98a8abdf6524a737810f74c89f8d15eb091e141c
 2022-03-03 10:21:09 +00:00
TreeHugger Robot
61f9634f6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours am: 7202ce3d9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5458d58f754fc411828d705079a7f25aefa68ab7
 2022-03-03 10:20:10 +00:00
Bill Yi
2f1613b0f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours am: 722677a2c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0b0b138c13831a11a610efe49af60e3afd857e2
 2022-03-03 10:19:53 +00:00
TreeHugger Robot
2ac592070e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I9d3c8b4a0f6a31a603e16e440d77974b538b7db3
 2022-03-03 10:18:56 +00:00
TreeHugger Robot
77a42482c0 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I9a6f61a28aff2c55a25d027ddd0759503a432d89
 2022-03-03 10:18:37 +00:00
TreeHugger Robot
5a5bfcf48d Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I02091b9fa75c14c15da42fd83e1aeb10391b92d6
 2022-03-03 10:08:36 +00:00
Bill Yi
2c86c667ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2db011eaf588a7cc2533661f1e7df8c28ee612d
 2022-03-03 10:00:06 +00:00
Bill Yi
4be4b68367 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74b6cf10bd4173efe24c13b2366c9761c63a3cdf
 2022-03-03 09:59:39 +00:00
Bill Yi
73f7e22809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f9d6abecd5421bd8feac731cdc43b48025f328d
 2022-03-03 09:59:36 +00:00
TreeHugger Robot
99ff1245f4 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I5338ac84d2571c2c6698a5f7eb0e2485d56e1320
 2022-03-03 09:59:03 +00:00
Bill Yi
a0fe77c01f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd698d65cdcb3e812f51fcfbc602144c85f5e1e
 2022-03-03 09:59:02 +00:00
Bill Yi
d529bb6864 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ed395fb5c77ab3d5fc130e2c6dfb9d68639ca17
 2022-03-03 09:58:57 +00:00
TreeHugger Robot
aa7bb23dd7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I332e83fafd33d8be9f8b564275635b43f9c1103b
 2022-03-03 09:58:19 +00:00
Bill Yi
7e5988a9b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7717bb6d4c020f1961dfd62be5090db8df2568b
 2022-03-03 09:58:18 +00:00
TreeHugger Robot
a06d4dd336 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icd656b616ff9ace155d40bdadf854d91a1cd0a0f
 2022-03-03 09:58:06 +00:00
TreeHugger Robot
1cda28b22c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f370fcb8b39cec5fcb45fba89eb47a9dc5a2573
 2022-03-03 09:58:05 +00:00
Bill Yi
2452ddb5a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idae44670190916b4b8df9e39f3f4fbbec0b08620
 2022-03-03 09:58:04 +00:00
Bill Yi
71ea2a5db3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bb2b62408df5cd9ef900d688a0eeee98334d0a2
 2022-03-03 09:58:03 +00:00
TreeHugger Robot
7202ce3d9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a0b99ba69dc098105754b02d63a4ab0952ea68e
 2022-03-03 09:57:16 +00:00
TreeHugger Robot
00008e601a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibfb5bbab80cc06b0c76d7e1f092e5dfaf545b7da
 2022-03-03 09:57:14 +00:00
Bill Yi
722677a2c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68de70d7b107222aa4d5778ff391202206568ef7
 2022-03-03 09:57:11 +00:00
Bill Yi
5243b3ef11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I107b306c67c96cefe7b64a6ae7201776f34c5588
 2022-03-03 09:56:56 +00:00
Bill Yi
baecf5a51e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1138abe17216c8a1528e39a7e062a8fbc64fe794
 2022-03-03 09:56:29 +00:00
Bill Yi
01f5ecdb4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd3b6d272a62082e2cd40e715cb20704f1ba625
 2022-03-03 09:55:56 +00:00
TreeHugger Robot
57ff9d215e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:26:19 +00:00
TreeHugger Robot
8f84e7a9e7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:26:19 +00:00
TreeHugger Robot
76d6cbc7b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 09:15:36 +00:00
TreeHugger Robot
088bb2a3bc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 08:49:36 +00:00
Bill Yi
a6545359b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47315f07e63678058eab99a25b69e870b20e1786
 2022-03-03 08:40:04 +00:00
Bill Yi
a93e2d89ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0f44230c35fa3d1c41246ef929b3e188cf084c1
 2022-03-03 08:38:53 +00:00
Bill Yi
35eb2aa055 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours am: 657ad4c091 -s ours am: 73d2d988a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1b7bbcfafeb4ca7407a4face92e6501e507321a
 2022-03-03 08:28:53 +00:00
Bill Yi
d6e99b7741 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65d1242ace5c200def66d4e7073859ee2c3958a2
 2022-03-03 08:18:33 +00:00
Bill Yi
73d2d988a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours am: 657ad4c091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1361b00fa2fc1b147848d1cc370798b98382309a
 2022-03-03 08:06:56 +00:00
Bill Yi
5bbd89324f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours am: 657ad4c091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If685e1fd20571c3f783fbc428e3154637fcf4846
 2022-03-03 08:06:39 +00:00
Bill Yi
657ad4c091 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 11683d653b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I745a4ed776a72df02df79b29427f5a26f24573f2
 2022-03-03 07:45:09 +00:00
Amy Hsu
5b631a6925 Merge "Add summary and footer message for the ScreenResolutionFragment." 2022-03-03 07:05:04 +00:00
Amy Hsu
7399a1f0f5 Merge "Add ScreenResolutionController to Settings app" 2022-03-03 07:01:40 +00:00
Amy Hsu
d633cd6b32 Add summary and footer message for the ScreenResolutionFragment. 
Bug: b/199559703
Test: Check resolution switch UI in Settings app
      atest SettingsUnitTests:ScreenResolutionControllerTest
      atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: Iee1e74d3d4de81500b2abe62bc7e9bd69f55452c
 2022-03-03 14:26:10 +08:00
Yasin Kilicdere
18252d9f88 Merge "Fix Guest string was not translated in UMS.userWithName()" 2022-03-03 03:24:18 +00:00
YK Hung
8b06549bd1 Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16 am: 74df068ec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912

Change-Id: I400e7dd5b0d4796fbeec911186529abc9a9ac2f4
 2022-03-03 02:52:38 +00:00
YK Hung
c34a77143a Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912

Change-Id: I4e2c2dc4ca6e3181424b7a5bccc90a5db7a580a5
 2022-03-03 02:31:41 +00:00
YK Hung
74df068ec8 Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev am: c08c6c5c16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052912

Change-Id: I9e9b55f896a7a8567e9ae8d6df287a162a0dd307
 2022-03-03 02:30:29 +00:00
YK Hung
c08c6c5c16 Merge "Fix the broken tests on BatteryTipDialogFragmentTest" into tm-dev 2022-03-03 02:12:27 +00:00
Yasin Kilicdere
87c063e051 Merge "Remove the fallback AddSupervisedUserActivity." 2022-03-02 20:15:41 +00:00