Merge branch 'master' into kotlin

This commit is contained in:
Hemanth S 2018-11-28 13:26:22 +05:30 committed by GitHub
commit 08f9539d3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 2537 additions and 8870 deletions

View file

@ -80,10 +80,10 @@ public abstract class AbsBaseActivity extends AbsThemeActivity {
}
@Override
/* @Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
}
}*/
@Nullable
protected String[] getPermissionsToRequest() {