Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,699 Commits 1 Branch 0 Tags
97e9b51191ceb03ce9a36d410347f1ed90122deb
Commit Graph

30505 Commits

Author SHA1 Message Date
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
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
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
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
8cab6d80f9 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 am: 9bc76d1b50 
Change-Id: I7c442aa3e7976fa0c8647108e14e02006286f0b8
 2020-03-10 12:43:31 +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
70ce4b94b8 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 am: fa923a5e37 am: 0f2e2a664c 
Change-Id: Ia1f4e16be17426e968503011d0a52ad8ff5aeab6
 2020-03-10 09:14:34 +00:00
Automerger Merge Worker
07294f8c42 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0 am: 0ed90e5f4c am: b9289da489 
Change-Id: I6f170f8240293e906ea3ed44c8f318fd87541f92
 2020-03-10 09:12:52 +00:00
Automerger Merge Worker
fa923a5e37 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596 
Change-Id: I7b3e83bd105dcede447fde3037f4b4737a5cbde1
 2020-03-10 08:39:49 +00:00
Automerger Merge Worker
00e3d66465 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc am: e1d122c3a0 am: 8c1731910a 
Change-Id: Idbbff6f0a6ca03c43bca3e2f9864ccd1029d606e
 2020-03-10 08:30:53 +00:00
Automerger Merge Worker
48d161b7b0 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 
Change-Id: Ic0758e620662f68ee614e4478e26bad1468b0c70
 2020-03-10 08:25:59 +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
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
e1d122c3a0 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: 84098ef1fc 
Change-Id: I64748c07ef3dbd2cdaa81169e781fca20ee08112
 2020-03-10 08:04:12 +00:00
Automerger Merge Worker
fd12e2e677 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e 
Change-Id: I21d36da4f3826bc1168d607945d9e45dbba8d0a2
 2020-03-10 07:44:09 +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
2941fc91f1 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e am: 0fe624b107 am: c017a5182b 
Change-Id: Ic4fa192f20b2e91a317a9fd2876de2dddc99bc21
 2020-03-10 06:22:08 +00:00
Automerger Merge Worker
0fe624b107 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: b0ef375e6e 
Change-Id: I01de77a3f6fc90267c87f1ec2eea3df20326a5af
 2020-03-10 05:46:09 +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
bb70a39c68 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc 
Change-Id: Ibe04ae804fe19a7767ac28d1b509e81475b0d2fc
 2020-03-10 05:29:59 +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
03a454ade9 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 am: 06982417ce am: 23d71554e5 
Change-Id: I703002438e51a00acfd1a7f384fb7dd6d6d7262e
 2020-03-10 04:19:16 +00:00
Automerger Merge Worker
06982417ce Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: 84fb219cb0 
Change-Id: I386afb206d77142fc93ba0454d5f09df05f5aaab
 2020-03-10 03:39:13 +00:00
Automerger Merge Worker
a6b501c926 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd 
Change-Id: I54caf734aa1e1e43ac5d85c5bdcc736cbcc75aff
 2020-03-10 03:21:11 +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
b8acf2ffd2 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 am: c4f441876b am: 3736b16cfe 
Change-Id: I3933d922e73adef57f090868ec0d165fe0610ecf
 2020-03-10 01:42:22 +00:00
Automerger Merge Worker
c4f441876b Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 7d797c2915 
Change-Id: I6ba1fcb55c5e3da3f450aa26dd7e5f6dcbf6e7ee
 2020-03-10 01:05:39 +00:00
Automerger Merge Worker
8e3a79813d Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 
Change-Id: Idb4dfadbac5a73cf606e56bb4b310b6d7399464c
 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
ebd8d4e2db Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe am: ec2dfee42f am: d1b338cc23 
Change-Id: I1abe1f80a73ac6265bf7cf32be3713f149e1170c
 2020-03-09 23:53:13 +00:00
Automerger Merge Worker
ec2dfee42f Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 950169adbe 
Change-Id: I7152ebee368a8ddef5d66e265f8a3540de1ce64f
 2020-03-09 23:08:50 +00:00
Automerger Merge Worker
5c1a4dcde4 Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d 
Change-Id: I46f226138e77636453500520a9cd1946469d7352
 2020-03-09 22:51:16 +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
Automerger Merge Worker
853aabed66 Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de am: 9b416d0092 am: f200a5d67f 
Change-Id: I97594fd216728e96da3b244b765ff80ab28a6180
 2020-03-09 20:51:28 +00:00
Automerger Merge Worker
9b416d0092 Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe am: 976cf076de 
Change-Id: I69c77b10cc02383d96ca7138a4903727cd099cb1
 2020-03-09 20:14:45 +00:00
Automerger Merge Worker
72d0b2773b Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe 
Change-Id: Ia1696bcb7e420ae4d1da0b604ce0ac53352d3b12
 2020-03-09 20:08:32 +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
f0cf92793f Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b am: 0dfda78ac6 am: 2cce9a709a am: a443bb9435 
Change-Id: Id8a380d0d7d28cb8f185632c4acb0fbb842b471a
 2020-03-09 14:32:49 +00:00
Automerger Merge Worker
0dfda78ac6 Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b 
Change-Id: If69ac9654ef855b253970c036e9d0b7eb5a7c18e
 2020-03-09 13:54:53 +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
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
ac4b782ee2 Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055 am: 5e1159a21b am: cd764217aa am: 93210cd5bc 
Change-Id: I3a1d6bbfb896eda01a4fd4e4113c64abf4e853d2
 2020-03-09 13:26:34 +00:00
Automerger Merge Worker
cd764217aa Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055 am: 5e1159a21b 
Change-Id: If60573a1b98cd52c3289a3f9db4e42d74d64d162
 2020-03-09 12:49:01 +00:00