PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,801 Commits 1 Branch 0 Tags
4c4e06bf4e1df6bff895d3b13643152429e8a80c
Commit Graph

104801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4c7a5da05e Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" into tm-mainline-prod am: 6b7c737c5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637730

Change-Id: I8579ad5033c3a29e9a13783af6520761f315e20e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:42 +00:00
Peiyong Lin
d68db1acfd Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d am: f38e00f223 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: Ib0c1464702b777b2d4d37a4b4d996b43ae0a06e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:33 +00:00
TreeHugger Robot
3cc2f49ffc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 6336dc03b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I697483b01380c9a58968aaaf3f05b73c52bef72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:25 +00:00
Chaohui Wang
0bee8b57c4 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee am: 1aebd5fb02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: Ia850d51dec2cc813a65928ef12c6edcccfbe245b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:25 +00:00
Bill Yi
1b10109a03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f94a8a9af3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibab16e0884b63f27be3b3e318b3aacfa46fb460b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:16 +00:00
Peiyong Lin
630f705b0d Merge changes from topic "remove_game_dashboard" into tm-mainline-prod am: c3ce36da27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I63531ddd3b4222de5d31c88b2957ed83592c0c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:08 +00:00
TreeHugger Robot
03353d6449 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: ce51beb64d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6192a7567342f40e2dfb0816ac5dfa9f8fa2e9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:10:58 +00:00
Bill Yi
b447a5f3b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cc1f1b5e6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61bf8ed909c9483c9a1fa836dfe54d1c9cdcaf27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:10:48 +00:00
TreeHugger Robot
1fef2284af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: a18724de22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15b3f50983b18266e4f76773d96536ad37cf7c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:10:39 +00:00
Bill Yi
cce866c288 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ed1350a4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb47b65b98f5890420f7504d621018643e683fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:10:25 +00:00
TreeHugger Robot
467b38d5b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-07 18:10:06 +00:00
TreeHugger Robot
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +00:00
TreeHugger Robot
ecb28bd73e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:05:07 +00:00
TreeHugger Robot
6b7c737c5e Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" into tm-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 18:05:07 +00:00
TreeHugger Robot
58ddf22f1b Merge changes from topic "presubmit-am-1c4f0d1d8598451cae6f12e867c28efe" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c 2p: 64ad35274d
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 18:05:07 +00:00
TreeHugger Robot
0f949ed72b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-04-07 18:02:44 +00:00
TreeHugger Robot
fe1b272192 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08cae367a -s ours am: 793846e887 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2bcf231ff4954cdcc17b580a7fc0991ccd82cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:56:42 +00:00
Bill Yi
3a88f75a1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 682d8df13d -s ours am: 10b4940a2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0264ec468d3d04e5eb929b47d17d5fcaf9689d41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:56:40 +00:00
TreeHugger Robot
d7ed1d1500 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e9c30933a -s ours am: 9e81a99857 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79233821f1fe0f3e1c12c6e81696ab7ecdbdd960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:57 +00:00
Bill Yi
d2be3e1040 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08321b4e75 -s ours am: 90f845a535 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I157a53456b2171ab7587a26177fab29166ade494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:56 +00:00
Peiyong Lin
8e23b02de5 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: If856da79393481c5c5d4fbddfd966a2f9d0879f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:54 +00:00
Chaohui Wang
2e5180884a Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I10e8e4a64531f5e4b8340b98ab3783f516b8c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:08 +00:00
Peiyong Lin
f38e00f223 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I50773da7dafbdde67ff5ace7bc5fb15a3e16f024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:00 +00:00
Chaohui Wang
1aebd5fb02 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I9a02fa61cf65039e905b98a25e5510ae2e7c262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:54:53 +00:00
Peiyong Lin
c3ce36da27 Merge changes from topic "remove_game_dashboard" into tm-mainline-prod 
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
 2022-04-07 17:48:18 +00:00
Peiyong Lin
7ef70db34d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev 2022-04-07 17:48:18 +00:00
Peiyong Lin
a4f590f1f1 Merge changes from topic "remove_game_dashboard" 
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 2p: f621f13d83
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
 2022-04-07 17:48:18 +00:00
TreeHugger Robot
6336dc03b4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:35 +00:00
TreeHugger Robot
ce51beb64d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 17:40:13 +00:00
TreeHugger Robot
a18724de22 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 17:40:11 +00:00
Chaohui Wang
f2178a48ee Merge "Clean up unused Sliceable.copy()" into tm-dev 2022-04-07 17:31:08 +00:00
TreeHugger Robot
cc6286ba03 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-07 17:27:32 +00:00
TreeHugger Robot
793846e887 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d08cae367a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I797acd66aa4acb7b39a8d84cc068120301b4a40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:36 +00:00
Bill Yi
10b4940a2e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 682d8df13d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7171f6e0493773705bff5ccabac56d8bb6ecbec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:29 +00:00
TreeHugger Robot
9e81a99857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e9c30933a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd5fc4a5daedab1839b13153caf395ed8643fb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:46 +00:00
Bill Yi
90f845a535 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08321b4e75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic549f6d8e099580d27740f838fe9a998ac75aa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:42 +00:00
TreeHugger Robot
d08cae367a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-07 17:00:11 +00:00
TreeHugger Robot
8e9c30933a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-07 17:00:05 +00:00
TreeHugger Robot
4a8f7fce65 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-04-07 16:59:08 +00:00
Giulio Fiscella
431acd9dcf Merge "Use more unique ids for safety sources" into tm-mainline-prod am: 416e5d6f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17570476

Change-Id: I7cbbedd6757f8af4c33a4e86c4c00f05cd2ef8f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:40:25 +00:00
Bill Yi
6ed1350a4c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I82c6955438591932f9801878562cbdbea36b368a
 2022-04-07 14:21:45 +00:00
Bill Yi
f94a8a9af3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1a31725689e388e013ea1122842c7aa0250e41a7
 2022-04-07 14:17:44 +00:00
Giulio Fiscella
416e5d6f9b Merge "Use more unique ids for safety sources" into tm-mainline-prod 2022-04-07 14:17:11 +00:00
Bill Yi
ceafbb0715 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f2c568bba1 
Blank merge reason: commit message contains skip directive

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

Change-Id: If6e9759f93f98e9c3b48ac39fb9de3fec8cb847a
 2022-04-07 14:14:12 +00:00
Bill Yi
f2c568bba1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I289db8c8c10f3d04b794241a437d86770025a511
 2022-04-07 14:14:03 +00:00
Bill Yi
68b586ae46 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d0019169fc 2p: 847f203c73 
Blank merge reason: parent was merged -s ours

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

Change-Id: I0acb21c2ef531123c81fc39a52e5cf35a333d3c3
 2022-04-07 14:12:57 +00:00
Bill Yi
847f203c73 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 2p: d0019169fc 
Blank merge reason: parent was merged -s ours

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

Change-Id: I8f35bf1389a6c7e796319d525daf0060d73065ce
 2022-04-07 14:12:50 +00:00
Bill Yi
d0019169fc [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib47f17b9aa3f4e067a9c7d4b203c4286356f9d87
 2022-04-07 14:12:41 +00:00
Bill Yi
2c4b82e04b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9df9e2fad6107338e395c58a794596f8f388c32e
 2022-04-07 14:12:33 +00:00
Bill Yi
48b2c35816 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5468439c4c 2p: 64ad35274d 
Blank merge reason: parent was merged -s ours

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

Change-Id: I35d78b4b6f14925b412f6e70f51a2e2f6014e2db
 2022-04-07 14:10:13 +00:00