PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,874 Commits 1 Branch 0 Tags
cc7f9e781f4cdd43c62c9399d8da8061864c328c
Commit Graph

60874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Automerger Merge Worker
0c443e813e Merge "Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7" into rvc-d1-dev-plus-aosp 2020-03-25 01:36:00 +00:00
TreeHugger Robot
ff195ef339 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: cc07420ed7 
Change-Id: I5048f8459d7d3c3e997fb491f8fe921a31fd87fd
 2020-03-25 01:35:53 +00:00
TreeHugger Robot
2e65c42842 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf am: 395d0fb2b4 
Change-Id: I9961e431f5bc8dbb508a17be463b81df11f1ab68
 2020-03-25 01:35:50 +00:00
TreeHugger Robot
cc07420ed7 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf 
Change-Id: Ib9d44deb3bad3086dc8ea1e7b81cc3027b2236c9
 2020-03-25 01:22:52 +00:00
TreeHugger Robot
395d0fb2b4 Merge "Fix Passpoint network details privacy and ssid" into rvc-dev am: 56fb482acf 
Change-Id: I341c49c78d234cfbf536431b282b234d06069eda
 2020-03-25 01:22:41 +00:00
TreeHugger Robot
56fb482acf Merge "Fix Passpoint network details privacy and ssid" into rvc-dev 2020-03-25 01:04:47 +00:00
Philip P. Moltmann
e59daf3ef3 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 
Change-Id: Id581c03843fdad4d3c083ffa59cd4b7e5e732582
 2020-03-25 00:08:36 +00:00
Philip P. Moltmann
6f8310ec88 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166 
Change-Id: I53cef5fcbde7e24b00f94831350357050ce01103
 2020-03-25 00:08:20 +00:00
Automerger Merge Worker
4ee8a227a1 Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp 2020-03-25 00:08:10 +00:00
TreeHugger Robot
a3848257dd Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 
Change-Id: I641d1a2119f6e4748515774d57d0a2f1cfa01be5
 2020-03-25 00:07:59 +00:00
TreeHugger Robot
adce5a2ec1 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d 
Change-Id: I2478aacd60522ad19983c023d37965bc2cb71116
 2020-03-25 00:07:58 +00:00
Philip P. Moltmann
64d9d6eb15 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e 
Change-Id: I978b101a36a251d9428dd2d17711d30511c6f2b9
 2020-03-25 00:01:04 +00:00
Philip P. Moltmann
74be567166 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e 
Change-Id: I1c30cfefbcdaa08e715b17b262e42a9c7448b3b8
 2020-03-25 00:01:04 +00:00
Philip P. Moltmann
7443e3de6e Merge "Send attributionTag to notification APIs" into rvc-dev 2020-03-24 23:53:51 +00:00
TreeHugger Robot
558095e583 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 
Change-Id: I4a4e9d0ef55b07cee0207e73dba1b577d8aa1bc9
 2020-03-24 23:48:40 +00:00
TreeHugger Robot
d169749e7d Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 
Change-Id: I2fb1ee5ab5f737660676b27062b89329e9cedf81
 2020-03-24 23:47:44 +00:00
TreeHugger Robot
d227755be8 Merge "[Settings] Avoid from Settings crash" into rvc-dev 2020-03-24 23:32:34 +00:00
Julia Reynolds
2c0fbbde8c Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f 
Change-Id: Id63a9f0dae4739a0464e00881e1fd4cea9c1ebb6
 2020-03-24 21:59:41 +00:00
Bonian Chen
dcf701efc3 [Settings] Avoid from Settings crash 
Avoid from crash when null pointer.

Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
 2020-03-25 05:48:37 +08:00
Julia Reynolds
cff74feef2 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 
Change-Id: I94ef7a1ea9ab9742f2dadd5c057a82e866cb8f10
 2020-03-24 21:43:34 +00:00
Julia Reynolds
6104923f21 Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053 
Change-Id: If414a68d3c1f058d2e208534c74906bad47556e2
 2020-03-24 21:43:15 +00:00
Julia Reynolds
941d437df6 Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd 
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
 2020-03-24 21:42:44 +00:00
Julia Reynolds
b5d726003f Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd 
Change-Id: Icf2ce73480b62fb1853e0798b890cfbcbccc0191
 2020-03-24 21:42:03 +00:00
Julia Reynolds
79fd5811cd Merge "Update all conversations screen" into rvc-dev 2020-03-24 21:33:53 +00:00
Julia Reynolds
7cad4c67df Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 
Change-Id: Iddede304e44b2526287d15a56acda47420855532
 2020-03-24 21:25:51 +00:00