Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,551 Commits 1 Branch 0 Tags
548a47fa63b3a6af0e5e02a88048aef9b3fa68de
Commit Graph

59551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
9bc76d1b50 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 
Change-Id: I5a5b4379c819f83bdc2296e2f0e4d1efb2479987
 2020-03-10 12:28:50 +00:00
TreeHugger Robot
7c2979c340 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev 2020-03-10 12:12:46 +00:00
Automerger Merge Worker
03e6686a61 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 
Change-Id: Iec81a0116b36372b0a99975e02a3f9a1133d4379
 2020-03-10 08:39:51 +00:00
Automerger Merge Worker
4a76ef4d6f Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b 
Change-Id: If11cc848c81c5756e05f945a843cb7b1e29e62de
 2020-03-10 08:37:58 +00:00
Automerger Merge Worker
f6a24c2596 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 
Change-Id: I55dc5ee5c67bbb270278fb7f66a70121e46d21a0
 2020-03-10 08:30:41 +00:00
TreeHugger Robot
e5110e9388 Merge "Change sticky card UI back to homepage card style" into rvc-dev 2020-03-10 08:25:47 +00:00
Automerger Merge Worker
f77dab373b Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 
Change-Id: Ia4190bdf239718b0b4600d1e3196b09be0736441
 2020-03-10 08:25:10 +00:00
tim peng
378ca1dac4 Merge "Add entry point at output switcher to do group operation" into rvc-dev 2020-03-10 08:07:43 +00:00
Automerger Merge Worker
9502c9ccc8 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc 
Change-Id: I86dba93e2ddb81fd3c1fe458a1fe1091dca3969c
 2020-03-10 08:03:59 +00:00
Automerger Merge Worker
84098ef1fc Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e 
Change-Id: Ic9c4c42f792b6eae86939cf66fa7385cb1915091
 2020-03-10 07:44:06 +00:00
TreeHugger Robot
b65866968e Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev 2020-03-10 07:24:52 +00:00
Tim Peng
1a5b896dc2 The text contrast of "disconnected" in Switch media output panel is insufficient. 
-Apply generic color "textColorSecondary"

Bug: 151050490
Test: manual
Change-Id: Id5e967faab6dedb25607f8afb12acbf338211144
 2020-03-10 07:08:24 +00:00
govenliu
6794ce8233 [Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page 
The startActivity API can not launch the help page.
Change to use startActivityForResult to launch.

Bug: 143784389
Test: Add learnMore_launchesHelp_shouldStartActivityForResult unit test to check if startActivityForResult be called.
Change-Id: Ia3ef82f94d4c8feb71131b44be26df74d6259805
 2020-03-10 14:28:34 +08:00
Automerger Merge Worker
292f680b22 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e 
Change-Id: I2be7496886d6947802b89a3ccc01f8f1d9c0a52f
 2020-03-10 05:46:22 +00:00
Tim Peng
b4c4c362c5 Add entry point at output switcher to do group operation 
-Entry point is available only when there are more than 1 connected device
-Add group Slice item when it is available
-Add intent filter in manifest
-Add test case

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: If398b7a31219fd1910503d96fe7593622528c792
 2020-03-10 13:44:09 +08:00
Automerger Merge Worker
b0ef375e6e Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc 
Change-Id: I47f6bd36cba22132097b4926947ee9db3f4a183f
 2020-03-10 05:29:57 +00:00
TreeHugger Robot
e28309b2dc Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev 2020-03-10 05:17:40 +00:00
Automerger Merge Worker
a29182f550 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 
Change-Id: Ie160b8d0c02db0bf72b35995755ddab10b621ef8
 2020-03-10 03:39:12 +00:00
Automerger Merge Worker
84fb219cb0 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd 
Change-Id: I7bf33f1505ca0ec580b557313b72f934b1f484c5
 2020-03-10 03:20:57 +00:00
Jason Chiu
b85cfc812b Change sticky card UI back to homepage card style 
Fixes: 149371123
Test: visual
Change-Id: Ie1c2bc7b806b818000e9a2e88753f9904a3f30f4
 2020-03-10 11:17:28 +08:00
Arc Wang
3fd7e31e3c [Wi-Fi] Fix crash when launch Wi-Fi detail from slice 
Wi-Fi slice does not been applied to WifiTracker2, should not
launch the UI component for WifiTracker2.

Bug: 151065311
Test: manual
      Settings -> disable/enable Wi-Fi -> click the connected Wi-Fi
      See if Wi-Fi detail carshed.
Change-Id: I9cea305db85aab1bb694c21f95b81afd6a35321e
 2020-03-10 11:06:59 +08:00
tim peng
af4d55e7dd Merge "Adjust layout for Slice InputRange" into rvc-dev 2020-03-10 03:04:26 +00:00
Chen Chen
24344d5001 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: I2d1c3896d5d850a81a987aded14e3f0c05558e8c
 2020-03-10 01:56:04 +00:00
Automerger Merge Worker
ef8818e1b6 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 
Change-Id: Ife852ac3a31b4d3170f9d2f3a75a1c2d24ed9454
 2020-03-10 01:06:20 +00:00
Automerger Merge Worker
7d797c2915 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 
Change-Id: Ifc0701181ccbba715f7ac59bee6450398acf76b8
 2020-03-10 00:48:49 +00:00
TreeHugger Robot
7eada07c97 Merge "Corrected the indexing data of Tips and support" into rvc-dev 2020-03-10 00:33:41 +00:00
Automerger Merge Worker
86c7343b49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 38aa29d60f -s ours 
am skip reason: subject contains skip directive

Change-Id: I2b232bed6fdd507d20008983611c2dd79e47944b
 2020-03-09 23:53:20 +00:00
Automerger Merge Worker
38aa29d60f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours 
am skip reason: subject contains skip directive

Change-Id: I6a88f6b6794a33fdb0722dd1bb65d8c5353500b1
 2020-03-09 23:34:17 +00:00
Automerger Merge Worker
57f9809fbd Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe 
Change-Id: Iab0d2a4b0970d09c59abd3ffa59f076833863aa7
 2020-03-09 23:08:59 +00:00
TreeHugger Robot
ea0486eef9 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-09 23:08:03 +00:00
Automerger Merge Worker
950169adbe Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d 
Change-Id: I5540ada2462da22ccfb1d4887e0253618c8e6100
 2020-03-09 22:51:22 +00:00
Hai Shalom
ed3fc8626d Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev 2020-03-09 22:32:49 +00:00
Hai Shalom
5bb13ebefe [Settings] Use WifiConfiguration#setSecurityParams 
Use WifiConfiguration#setSecurityParams instead of manually
initializing security params.

Bug: 150889755
Test: Created new connections and manually connected to open, WPA2,
WPA3, EAP and SUITE-B networks.

Change-Id: I42f4c21a37428ee87be14f6ba09dc54fa327054a
 2020-03-09 22:25:56 +00:00
Bill Yi
71f3db68d3 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I32bc5208c091da730f40937649dfacb4e91b0eed
 2020-03-09 13:47:15 -07:00
Automerger Merge Worker
9327cd5f4f Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de 
Change-Id: I81c180aa3936913cd0b47f28741a47f2f8b7fdb1
 2020-03-09 20:16:15 +00:00
Automerger Merge Worker
976cf076de Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe 
Change-Id: I5ec80028f5e0d6cb98f87f625391a86eb8816510
 2020-03-09 20:01:39 +00:00
Bonian Chen
613dcd9dfe Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev 2020-03-09 17:13:50 +00:00
Yanting Yang
7b7aadaa24 Corrected the indexing data of Tips and support 
Update the screen title from Settings to Tips & support to display
correct breadcrumb in Settings Search.

Bug: 147851992
Test: visual
Change-Id: Id98488cfffdc86de43bf64f7e867e41a9dcc3142
 2020-03-09 23:26:25 +08:00
Automerger Merge Worker
475c904773 Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 9d598078e6 
Change-Id: I21872be84eaa2e22eca981fbe555e51c8bb61182
 2020-03-09 14:09:08 +00:00
Automerger Merge Worker
9d598078e6 Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b 
Change-Id: I354d7527ffef7967634bd90acb01640fb1308be8
 2020-03-09 13:54:52 +00:00
Tim Peng
db7d61d0a2 Adjust layout for Slice InputRange 
-Make title to slider aligned
-Add test cases

Bug: 147462114
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1d076f77eae75e4f861a80873117b6254729fe5
 2020-03-09 21:50:58 +08:00
Automerger Merge Worker
cdedbbf2fd Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 am: b28ffa4fe2 
Change-Id: I8361f2e976701b8486e16eebad431c45c96639e6
 2020-03-09 13:43:23 +00:00
tim peng
9607eb334b Merge "Update rule to display output switcher Slice" into rvc-dev 2020-03-09 13:42:53 +00:00
Automerger Merge Worker
b28ffa4fe2 Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65 
Change-Id: I73e48e5b1bf69469aca1d0d47ba0f32a8129888d
 2020-03-09 13:26:45 +00:00
TreeHugger Robot
5d6c309d65 Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev 2020-03-09 13:09:31 +00:00
Automerger Merge Worker
d5d53f6d31 Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055 am: 5e1159a21b 
Change-Id: Ic973e0f3e17d0e096b15804c6b0854dfdc98bf46
 2020-03-09 12:49:12 +00:00