PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,247 Commits 1 Branch 0 Tags
c7ecc98d5f858b1a51592a9899dc07ad10f3a1cc
Commit Graph

61247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
8849909a58 [automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc -s ours am: bb25e17d43 -s ours am: 1421fce9d9 -s ours 
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32 is in history

Change-Id: I0c3cdbe44bb24ff09c742c3db29a78b914dbc115
 2020-03-10 21:27:53 +00:00
Automerger Merge Worker
1421fce9d9 [automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc -s ours am: bb25e17d43 -s ours 
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32 is in history

Change-Id: Ifdd27a0ebface4aeb4ff72e4129b51236f406ab1
 2020-03-10 21:14:10 +00:00
Automerger Merge Worker
bb25e17d43 [automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc -s ours 
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32 is in history

Change-Id: I6373b613d7555c796ceaed8469e57ddcc4d5fe60
 2020-03-10 21:01:16 +00:00
Automerger Merge Worker
6ee9d72747 [automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d -s ours am: ae0bd4256f -s ours am: f54d333c24 -s ours am: b5fcf3d808 -s ours 
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127 is in history

Change-Id: I695f72ebbfe0b2eea6a725cefab2a39ff7abcd64
 2020-03-10 21:00:39 +00:00
Chen Chen
847b534fdf MetricId: Avoid byte[] and string ambiguity 
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: Iad90e67a2cdde86aabb95585975be56fc33361fe
 2020-03-10 12:49:56 -07:00
Daniel Bright
b5fcf3d808 [automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d -s ours am: ae0bd4256f -s ours 
am: f54d333c24 -s ours
am skip reason: change_id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA1 27c6358127 is in history

Change-Id: I22b3f51df7db0b7a2ad6c914d9d810bddbe6c47a
 2020-03-10 11:20:31 -07:00
Automerger Merge Worker
4e94e83200 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a am: 2cec639f03 am: 9a71912db6 am: 4a86cb889e 
Change-Id: Id9be8e0343f9bbd3a4e8fee0383771fff548becb
 2020-03-10 17:56:19 +00:00
Automerger Merge Worker
a2d863629f Merge "Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 43c4fa35da" into rvc-d1-dev-plus-aosp am: 803e605fd6 am: 1c026bcb55 
Change-Id: Iaf992838431baa09ca678c0ea334ac391fb326da
 2020-03-10 17:55:52 +00:00
Automerger Merge Worker
b4da4c8c9b Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a am: b61ad6c1b4 am: 81d81e0bb4 
Change-Id: Ia1e0a825849993c17818e0cc21fc9ef8ad80c93b
 2020-03-10 17:55:14 +00:00
Automerger Merge Worker
4a86cb889e Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a am: 2cec639f03 am: 9a71912db6 
Change-Id: I66c797f51044b1adb6e2940adcb2021f49cef675
 2020-03-10 17:47:12 +00:00
Automerger Merge Worker
c702fbbccc Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
 2020-03-10 17:47:07 +00:00
Nathan Harold
1c026bcb55 Merge "Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 43c4fa35da" into rvc-d1-dev-plus-aosp 
am: 803e605fd6

Change-Id: I3c65528a9fbc2f5028948c185d43790f122da896
 2020-03-10 10:46:18 -07:00
Automerger Merge Worker
f54d333c24 [automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d -s ours am: ae0bd4256f -s ours 
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127 is in history

Change-Id: If6fd20e1fc1fc4f39764072b87d01997d00bcd16
 2020-03-10 17:42:38 +00:00
Nathan Harold
81d81e0bb4 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a 
am: b61ad6c1b4

Change-Id: Ia958905336a068a7c064abe95e5221ce2345bc75
 2020-03-10 10:38:27 -07:00
Automerger Merge Worker
9a71912db6 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a am: 2cec639f03 
Change-Id: Ibe4f5cd65b531f0b26a38cdef0227b1b482d4987
 2020-03-10 17:31:59 +00:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
ae0bd4256f [automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d -s ours 
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127 is in history

Change-Id: I36220a7c22556640143212703a277955452a0ceb
 2020-03-10 17:20:19 +00:00
Automerger Merge Worker
2cec639f03 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a 
Change-Id: I0d35897985d9ab4506971bb75c5d4b614efedb4c
 2020-03-10 17:19:23 +00:00
Automerger Merge Worker
803e605fd6 Merge "Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 43c4fa35da" into rvc-d1-dev-plus-aosp 2020-03-10 17:19:21 +00:00
Automerger Merge Worker
d7d02ee912 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 43c4fa35da 
Change-Id: I7dba7d4af1b3b8fe5ab12b2dea1a56456fc9f471
 2020-03-10 17:19:17 +00:00
Automerger Merge Worker
b61ad6c1b4 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 am: 17718f979a 
Change-Id: Ifae11bdeae6f9be5cbbfc7caa64c8aab66b1e7ac
 2020-03-10 17:19:14 +00:00
Automerger Merge Worker
66d4405d1d Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
 2020-03-10 16:59:32 +00:00
Automerger Merge Worker
43c4fa35da Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 
Change-Id: I8727fec517436adf608b26fc1372c7c43cfa504a
 2020-03-10 16:58:34 +00:00
Automerger Merge Worker
17718f979a Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11 
Change-Id: I4421beef3f7468b58d3b83c444fcebaf1a758d83
 2020-03-10 16:58:22 +00:00
Nathan Harold
a8bee76d11 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev 2020-03-10 16:35:02 +00:00
Daniel Bright
716c06f700 Merge "Secret code fix - uses public symbol for secret" 2020-03-10 16:31:01 +00:00
Kenny Guy
37295f86bf DO NOT MERGE 
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
 2020-03-10 16:10:29 +00:00
Automerger Merge Worker
cee77ebb7c Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 am: 90d62de46c am: f7180505c2 
Change-Id: I04ae421d39b3ec6e944ed88c532c235ea90cddee
 2020-03-10 16:04:10 +00:00
Automerger Merge Worker
f7180505c2 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 am: 90d62de46c 
Change-Id: I9f0ed28ecc313316dfcf9226b2d8d03f20e9b24d
 2020-03-10 15:58:02 +00:00
Automerger Merge Worker
91472ac405 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp am: 8f2a1abc03 am: 78c551fee7 
Change-Id: I67e199d2e29010fbd33a0c8e261788013f49b380
 2020-03-10 15:57:57 +00:00
Automerger Merge Worker
97e9b51191 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: ce61a52720 am: 3dfbb8fe24 
Change-Id: Ia4d59bb39e8c06cf3039363a455fe7bcc8383fa6
 2020-03-10 15:57:46 +00:00
Automerger Merge Worker
78c551fee7 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp am: 8f2a1abc03 
Change-Id: I5fdd3603b01b30715e4a6e88babd090517ad11e0
 2020-03-10 15:41:21 +00:00
Automerger Merge Worker
90d62de46c Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: 548a47fa63 
Change-Id: I4d1b553a81bce90ca9dea5d93935012378fc45b4
 2020-03-10 15:41:15 +00:00
Automerger Merge Worker
3dfbb8fe24 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 am: ce61a52720 
Change-Id: Id37e1e7ad4a142112a50c2ec3c3139be82ecd4d6
 2020-03-10 15:41:12 +00:00
Automerger Merge Worker
8f2a1abc03 Merge "Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b" into rvc-d1-dev-plus-aosp 2020-03-10 15:16:13 +00:00
Automerger Merge Worker
548a47fa63 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 
Change-Id: I0bae6ab0e8783f46f189ec7eb7bdd8c2e739f1ef
 2020-03-10 15:16:06 +00:00
Automerger Merge Worker
1035d589ea Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 379902636b 
Change-Id: Ia97c8d3286b9ab95fa8e7d5a5de96aaa071c1a6a
 2020-03-10 15:16:06 +00:00
Automerger Merge Worker
ce61a52720 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 am: 2f2d8d5949 
Change-Id: I0ad2bf3fc2c50cd29776a939ea4d907dd4db9c9a
 2020-03-10 15:16:03 +00:00
Automerger Merge Worker
379902636b Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 
Change-Id: If8964911c25b2d5cc8a38e4dd319ceb91ce95fe2
 2020-03-10 15:02:13 +00:00
Automerger Merge Worker
2f2d8d5949 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986 
Change-Id: I4bfd5350cbf0365770f3504206febce23ef2c09f
 2020-03-10 15:02:04 +00:00
TreeHugger Robot
1334a7e986 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev 2020-03-10 14:45:46 +00:00
Automerger Merge Worker
36113fe03c Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 am: b5ee8d3119 am: d20d78ef42 
Change-Id: Id2fd16af0068f2bf496958d0dcb48b711d7a8221
 2020-03-10 13:34:31 +00:00
Automerger Merge Worker
d20d78ef42 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 am: b5ee8d3119 
Change-Id: Id2620f5360b9dc67e5dc4575f9f852a1cea8a230
 2020-03-10 13:27:07 +00:00
Automerger Merge Worker
6a9d3f659e Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 am: dbb18e85e4 am: d28ca51a44 
Change-Id: Ifac8dabae4d17a3585ca15ee35d943c17e01461a
 2020-03-10 13:27:04 +00:00
Automerger Merge Worker
e5a9590eb5 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 am: 5c9b3e86ff 
Change-Id: Idfcc1a72b9c9ddd3216694209226c4104238c26d
 2020-03-10 13:26:54 +00:00
Automerger Merge Worker
d28ca51a44 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 am: dbb18e85e4 
Change-Id: I1593b59c5bb38a923f7127b7828c8de8ae684b5a
 2020-03-10 13:10:14 +00:00
Automerger Merge Worker
5c9b3e86ff Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 8cab6d80f9 
Change-Id: Ib34b506d8394fb60aeac8c9c18a5fa3ecae2fdc6
 2020-03-10 13:10:08 +00:00
Automerger Merge Worker
b5ee8d3119 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 am: 5c874710a3 
Change-Id: I0e5d07cd7c690eef446ff0c49ded2ced37478706
 2020-03-10 13:10:06 +00:00
Automerger Merge Worker
5c874710a3 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 
Change-Id: Id7b516abb8e8f01bdf0eff32359925e8c517cd56
 2020-03-10 12:43:45 +00:00
Automerger Merge Worker
dbb18e85e4 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 0a6442df22 
Change-Id: Iec3c9cfebc740ec2b04ff315fc6e18282ccaa8bd
 2020-03-10 12:43:44 +00:00