PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,298 Commits 1 Branch 0 Tags
9cff47fcce7f043b39a5a8ef94c30f6192df8d8a
Commit Graph

76298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9cff47fcce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours am: a2329d7450 -s ours am: 1db92597d7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3af44ec28ab861a1c6f46996ef2b10d40f045ef6
 2020-09-05 15:59:49 +00:00
Treehugger Robot
f2ad5e2642 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours am: 701ea4dff8 -s ours am: 9e06009c51 -s ours am: 2050052fc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b45cf572d614f16af6219ed35e4d618d83ba466
 2020-09-05 15:59:42 +00:00
Treehugger Robot
1db92597d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours am: a2329d7450 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ae7fa453ca40f688b62c9724a78499d9245efba
 2020-09-05 15:45:20 +00:00
Treehugger Robot
2050052fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours am: 701ea4dff8 -s ours am: 9e06009c51 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I4f9a4a3b1daa382df98a7e59d99137767835c2a2
 2020-09-05 15:28:54 +00:00
Treehugger Robot
9e06009c51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours am: 701ea4dff8 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: I1b8b1e30adb80b033f5491a099e257fc522434ee
 2020-09-05 15:17:00 +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
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
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
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
e3e688c88b Merge "Fix settings crash" am: 0e3c359888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12509127

Change-Id: I452ce6ef8f7355aab715e09d278ece7685aa24d9
 2020-09-03 01:10:08 +00:00
TreeHugger Robot
0e3c359888 Merge "Fix settings crash" 2020-09-03 00:46:02 +00:00
TreeHugger Robot
1345f98e79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours am: 444c856107 -s ours am: 9a474ea6e4 -s ours am: 983b31be76 -s ours am: bf4aa65842 -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: Ieeae003f088f951ac164be8972b0baaed66c6399
 2020-09-02 20:02:55 +00:00
TreeHugger Robot
bf4aa65842 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours am: 444c856107 -s ours am: 9a474ea6e4 -s ours am: 983b31be76 -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: I2f156dc19d650514ad91750a8b773d3b2e6664a1
 2020-09-02 19:21:57 +00:00
TreeHugger Robot
983b31be76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours am: 444c856107 -s ours am: 9a474ea6e4 -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: I61509e10e61424b2ae90d222d64eadf599ef3dc7
 2020-09-02 19:04:07 +00:00
TreeHugger Robot
9a474ea6e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11304fb8a3 -s ours am: 444c856107 -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: I0a69909d3fdef7b4d95d74f1958ef76ae6e5003e
 2020-09-02 18:34:40 +00:00
TreeHugger Robot
a166620ac5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631 -s ours am: bc565bd615 -s ours am: 7d16f97c97 -s ours am: f87d5f6fc4 -s ours am: 727500034b -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: I4429711921f0434062739ed76cd492638e4132be
 2020-09-02 18:06:35 +00:00
TreeHugger Robot
80c41b49bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours am: edb75a2eec -s ours am: 4a3e39cb13 -s ours am: 2461dfd8a0 -s ours am: 5d975703e1 -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: I07eb3a077315d40e41c32782a478f498a855b172
 2020-09-02 18:06:29 +00:00
Anton Hansson
051c4a42c0 [automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4 -s ours am: 633379f309 -s ours am: 0df917748c -s ours am: 607d986e5e -s ours am: ac118415da -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: I889a0fab038c76fc37f18671c86a4094c1e465db
 2020-09-02 18:06:14 +00: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
727500034b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631 -s ours am: bc565bd615 -s ours am: 7d16f97c97 -s ours am: f87d5f6fc4 -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: If0c0376268505283e94aacc2cbdc7876fa885381
 2020-09-02 17:57:39 +00:00
TreeHugger Robot
5d975703e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours am: edb75a2eec -s ours am: 4a3e39cb13 -s ours am: 2461dfd8a0 -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: I9b2422569158b26dc9e20ead51e4a42b466e453a
 2020-09-02 17:57:25 +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
f87d5f6fc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 74ab66f631 -s ours am: bc565bd615 -s ours am: 7d16f97c97 -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: Id4da800bc0c5bd6b012a8b5e7e272918b2f879c7
 2020-09-02 17:50:38 +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
2461dfd8a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 11fd725f1a -s ours am: edb75a2eec -s ours am: 4a3e39cb13 -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: If9082b0f69fb2eed9a93d1ba2b166d8f88614078
 2020-09-02 17:49:20 +00:00
Anton Hansson
ac118415da [automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4 -s ours am: 633379f309 -s ours am: 0df917748c -s ours am: 607d986e5e -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: I0f553a5ea9b4c9c1a76693e0d71d2a3c86d7bbae
 2020-09-02 17:48:41 +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
Anton Hansson
607d986e5e [automerger skipped] Add explicit dep on framework-wifi.impl am: 0e5e0c77d4 -s ours am: 633379f309 -s ours am: 0df917748c -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: Ifbbef7c60d34d86538fb65aad2aed3b2c7b3bdca
 2020-09-02 17:11:38 +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
dd0017845e Merge "Set highest priority as default value to Bluetooth codec" am: 698b4eafa0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12493711

Change-Id: I946f522edf35b958fb29a80076e092d30e950a7a
 2020-09-02 10:46:02 +00:00
TreeHugger Robot
698b4eafa0 Merge "Set highest priority as default value to Bluetooth codec" 2020-09-02 10:14:55 +00:00
Hugh Chen
a6aae425bc Fix settings crash 
- This CL before, "Previously connected device" didn't
  handle dock device. If user have disconnected dock
  device will cause Settings crash.

  This CL add condition to handle dock device to avoid crash.
- Update test case.

Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
 2020-09-02 17:14:30 +08:00
Treehugger Robot
72018c432f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours am: b372e3fbcf -s ours am: 958cb755cf -s ours am: 0b9ba3c3cd -s ours am: 3b83a538df -s ours am: b802230a44 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: If7dbdba07f675a10c3ef602cfbaa92c0699727d2
 2020-09-02 09:11:01 +00:00