Merge remote-tracking branch 'origin/temp' into dev

2017-12-15 11:00:08 +08:00
parent 765b4c3afa bf7b0b0a82
commit a022526e7e
128 changed files with 3328 additions and 2705 deletions
--- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
@ -102,7 +102,7 @@ public class SelectUserIconActivity extends BaseActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        initTitle(getString(R.string.title_select_user_icon));
+        setNavigationTitle(getString(R.string.title_select_user_icon));

        sp = PreferenceManager.getDefaultSharedPreferences(this);