Commit Graph

62065 Commits

Author SHA1 Message Date
Menghan Li
5f938f1a78 Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: 9b306bb73e am: d898d71ba1
Change-Id: Ic27d114313c6aeb57aef5a05e363829dca3fc1ec
2020-03-25 06:14:56 +00:00
Menghan Li
937594aecf Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: cf48a06391 am: d9821fda4c
Change-Id: Icf3e068fb7a0b0aa4507e0df1d1979bccf1a1aae
2020-03-25 06:03:32 +00:00
Menghan Li
ee6b74de12 Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: cc7f9e781f
Change-Id: Ibf78e5342d57b7d55cebf2862cf106bb35a91a9e
2020-03-25 06:03:18 +00:00
Menghan Li
d898d71ba1 Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: 9b306bb73e
Change-Id: Iae596894030282f562db02bc54ef8e93aab3a280
2020-03-25 06:02:54 +00:00
Menghan Li
d9821fda4c Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: cf48a06391
Change-Id: I8f09e68381dc85809b0959558f79ac0123635b9f
2020-03-25 05:49:22 +00:00
Menghan Li
9b306bb73e Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a
Change-Id: I7f645782778726318beaad59cba18d380526d2f3
2020-03-25 05:48:57 +00:00
Menghan Li
cc7f9e781f Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a
Change-Id: I831ad7fedeb62267949f5685839f42f68cc0090d
2020-03-25 05:47:59 +00:00
Menghan Li
cf48a06391 Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be
Change-Id: I39827e0788e207b7d670f77303b964cf6923ce61
2020-03-25 05:36:46 +00:00
Jack Yu
f5b6614485 [automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f -s ours am: e3d56edd8b -s ours am: 73a4b1dbbd -s ours
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2 is in history

Change-Id: I7019b8d391688f96fceebba052ca34367cb981d4
2020-03-25 05:36:32 +00:00
Menghan Li
f84c49f13a Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be
Change-Id: Idc56795f80561051b73cc36cb6c3174b67626815
2020-03-25 05:36:20 +00:00
Menghan Li
f9f732e3be Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev 2020-03-25 05:23:44 +00:00
Jack Yu
73a4b1dbbd [automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f -s ours am: e3d56edd8b -s ours
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2 is in history

Change-Id: I805e66304252ed003d3a7721e9b44692adcf5b6d
2020-03-25 05:15:27 +00:00
Bonian Chen
97a1bf9c61 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: 243d1a61b7 am: c8cb51a422
Change-Id: I8263653c202eb546b9a3650f17de296b46d47c40
2020-03-25 05:14:56 +00:00
SongFerng Wang
2f901a72f7 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: f30fa1c861 am: f90f7cf31b
Change-Id: If740b309c96cfacb4a91da2b2d5771db566de791
2020-03-25 05:14:49 +00:00
Jack Yu
e3d56edd8b [automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f -s ours
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2 is in history

Change-Id: I233cd5c76e77cd31fdcfd10b4a864b472813afdf
2020-03-25 05:00:44 +00:00
Bonian Chen
f8693e511a Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: fdca269a5e am: 082ce97eba
Change-Id: I311499c5d91a6bd89c2ca4cf737708973f0f8d3d
2020-03-25 05:00:31 +00:00
SongFerng Wang
13f59bc23c Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: a2fea961c2 am: f58b07ae72
Change-Id: I2600b0cc513cc2efb10e7f4f7489ea8bab4a866c
2020-03-25 05:00:22 +00:00
Bonian Chen
8f9c9e6402 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: ff7dc60895
Change-Id: Iff72ccacfbead5cdc1bcc297cc15dd529526eff7
2020-03-25 05:00:13 +00:00
Bonian Chen
c8cb51a422 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: 243d1a61b7
Change-Id: I54bd6dbc2c85aaf6f7edac03cde57e9d160f1659
2020-03-25 04:59:46 +00:00
SongFerng Wang
869883bcd8 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: 3d28629f5e
Change-Id: I3dc6fa3c7a6c8fbf0f9a6f87895aa5777a7bb64c
2020-03-25 04:59:41 +00:00
SongFerng Wang
f90f7cf31b Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: f30fa1c861
Change-Id: Id223e18fbe00e4eb1f35c379929620dd30b9abbb
2020-03-25 04:59:37 +00:00
Bonian Chen
082ce97eba Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: fdca269a5e
Change-Id: I5666b526b7113dce4ab004ea34f92df1cc57071d
2020-03-25 04:51:45 +00:00
Bonian Chen
243d1a61b7 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6
Change-Id: Ic5c58238e13d1b235125c34badaccdf7196930f8
2020-03-25 04:51:36 +00:00
SongFerng Wang
f58b07ae72 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: a2fea961c2
Change-Id: I56a1f5911a3e1b31f030a8392e5e41289bbb7744
2020-03-25 04:51:27 +00:00
SongFerng Wang
f30fa1c861 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6
Change-Id: Ia7332d609bd40646005985fd296876d4f44a3c1e
2020-03-25 04:51:26 +00:00
Bonian Chen
ff7dc60895 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6
Change-Id: Ibce5efebb8c0fd20471811f7cd5ce324a5b347c1
2020-03-25 04:51:01 +00:00
SongFerng Wang
3d28629f5e Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6
Change-Id: I2bb4ec5e524099f1d3fccf53e55dcca27d1e0ad6
2020-03-25 04:50:42 +00:00
Jack Yu
d1cd033f6f Merge "Added slot index in area info broadcast" am: 07f1ec2cca
Change-Id: Iaab7b201cd25d3854031d65ce828829108b427c4
2020-03-25 04:42:15 +00:00
Bonian Chen
fdca269a5e Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
Change-Id: I11095d23554c38e431bef78aee0665853367a8dd
2020-03-25 04:42:03 +00:00
Bonian Chen
0f4345cdf6 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
Change-Id: I82b04e8dadd3559c7d12d6bba1df7cd2e968c89b
2020-03-25 04:41:24 +00:00
Bonian Chen
f9bb3b4d05 Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev 2020-03-25 04:35:04 +00:00
SongFerng Wang
a2fea961c2 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
Change-Id: Ic3357eec640d4023714877a555dcc82dec3fe67c
2020-03-25 04:34:36 +00:00
SongFerng Wang
e8604065d6 Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
Change-Id: Icc2051fe3015fbd5913689be03f3a2f4a1baef58
2020-03-25 04:33:50 +00:00
Jack Yu
07f1ec2cca Merge "Added slot index in area info broadcast" 2020-03-25 04:30:21 +00:00
SongFerng Wang
d33b66304c Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev 2020-03-25 04:16:18 +00:00
Jason Chiu
8ba7dd091f Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808 am: 8c0e3d930f am: 336dc70ee8
Change-Id: I0d215cbac5575177f65d5a9c7bcc2f765a7a369b
2020-03-25 03:28:17 +00:00
menghanli
bd09e28a84 Enlarge the touch area of edit shortcut dialog
Bug: 148837311
Test: Manual test
Change-Id: I54ca93ccaa87514bf4d201b95ed855003d1c164c
2020-03-25 11:20:32 +08:00
Jason Chiu
618d63f83c Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808 am: e667999738
Change-Id: I6da03518f0e6d7986ec3a0029f60599eccf63ba3
2020-03-25 03:13:10 +00:00
Jason Chiu
336dc70ee8 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808 am: 8c0e3d930f
Change-Id: I6c085977a466a24260a93b99230ff355f2f7c285
2020-03-25 03:12:12 +00:00
Jason Chiu
11a6cbd998 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: 8c4d31c8c4 am: 6839ead7c6
Change-Id: I86d5423e0a1e00494eb8a81a544b0a8d54098587
2020-03-25 03:11:44 +00:00
Jason Chiu
e667999738 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808
Change-Id: I88cacc0496ced3c175aa5be206a8e06e92a2f166
2020-03-25 02:59:45 +00:00
Jason Chiu
6839ead7c6 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: 8c4d31c8c4
Change-Id: If17eb07bc5080c69e395afe2ba60f5ad3e3dbeab
2020-03-25 02:59:12 +00:00
Jason Chiu
8c0e3d930f Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846 am: dd5ee8b808
Change-Id: I817413b15da63ab99bef8fc5655a3060f28ed09d
2020-03-25 02:59:11 +00:00
Jason Chiu
8c4d31c8c4 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
Change-Id: I08aa3c6b3650480b6c631365a0eae049cc2a073f
2020-03-25 02:43:06 +00:00
Jason Chiu
dd5ee8b808 Merge "Move sticky cards to the bottom" into rvc-dev am: bff181f846
Change-Id: I5d527a528f71fe5077251832d1f44e29be8604af
2020-03-25 02:42:40 +00:00
Jason Chiu
bff181f846 Merge "Move sticky cards to the bottom" into rvc-dev 2020-03-25 02:28:07 +00:00
Jason Chiu
4e6841e7b5 Move sticky cards to the bottom
Sticky cards have higher scores and were on the top of homepage.

Bug: 149274976
Test: visual
Change-Id: I5fc2303ac42fff5bc4d44e355112ea4529253acd
2020-03-25 02:27:43 +00:00
Bonian Chen
806c9d5214 [Settings] Code refactor on MobileNetworkActivity
Apply the behavior of ProxySubscriptionManager into
MobileNetworkActivity.

Bug: 149190278
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I2d4b12dead7a9ea68cc8e335cd37f22226fe295f
2020-03-25 10:19:40 +08:00
TreeHugger Robot
c062fa0111 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7 am: 8606696674 am: 16e1ff4802
Change-Id: Ic73596fbce66ed9c3d148b40dacc33cd7a3b3cd4
2020-03-25 02:04:03 +00:00
Automerger Merge Worker
50675e4f24 Merge "Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7" into rvc-d1-dev-plus-aosp am: 0c443e813e
Change-Id: I162c24f4de1b18fb4eff005015fc5f02920f911e
2020-03-25 01:48:18 +00:00