Automerger Merge Worker
1e019409d1
Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd
am: 84fb219cb0
am: a29182f550
...
Change-Id: I4cd7b51b54d6aa76b1088292c9d806011db63d58
2020-03-10 03:52:17 +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
Nathan Harold
adbc1ac905
Disable 5G Scanning in NetworkScanHelper
...
5G has two operating modes: stand-alone and non-standalone.
The vast majority of support is currently for non-standalone
mode. Because Android currently cannot tell the difference
between the supported modes in the modem, and because a device
that supports non-standalone mode shoudn't scan for 5G during a
PLMN selection procedure (it can't camp on 5G, hence non-
standalone mode), disable 5G scans by default and revisit once
modem support exists to distinguish between the two modes. This
avoids alternatives such as allowing 5G to be silently removed
in the RIL or for a 5G scan to be performed which doesn't provide
the user any meaningful options.
A separate bug has been filed (b/151119451) to revisit this logic
once the modem supports interrogation of its 5G capability.
Bug: 149528140
Test: compilation
Change-Id: I4e19b43e6529b5c673bb54c6f8f94c44a7c5bee5
2020-03-09 19:39:56 -07: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
c18a46e58b
Merge "Corrected the indexing data of Tips and support" into rvc-dev am: 7eada07c97
am: 7d797c2915
am: ef8818e1b6
...
Change-Id: Idd58d4db0e217c696af75fa8cffcb7302442b79c
2020-03-10 01:24:34 +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
33e5c5abdf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: ea0486eef9
-s ours am: 38aa29d60f
-s ours am: 86c7343b49
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I47de09d88fa1dba0166d604610c640f0ec8f89f0
2020-03-10 00:08:56 +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
206800a06e
Merge "[Settings] Use WifiConfiguration#setSecurityParams" into rvc-dev am: ed3fc8626d
am: 950169adbe
am: 57f9809fbd
...
Change-Id: I50e236f45b2e6be803ea60602eea8e565e40853c
2020-03-09 23:34:16 +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
c9827dd27e
Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev am: 613dcd9dfe
am: 976cf076de
am: 9327cd5f4f
...
Change-Id: I607536787d3b44b193002d75edca5882b5c6f890
2020-03-09 20:34:42 +00: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
209ccc1a39
Merge "Update rule to display output switcher Slice" into rvc-dev am: 9607eb334b
am: 9d598078e6
am: 475c904773
...
Change-Id: I50400b79a557292b50733d4be0298dc50ec4cc79
2020-03-09 14:17:46 +00: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
Automerger Merge Worker
12944e9692
Merge "Fix WirelessDebuggingEnablerTest failures." into rvc-dev am: 5d6c309d65
am: b28ffa4fe2
am: cdedbbf2fd
...
Change-Id: I2f91e8a47d1fe3d25dbd2b65b6074a8c2a1c76d9
2020-03-09 13:54:43 +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
d89b81d357
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
am: 5e1159a21b
am: d5d53f6d31
...
Change-Id: I571afd6af1d983cce6f8b9a4aeab0c4ecca6e65a
2020-03-09 13:05:50 +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
Automerger Merge Worker
5e1159a21b
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev am: e547a87055
...
Change-Id: I476fd4bc7d5d2087a3ae42af3fdceea5a653a728
2020-03-09 12:30:11 +00:00
TreeHugger Robot
e547a87055
Merge "Show paired devices on Bluetooth device slice card" into rvc-dev
2020-03-09 12:19:08 +00:00
Yi-Ling Chuang
40e8c1523b
Fix WirelessDebuggingEnablerTest failures.
...
Fixes: 151065069
Test: robotests
Change-Id: I0bd04e95a66113f379ca7328a4cd31df0ce40b54
2020-03-09 18:36:25 +08:00
Automerger Merge Worker
5075d425a3
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
am: 888ebb0dbb
am: 672ac07d29
...
Change-Id: I72362b0cd2932a9f8acc3e924c6041e3210095c2
2020-03-09 09:44:51 +00:00
Jason Chiu
130629b1db
Show paired devices on Bluetooth device slice card
...
- support tapping to activate for all available media devices including
Hearing aid and Headset
- support tapping to connect for previously connected devices
Bug: 149667096
Test: robotest
Change-Id: I25f74b1b20fbb1876200a561775aa675ff60ac37
2020-03-09 17:43:29 +08:00
Automerger Merge Worker
672ac07d29
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
am: 888ebb0dbb
...
Change-Id: I153875309898060c908bc90b6cbb72d9d5f0dda8
2020-03-09 08:29:56 +00:00
Tim Peng
9c2968ab21
Update rule to display output switcher Slice
...
-Display when Cast device is available
-Add test case
Bug: 150907688
Test: make -j42 RunSettingsRoboTests
Change-Id: I1aa2fbe7b77a0274816af47bbc372eae9d7944c9
2020-03-09 16:29:53 +08:00
Automerger Merge Worker
888ebb0dbb
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev am: 42dcad9b2b
...
Change-Id: I2e0c16d8c8e0d593737f52afa97b65a9d474c1d1
2020-03-09 08:20:23 +00:00
Menghan Li
42dcad9b2b
Merge "ShortcutPreference Toggle design (2/n)" into rvc-dev
2020-03-09 08:01:56 +00:00
Automerger Merge Worker
bcb733a27d
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
am: 0ebbf934af
am: 2bed7b4060
...
Change-Id: Id10bf39a188637dbf86438e866fbcb40a870c138
2020-03-09 07:59:50 +00:00
Automerger Merge Worker
2c63143255
Merge "Refresh summary when update state of preference" into rvc-dev am: bde2d44bb1
am: 8d7579e6b1
am: cfdf35b8ba
...
Change-Id: I06e30b654cb5925e7f09ed271fd61004911a2543
2020-03-09 06:27:32 +00:00
Automerger Merge Worker
2bed7b4060
Merge "[Wi-Fi] Remove redundant code" into rvc-dev am: 5a4257deb4
am: 0ebbf934af
...
Change-Id: Iaf92fcfbe1184582d2eb3886cfc59890ad3f383c
2020-03-09 05:39:21 +00:00