PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,467 Commits 1 Branch 0 Tags
445869a724e247ae4ab05068aeb85e2099616a63
Commit Graph

72467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugh Chen
445869a724 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe am: e90fdbf747 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: Ie8f2d68082238c1a5f67cef2fcb31b5228e4baf6
 2021-05-11 06:58:43 +00:00
TreeHugger Robot
a6f32496f2 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: 0e37bc27a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I72ec88755fd1d41d47d2850f6b7bc33de49601c1
 2021-05-11 06:58:33 +00:00
Hugh Chen
47666c2d15 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 425430345d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: If5e9c837a6abe536c14c4714ceb853cafc760052
 2021-05-11 06:58:32 +00:00
TreeHugger Robot
3942491a7f Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 256de04464 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: Ie069b79899d0f1ec2804eb73a6a6c61f66dcfe17
 2021-05-11 06:58:23 +00:00
Hugh Chen
8bf67a7f4b [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: 6fee770ea0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I1067439941b49387c0c12d7945a1741a622c5dae
 2021-05-11 06:58:22 +00:00
TreeHugger Robot
8be84e5e36 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: e790b378c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Iad2d26bd6f41cb3aead971faa398a889db384b29
 2021-05-11 06:58:14 +00:00
Hugh Chen
c740d7ad82 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 -s ours am: 933f807885 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: If30e312d4b6c4e1d738f2549ff83455e942c3157
 2021-05-11 06:58:12 +00:00
Hugh Chen
e90fdbf747 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: Icf7882fc0640bf49580efee8d38170869af50847
 2021-05-11 06:41:08 +00:00
TreeHugger Robot
0e37bc27a2 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I3b95a45ef89a2c7d3c651e67f01dabd45897331d
 2021-05-11 06:41:01 +00:00
Hugh Chen
425430345d [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I739376349571d5d917a34eabf121f1347626379a
 2021-05-11 06:41:00 +00:00
TreeHugger Robot
256de04464 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I8462c36866641491631cfcc8aed8bdde8b5ea984
 2021-05-11 06:40:53 +00:00
Hugh Chen
6fee770ea0 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I7fdb4bbb527008c0f64cab9d8c101f4301f92c62
 2021-05-11 06:40:52 +00:00
TreeHugger Robot
e790b378c3 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ic3753ba1c4945113050f87feb611f23d1cd5b79e
 2021-05-11 06:40:46 +00:00
Hugh Chen
933f807885 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 -s ours 
am skip reason: skipped by user hughchen

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

Change-Id: I27a2ef608420e73b9ae797cbcdc73d82228312c5
 2021-05-11 06:40:46 +00:00
Hugh Chen
8dbc94fcbe [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31dde5548cb9ae735e8f342548b8e6fb799b0104
 2021-05-11 06:32:19 +00:00
TreeHugger Robot
e5e19dd41a Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I8cc36a74ea8abdaa25bc0876e4e4ce9218808d3b
 2021-05-11 06:32:12 +00:00
Hugh Chen
392fb7a4f7 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2afcbd48ae913e348764246122dc0f0fef03ec46
 2021-05-11 06:32:11 +00:00
TreeHugger Robot
16e8c4783e Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
 2021-05-11 06:32:04 +00:00
Hugh Chen
effac8a0c1 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
 2021-05-11 06:32:02 +00:00
Hugh Chen
fe87f1ac34 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I668163c48cd6de7ac9236a878550d7a80eb9c7ac
 2021-05-11 06:24:14 +00:00
TreeHugger Robot
24ef90eaaa Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: If31a9fca9d45ae3d0408874a34427f8ca8984f49
 2021-05-11 06:24:06 +00:00
Hugh Chen
3607e825b9 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
 2021-05-11 06:24:06 +00:00
Hugh Chen
9bbcb55a23 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3e897ff1e8259b5d24dc1291e0683f325c2d7fe
 2021-05-11 06:18:44 +00:00
TreeHugger Robot
38a2b32e94 Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I0431e3135de7bb952fa8e8185b6eef44a1c24dc7
 2021-05-11 06:18:37 +00:00
Hugh Chen
8a4f60b143 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44435d83016a9c974d704cab9de7fa50df1515f3
 2021-05-11 06:18:35 +00:00
Hugh Chen
53ff99b8b4 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23ab4bb935d65f3afda82333291d0ea7a187428a
 2021-05-11 06:16:53 +00:00
TreeHugger Robot
54f47d0953 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
 2021-05-11 06:16:43 +00:00
Hugh Chen
7b05629834 RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
 2021-05-11 06:16:42 +00:00
TreeHugger Robot
f9c99c40d2 Merge changes Ia51528f2,Id27a7809 into pi-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:54 +00:00
TreeHugger Robot
f45fa1bf85 Merge changes Ia51528f2,Id27a7809 into rvc-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:28 +00:00
TreeHugger Robot
4074cd5e48 Merge changes Ia51528f2,Id27a7809 into qt-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:19 +00:00
Treehugger Robot
d13156d85a [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours 
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is already in history

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

Change-Id: Iccb4a95dc5c6863ea96897a392049b6ade646abf
 2021-05-08 22:45:15 +00:00
Xin Li
06e9e8b3a9 [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours 
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is already in history

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

Change-Id: I17c63dac08252e5f31b334731e25837ace0ab965
 2021-05-08 22:45:12 +00:00
Treehugger Robot
8c84477a04 Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I38f2d600c3bd14f3b59de36152a19a4f3a994e9d
 2021-05-08 22:01:03 +00:00
Xin Li
c41debcf7f DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I7325883698b037f16083f2dfa39db84feb21f698
 2021-05-08 22:00:38 +00:00
Treehugger Robot
7e8f5aca00 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Xin Li
bb6f5b264f DO NOT MERGE - Merge RQ2A.210505.003. 
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
 2021-05-07 23:32:36 -07:00
Xin Li
a7d220aad7 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: I810710363abf4ab5cffa5d3c05095468716d2466
 2021-05-08 02:13:47 +00:00
Xin Li
1b68f3bfd3 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: Ifc6c1d5d1192a56c9f33ded1a984e1d4b73157c9
 2021-05-08 01:48:55 +00:00
Xin Li
6811428c9c Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." 2021-05-08 01:28:18 +00:00
TreeHugger Robot
2332a37557 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 31e0f46d87 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b468892d531003b9ada3fac1ffb0b54866e61e9
 2021-05-07 23:19:54 +00:00
Bill Yi
d32b02b4b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ced13c831 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e49484d667bbe12c60fc975be09cf477e090877
 2021-05-07 23:19:11 +00:00
TreeHugger Robot
31e0f46d87 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-07 23:07:35 +00:00
Xin Li
7df22b02ca DO NOT MERGE - Mark RQ2A.210105.001 as merged. 
Bug: 180401296
Merged-In: Ic91dd36f6de39ef79f1ced90083e1c5c7836c651
Change-Id: I82a9266b107ebaf80b897deb8066e6976642644b
 2021-05-07 14:32:28 -07:00
Bill Yi
5ced13c831 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I77632e0a713314bd782dfaa3256e5181078ef332
 2021-05-07 16:57:00 +00:00
Bill Yi
51221d77f7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I830341ac6e908b358eb878baa11e62ebbf4fcfd9
 2021-05-07 16:53:34 +00:00
Edgar Wang
b4ada164a0 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I9e7e25716d18b62a38250d6b02c2794cc2046886
 2021-05-07 04:32:55 +00:00
Edgar Wang
7106d10dd0 Merge "Add personal dictionary summary text" am: 0cbc974638 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
 2021-05-07 04:18:17 +00:00
Edgar Wang
0cbc974638 Merge "Add personal dictionary summary text" 2021-05-07 04:02:00 +00:00
Treehugger Robot
026ecdd388 Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499
 2021-05-07 03:11:46 +00:00