Merge branch 'master' into kotlin
This commit is contained in:
commit
08f9539d3f
23 changed files with 2537 additions and 8870 deletions
|
@ -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() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue