PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,651 Commits 1 Branch 0 Tags
966f8a889bbd0b4c29c99b6030b1f2cb28b65353
Commit Graph

62651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
966f8a889b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifeeb5b1ed6feed0931e8b486485ab03cf1d37555
 2020-09-05 15:02:28 +00:00
Treehugger Robot
2d241c544d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8aea55919ca80fb40dc091d3325889f08fbc926
 2020-09-05 15:02:22 +00:00
Treehugger Robot
d1b40cfb18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55ff3c61ba1febe39d468c0a59cd558dd08ed677
 2020-09-05 15:02:05 +00:00
Treehugger Robot
0749b2e5b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4918d11aef9655cc94daaefdbc2c6400823beaa9
 2020-09-05 14:26:56 +00:00
Treehugger Robot
a4bfe8a50f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib43bd3e6188189f638e1c583907708eeb270f5df
 2020-09-05 14:26:49 +00:00
Treehugger Robot
809f01fc74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2087ff5e1201a5024e7f6948976e073e1f68312f
 2020-09-05 14:26:25 +00:00
Treehugger Robot
e30450cd68 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:55:03 +00:00
Treehugger Robot
992e9bc161 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:53:33 +00:00
Treehugger Robot
88fe7c9897 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:51:43 +00:00
Bill Yi
821f954a9a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie0ee665d6f119236268486b2d199de22463bd29d
 2020-09-05 12:40:07 +00:00
Bill Yi
7cd983aed7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9421d2ca455dff9dcd838d2e5b232b29e5498a0f
 2020-09-05 02:10:54 -07:00
Bill Yi
47a48929ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4262b66f910ae9cff97a30a89b354938d787805
 2020-09-05 01:26:27 -07:00
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
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
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
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
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
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
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
af6dfc4b8c Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
 2020-08-19 15:08:01 +00:00
Treehugger Robot
e40251b9f5 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
 2020-08-19 14:56:13 +00:00
Treehugger Robot
16503cf517 Merge "Settings: Fix exception in about phone during SIM swap" 2020-08-19 14:47:21 +00:00
Bill Yi
69605d12d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87be371a25573e769edbb80ed0817e02efb69cd5
 2020-08-19 07:19:41 +00:00
Bill Yi
7f9d903a21 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e397185b6e1a9d39e8af8d83c9f0c766ff09349
 2020-08-18 21:53:23 -07:00
hoffc
291fd9b816 Settings: Fix exception in about phone during SIM swap 
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.

Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.

Bug: 159410236

Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
 2020-08-18 13:57:55 +08:00
TreeHugger Robot
60e33309b2 Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp 2020-08-17 20:11:11 +00:00
Peiyong Lin
9511d443cb Rename game driver to updatable driver. 
Game driver is considered a production name. We should use the term
updatable driver instead of the production name.

Bug: b/164449016
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: I2237dfb22ecd94bc2475249b1460796ac1693d81
 2020-08-14 16:29:03 -07:00
Bonian Chen
45cc4bbe61 Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 am: af57413abc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I1e5921c9a4cc5b223d0ee61eae2cac7afaa19e2a
 2020-08-14 08:20:48 +00:00
Bonian Chen
af57413abc Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I5617a1d70e38aa39ec37ace07bce0d5fda699729
 2020-08-14 08:05:12 +00:00
Bonian Chen
33e4971820 Merge "[Settings] Grant permissions to submit junit test" 2020-08-14 07:45:50 +00:00
Bonian Chen
1c97e70641 [Settings] Grant permissions to submit junit test 
Grant permissions for adding new Junit test case.

Change-Id: Iabde2307669815fd50cdba241492c82b9e2cf64d
 2020-08-13 18:49:31 +08:00