Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java
This commit is contained in:
kehaoyuan
2017-05-05 18:25:14 +08:00
parent c96193b3d0 b1035c24bc
commit 64fe9048f0
86 changed files with 2137 additions and 1356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java
View File

@ -29,11 +29,15 @@ public class SelectUserIconActivity extends BaseActivity {
private SharedPreferences sp;
@Override
protected int getLayoutId() {
return R.layout.activity_select_user_icon;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
View contentView = View.inflate(this, R.layout.activity_select_user_icon, null);
init(contentView, "选择头像");
init(getString(R.string.title_select_user_icon));
sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE);