PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,853 Commits 1 Branch 0 Tags
dbb18e85e413b8d56c68fc6d9c8f3bc6c8605f8d
Commit Graph

59853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Automerger Merge Worker
0a6442df22 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340 
Change-Id: I5620a3a5c637aa142b3aa04f7b2a881f3e21ca76
 2020-03-10 12:29:00 +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
169c70e586 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: cbc146d3f4 
Change-Id: Ie1bbac5e828f4babf4ea40ca874faa2fd4bdb63d
 2020-03-10 08:40:07 +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
d702b2a8b6 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: f77dab373b 
Change-Id: I51c7b230702e07cb4b0e540ec0a5cd2bad2acd5a
 2020-03-10 08:39:35 +00:00
Automerger Merge Worker
0ed90e5f4c Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4 am: 48d161b7b0 
Change-Id: I914c8c9c5d8f1d47777d02c8d3923831fdf5e6af
 2020-03-10 08:38:07 +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
Automerger Merge Worker
cbc146d3f4 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 
Change-Id: I8c47d8c3dea5b3f816facdc4775d8653fc0c01d6
 2020-03-10 08:26:07 +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
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
fa77897db0 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e am: fd12e2e677 
Change-Id: Iad6655015c233c588e7fc01e5d9e884cf66b4745
 2020-03-10 08:04:19 +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
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
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
cf2f610479 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc am: bb70a39c68 
Change-Id: I602efb5952bfe0003b8967191dc4a91ae264fbe4
 2020-03-10 05:46:26 +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
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
415f7f024d Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd am: a6b501c926 
Change-Id: I786ef0de1178b9428cd6c1a712521d04ca13a42b
 2020-03-10 03:39:25 +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
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
8e30c80477 Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97 am: 8e3a79813d 
Change-Id: Ic64da459b673439fd1e0ef9936348ef04f0745f5
 2020-03-10 01:06:01 +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
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
c059786aa2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours am: 5dcf6647cd -s ours 
am skip reason: subject contains skip directive

Change-Id: I0df672cc1a14f03bf2c2bc13712b73ce64811055
 2020-03-09 23:53:21 +00:00
Automerger Merge Worker
140fed1e3a [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: I7cd04f6f444f249641f5877746188794847e7ede
 2020-03-09 23:53:09 +00:00
Automerger Merge Worker
5dcf6647cd [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ibb8959ba14f95b65231b0d11f84ebf9185756948
 2020-03-09 23:34:34 +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
2575100329 Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d am: 5c1a4dcde4 
Change-Id: I218525afdea629e1fe7892d5f9947045ac8968fa
 2020-03-09 23:08:59 +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
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
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