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

72684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhen Zhang
b96eb8e150 Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: 07edb930c2 am: f7bfd800ad am: 1397e7db4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: Icad10aae2662f907a1d70a1349060c2cb4ccb3f5
 2020-07-06 19:39:36 +00:00
Zhen Zhang
0b51df70c7 Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a am: 29433c163d am: d3b7566f29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I4bc66c2909e4c18a65cf93bd2c1f34d4675f06cc
 2020-07-06 19:39:09 +00:00
Automerger Merge Worker
496f19f0b3 Merge "Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a am: f2c65caa4c" into rvc-qpr-dev-plus-aosp 2020-07-06 19:28:32 +00:00
Zhen Zhang
3604372c4f Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a am: f2c65caa4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: Id2b7510215e9264b2c2e595a92e92834aa42296e
 2020-07-06 19:28:28 +00:00
Zhen Zhang
1397e7db4e Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: 07edb930c2 am: f7bfd800ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: Idd1fcc6d21a7705db333ea7ccc830c2519bd6725
 2020-07-06 19:28:23 +00:00
Zhen Zhang
d3b7566f29 Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a am: 29433c163d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I51fa6971340d4f91ccf75491def670e41c45277f
 2020-07-06 19:28:06 +00:00
Zhen Zhang
f2c65caa4c Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I20c9dc4af83fdf232db45990617c49d2283ad88f
 2020-07-06 19:17:44 +00:00
Zhen Zhang
f7bfd800ad Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: 07edb930c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: If2a257fe0f8e044eb7a816f1c3e1a183b1d3f5b4
 2020-07-06 19:17:40 +00:00
Zhen Zhang
29433c163d Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 am: c570eb8c9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: If6b249b1a028de832228c146982e4397addac95c
 2020-07-06 19:17:26 +00:00
Zhen Zhang
07edb930c2 Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I375e6de0cfa3c6c0e2cbc0110194352885379e72
 2020-07-06 19:04:54 +00:00
Zhen Zhang
c570eb8c9a Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev am: 05ae65b7b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12052065

Change-Id: I5b0fbdb7f52f6570f273bc4510cd0fdecf2f7a63
 2020-07-06 19:04:48 +00:00
Zhen Zhang
05ae65b7b0 Merge "Fix bug: "Hotspot & Tethering" preference doesn't get updated" into rvc-dev 2020-07-06 18:54:47 +00:00
Beverly
c549280a33 Replace zen setting plurals with MessageFormat 
For better translations. See go/android-i18n-plurals.

Test: manual
Test: make RunSettingsRoboTests7
Fixes: 156651436
Change-Id: Ic82140b81bf49f071291d2824fa45d310de238ae
 2020-07-06 11:25:00 -04:00
TreeHugger Robot
9aa80727c4 Merge "Fix sketchy bubble preference button" into rvc-qpr-dev am: 031b9fe646 am: 0642f08479 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12061236

Change-Id: I9d0fc91fa3623b901855a03eea65a82bdee43751
 2020-07-06 14:09:27 +00:00
TreeHugger Robot
0642f08479 Merge "Fix sketchy bubble preference button" into rvc-qpr-dev am: 031b9fe646 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12061236

Change-Id: Ia0e5c226bab8a632bc8c499ae64df24fff41d8a1
 2020-07-06 13:57:02 +00:00
TreeHugger Robot
031b9fe646 Merge "Fix sketchy bubble preference button" into rvc-qpr-dev 2020-07-06 13:43:52 +00:00
Automerger Merge Worker
dc461e0a0a Merge "Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 7ac5f24a1d" into rvc-qpr-dev-plus-aosp am: c6c70549af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Id2b8fe0315497a8201ad48797f06b762973d1c29
 2020-07-06 03:45:23 +00:00
Jason Chiu
e36a53f891 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 4334b51165 am: 3b04be0299 am: 8220b04f22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I4e44753bd0307e1d6c603e5a14a564ae62174343
 2020-07-06 03:45:14 +00:00
Jason Chiu
f9e51c8063 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 0e23f24b93 am: 0137611923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I6d25914f7760402bebc6fdac57e428e7b35a8fc9
 2020-07-06 03:45:07 +00:00
Automerger Merge Worker
3585819dd4 Merge "Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: be2838c636" into rvc-qpr-dev-plus-aosp am: 696d020daa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I7662c659bd3411f4b11305d9aeeb47130a86ae06
 2020-07-06 03:44:54 +00:00
Stanley Wang
80630990c5 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 1e05cbb580 am: 1a3b276ac6 am: a224467ace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I108b124af840b48bec6f9f5497d7008bf59a01b9
 2020-07-06 03:44:38 +00:00
Stanley Wang
bdb2d38636 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: 561efd1e11 am: e5c7bd0962 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I37ebba90d13e0380fbb8771052407082c47b0b8e
 2020-07-06 03:44:21 +00:00
Automerger Merge Worker
c6c70549af Merge "Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 7ac5f24a1d" into rvc-qpr-dev-plus-aosp 2020-07-06 03:32:19 +00:00
Jason Chiu
08ddd23d85 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 7ac5f24a1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Ibafb75e3b219b6105b75975925b5616487af0bc0
 2020-07-06 03:32:16 +00:00
Jason Chiu
8220b04f22 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 4334b51165 am: 3b04be0299 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I6d338da1163db00893756ac48b0e5f9f938c8866
 2020-07-06 03:32:14 +00:00
Jason Chiu
0137611923 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 am: 0e23f24b93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Ic335d3e840f7b1f8d97046b11fc15dc17914720a
 2020-07-06 03:32:06 +00:00
Automerger Merge Worker
696d020daa Merge "Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: be2838c636" into rvc-qpr-dev-plus-aosp 2020-07-06 03:32:03 +00:00
Stanley Wang
774ecba3ff Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: be2838c636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I06df8f3b3b9f2ceed633a225de0e3a8ababbbbbe
 2020-07-06 03:31:56 +00:00
Stanley Wang
a224467ace Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 1e05cbb580 am: 1a3b276ac6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Ie7694e1b81769719b089e3e14977fe0e22d194b0
 2020-07-06 03:31:54 +00:00
Stanley Wang
e5c7bd0962 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb am: 561efd1e11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Ibc416ff03a63bcb75eecbea722a8c104ad05c3d0
 2020-07-06 03:31:35 +00:00
Jason Chiu
7ac5f24a1d Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Iab3cf8d2f65d676c9b254a8b4f47abc3bd28cfe4
 2020-07-06 03:19:19 +00:00
Jason Chiu
3b04be0299 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 4334b51165 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I934151fb0bf62ff9a4748d5a804666180f3f6cf5
 2020-07-06 03:19:12 +00:00
Jason Chiu
0e23f24b93 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 am: 6417468179 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I3a6e119e5ac02b1149e546f1669dba3ea68f1f3c
 2020-07-06 03:19:03 +00:00
Stanley Wang
be2838c636 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Ie0b0ec0b4d11a2a8853504c47655173d07adc4e9
 2020-07-06 03:19:03 +00:00
Stanley Wang
1a3b276ac6 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 1e05cbb580 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Icdd5ac59524471c051a76d6d9b6b468e0663451d
 2020-07-06 03:18:50 +00:00
Stanley Wang
561efd1e11 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c am: 2af4f657bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I13ea37f868fef7c56613925b863e721a967e41b5
 2020-07-06 03:18:43 +00:00
Jason Chiu
4334b51165 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: Ib2169fa737b0c6344b77860896a6f4fa5b98ef41
 2020-07-06 03:03:56 +00:00
Jason Chiu
6417468179 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev am: 98eedf79d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042287

Change-Id: I591401d5f239885d25ba43b99e962341f90bda1c
 2020-07-06 03:03:50 +00:00
Stanley Wang
1e05cbb580 Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: I1aecef654565cc8520a720a20cc5c3afb1a17378
 2020-07-06 03:03:49 +00:00
Stanley Wang
2af4f657bb Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev am: 6458ea872c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065563

Change-Id: Iac0ec59e405443bc1edcb142f6c0f6f194b8ca30
 2020-07-06 03:03:37 +00:00
Jason Chiu
98eedf79d5 Merge "Fix the exception of accessing an ArrayMap" into rvc-dev 2020-07-06 02:48:31 +00:00
Stanley Wang
6458ea872c Merge "Fix the bug of showing the "Smooth display" item in the search result." into rvc-dev 2020-07-06 02:45:51 +00:00
TreeHugger Robot
835d61173d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours am: 1ae0eb1cf4 -s ours am: 8b64e18a67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1060434e70cae0f5ca79f208c4b9b6dd22c8a653
 2020-07-06 00:48:09 +00:00
Automerger Merge Worker
ba0737529c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 8165edfbe4 -s ours" into rvc-qpr-dev-plus-aosp am: 524769810f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic55421812b439dedb3e5c27bdb74235976132c20
 2020-07-06 00:47:44 +00:00
TreeHugger Robot
e14d69dad6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 6488a3dccd -s ours am: 629a63cd3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3035b9e1fa0592de7927404f38c3c721bbc45530
 2020-07-06 00:47:14 +00:00
TreeHugger Robot
8b64e18a67 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours am: 1ae0eb1cf4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1e0116d81784d18168cd229bb03355c50ba67f3
 2020-07-06 00:37:40 +00:00
Automerger Merge Worker
524769810f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 8165edfbe4 -s ours" into rvc-qpr-dev-plus-aosp 2020-07-06 00:37:19 +00:00
TreeHugger Robot
d015a60c0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 8165edfbe4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0679e97d5c942a6815be682c718d1da62891af6b
 2020-07-06 00:37:13 +00:00
TreeHugger Robot
629a63cd3a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 609664b8c4 -s ours am: 6488a3dccd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie737521e8ae5dca1620641518c58d75efc248139
 2020-07-06 00:37:03 +00:00
TreeHugger Robot
1ae0eb1cf4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours am: 32cca3cb83 -s ours am: 5aca5b752c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I593a13e9af4a9057437b600849fd42ce2681c14c
 2020-07-06 00:25:54 +00:00