PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,410 Commits 1 Branch 0 Tags
fe8f27e50817f46ac41da052d55fac09245c232a
Commit Graph

67410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
444c856107 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3b574996dcfa6bce46af7187589ddb254bfa807
 2020-09-02 18:05:38 +00:00
TreeHugger Robot
11304fb8a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 17:50:47 +00:00
TreeHugger Robot
7d16f97c97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631 -s ours am: bc565bd615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79f5560d71e8830e434458ce0f70858c6e3935fb
 2020-09-02 17:49:23 +00:00
TreeHugger Robot
bc565bd615 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1895d604f90e4f8d497c7d9dee89463efd531bda
 2020-09-02 17:12:25 +00:00
TreeHugger Robot
4a3e39cb13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours am: edb75a2eec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ec0fe0fa16a7ea6dd2768e16dc5b4c3f8a753f2
 2020-09-02 16:36:19 +00:00
Anton Hansson
0df917748c [automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4 -s ours am: 633379f309 -s ours 
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54 is in history

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

Change-Id: I861f802d5fef4c3ca7be53e9d1162c6482312324
 2020-09-02 16:34:49 +00:00
TreeHugger Robot
74ab66f631 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:31:43 +00:00
TreeHugger Robot
edb75a2eec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3fcb638648ca92b1b363b77cc8ae4a04ea6268e2
 2020-09-02 16:11:19 +00:00
TreeHugger Robot
11fd725f1a Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:06:50 +00:00
Anton Hansson
633379f309 [automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4 -s ours 
am skip reason: Change-Id I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb with SHA-1 40a8846e54 is in history

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

Change-Id: I2d0f192fb7d7cbd5e60563375caab027489658f6
 2020-09-02 16:00:11 +00:00
Anton Hansson
0e5e0c77d4 Add explicit dep on framework-wifi.impl 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Bug: 161767237
Bug: 167568930
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval:‌ ‌Cherry-pick
Merged-In: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
 2020-09-02 15:41:40 +00:00
Bill Yi
b9ff4275f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I01190d1453f17ee5a42b303cfd201a4a8ed5a458
 2020-09-02 13:28:38 +00:00
Bill Yi
25e90ee101 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6efada3aedd313f97b1405db8164499180316b89
 2020-09-02 12:53:56 +00:00
Bill Yi
0009d56501 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I412e0c9881bc5de07ce964b2dc8892bb3e23db60
 2020-09-02 12:17:48 +00:00
Treehugger Robot
0b9ba3c3cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours am: b372e3fbcf -s ours am: 958cb755cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib131571114f795322d115a1926b8e4920968f8e2
 2020-09-02 07:48:42 +00:00
Treehugger Robot
8942b451cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours am: ca40ee1a3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I086d2a926c9089f19e9bf5a26e04a8e6210afd92
 2020-09-02 07:48:23 +00:00
Treehugger Robot
958cb755cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours am: b372e3fbcf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0228bd344d0b755ccc745109a2369331d15b622
 2020-09-02 07:29:52 +00:00
Treehugger Robot
ca40ee1a3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e811f65e77821275c46b300115828a56583611f
 2020-09-02 07:29:37 +00:00
Treehugger Robot
b372e3fbcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94bcd92bbc7c3476585bad6fc1334130dcebae56
 2020-09-02 07:11:35 +00:00
Treehugger Robot
f3ae142f67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41cca1a0a56dc19ae68b420aadc78e3cfc3121c9
 2020-09-02 07:11:06 +00:00
Treehugger Robot
76947837c5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:35:32 +00:00
Treehugger Robot
22a9ba1458 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
 2020-09-02 05:42:17 +00:00
Bill Yi
256ea9e29b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15697e753d245ca812bd2cba4d174c54811bde91
 2020-09-02 05:05:27 +00:00
Xin Li
744507f78b [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours am: d92daf10ef -s ours 
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

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

Change-Id: I96cb62de1d30aed204295f417deab1d806bda62e
 2020-09-01 21:46:50 +00:00
Xin Li
d92daf10ef [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours 
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

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

Change-Id: I0d548c1b5c061e4ee753808040af883dd59cb3ee
 2020-09-01 20:37:15 +00:00
Xin Li
d57e13f558 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:04:34 +00:00
SongFerng Wang
08e3e22ae0 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I2852e9c06cedb61338e6ccaaed078fc07e241a61
 2020-09-01 05:00:04 +00:00
SongFerng Wang
4e657741ae Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63
 2020-09-01 04:40:24 +00:00
SongFerng Wang
318f6bcc53 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I1714b765690ac43e77233752d31ef921219584f0
 2020-09-01 04:27:11 +00:00
SongFerng Wang
19222f2154 Merge "Add NR network type to "Global" mode preference" 2020-09-01 04:09:35 +00:00
Bill Yi
b7e58c608f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4249bd150a1c76528ad511c9b8954debac3857d4
 2020-08-31 15:26:21 +00:00
Bill Yi
09cc09a274 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idc7c40c329d18ea4bd4061eb37b4672b71a2ce17
 2020-08-31 13:11:17 +00:00
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
 2020-08-28 23:35:54 -07:00
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference 
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
 2020-08-27 15:56:13 -07:00
TreeHugger Robot
66f3b09eab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5a7bb2bed92ff6a85e04007ed1ca44dfd87ef2a
 2020-08-25 00:50:50 +00:00
TreeHugger Robot
7784b632f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 23:47:22 +00:00
Bill Yi
333af71c67 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I189c4535205aeb90f4804f8ce03125d2d0b57afc
 2020-08-24 21:56:39 +00:00
TreeHugger Robot
ee6f51cc9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie86707775f05944896f263c67f109faf4fba6dc4
 2020-08-24 17:31:13 +00:00
TreeHugger Robot
fcfa016fc6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 16:39:30 +00:00
Bill Yi
6de20ba7d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c05495dd402909c7be8dff05bf3dcfa989046b0
 2020-08-24 07:55:38 -07:00
TreeHugger Robot
a8bd2b7a82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7505c1bd6a8af76501f6c89738d02973d2a9f13e
 2020-08-23 02:58:59 +00:00
TreeHugger Robot
66239bfaa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 02:35:15 +00:00
Bill Yi
4cd2078e50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie984a3ec13fe9bf2b0db635fc95c4688992189f6
 2020-08-22 15:33:31 +00:00
Bill Yi
6923a98c64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I62e56f374302ccd788ccef846a68fe136959bfb7
 2020-08-22 08:26:30 -07:00
Bill Yi
493440b39d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a784d62bc3bd3e542e61adb4d7871ee7da49bd4
 2020-08-22 12:52:45 +00:00
Bill Yi
24a85bad6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie59b03c55a034cd781711e87a7898644c39fe271
 2020-08-20 16:32:38 +00:00
Bill Yi
5739e1f877 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c8c87022237f2cc8b4b5a4623756ddf2f2a3764
 2020-08-20 07:46:11 -07:00
TreeHugger Robot
74da04187c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0536955a70b5e28da3c36b8e268bb65c746e5d1
 2020-08-20 00:33:00 +00:00
TreeHugger Robot
4b4b2b29fa Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-20 00:15:12 +00:00