Commit Graph
1044 Commits
Author SHA1 Message Date
Mygod 946c876327 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android into HEAD 2015-11-18 20:31:22 +08:00
Max Lv 5ac7f2b9fb add missing style file 2015-11-18 20:29:54 +08:00
Max Lv 811ad74acb fix #430 2015-11-18 20:29:19 +08:00
Mygod fa4b88dc95 Update dependencies 2015-11-18 20:22:42 +08:00
Max Lv 07b9cfa7f1 refine the traffic stat 2015-11-18 14:53:56 +08:00
Max Lv f0abbb7304 add TrafficMonitor to the main activity 2015-11-18 14:02:29 +08:00
Max Lv 92e72830bb Merge branch 'master' into traffic-stat 2015-11-18 12:40:45 +08:00
Max Lv e50a26f341 fix #388 2015-11-15 18:48:22 +08:00
Max Lv 6fb8db771a fix typo 2015-11-12 13:03:04 +08:00
Max Lv 6749afd263 add TrafficMonitor 2015-11-12 12:10:38 +08:00
Max Lv 4e4e0514d8 update redsocks 2015-11-11 13:39:55 +08:00
Max Lv 37cdf8f9a6 Merge pull request #422 from Mygod/master
Some fixes
2015-11-11 10:47:39 +08:00
Max Lv 24b8a5ab15 refine the pref order 2015-11-11 10:36:38 +08:00
Mygod 6f6cb461ed Fix ParserActivity 2015-11-10 21:02:42 +08:00
Mygod 42c5a01d3e Fix default configuration 2015-11-10 20:25:10 +08:00
Mygod 8045c961ea Fix NAT default value 2015-11-10 19:50:29 +08:00
Mygod 4059b785b0 Switch to another profile while connected 2015-11-10 18:57:29 +08:00
Mygod a14d3ea99c Fix crashing bug 2015-11-10 18:40:18 +08:00
Mygod 49bcfb279e Reduce apk size 2015-11-09 23:15:40 +08:00
Mygod 3efeed1b90 Fix preference enabled on activity recreation 2015-11-09 22:21:27 +08:00
Mygod 108b740c30 Remove delay when scanning QR code 2015-11-09 22:13:38 +08:00
Mygod 63bc4a57f7 Refine layout for AppManager 2015-11-09 20:54:34 +08:00
Mygod b05adbdd43 Remove redundant Global Proxy 2015-11-09 20:32:22 +08:00
Mygod 58c16704a1 No more restarting AppManager after importing 2015-11-09 18:44:12 +08:00
Mygod bf9b3f4fde Hide root summary if rooted 2015-11-09 17:42:02 +08:00
Mygod 5f0b1a50b2 Add NumberPickerPreference 2015-11-09 17:29:10 +08:00
Mygod 8dd1093c6c Merge translation updates 2015-11-09 16:15:58 +08:00
Max Lv 7d581508b8 update strings 2015-11-09 14:05:01 +08:00
Mygod 7c61df584b Fix NatSwitchPreference 2015-11-09 13:54:42 +08:00
Mygod fb6d2df3ac Fix PROXY_PREFS 2015-11-09 13:47:23 +08:00
Mygod fe51b71c54 Update Chinese translations 2015-11-09 13:45:55 +08:00
Mygod a88ec04c99 Fix dependencies 2015-11-09 13:35:30 +08:00
Mygod 6f567879e5 Adjust preference order 2015-11-09 13:33:02 +08:00
Max Lv a7d7293864 refine the UI 2015-11-09 12:54:51 +08:00
Mygod d71c8dce2e This commit seems to be able to speed up AppManager on second launch noticeably.
P.S. Android 6.0, 200+ apps installed.
2015-11-09 09:47:38 +08:00
Mygod d70480a850 Remove ProgressDialog in AppManager 2015-11-09 09:32:00 +08:00
Mygod e6cf38e6ff Bugfix 2015-11-09 09:15:51 +08:00
Mygod cdb9ebe56e Fix menu in AppManager 2015-11-09 09:00:08 +08:00
Mygod f679772d60 Don't show circular progress for FAB when resetting 2015-11-09 08:37:23 +08:00
Mygod fc7c423695 Remove redundant resources 2015-11-09 03:13:31 +08:00
Mygod b0c0058cb0 Replace placeholder icons 2015-11-09 03:03:28 +08:00
Mygod cc6ae04512 Fix adview 2015-11-09 02:54:59 +08:00
Mygod 91fd69f250 Adjust FAB color brightness 2015-11-09 02:50:22 +08:00
Mygod b505ff3705 Move NAT/VPN switch to a more user-friendly place 2015-11-09 02:48:48 +08:00
Mygod 51e155c940 Add more material design (3) 2015-11-09 01:58:36 +08:00
Max Lv e079ef31a9 fix AdView 2015-11-08 23:07:10 +08:00
Max Lv 1f695b9c8e refine the action button style 2015-11-08 21:10:17 +08:00
Max Lv aedb58110a WAR for a data race in fabProgressCircle 2015-11-08 20:12:47 +08:00
Max Lv 54d95eae28 Merge pull request #413 from Mygod/master
Add more material design (2)
2015-11-08 19:13:58 +08:00
Mygod 4906ce8af5 Support switching to NAT/VPN without restarting the app 2015-11-08 18:46:42 +08:00