diff options
| author | Roman Romanov <rromanov@65gb.net> | 2016-10-25 15:25:35 +0300 |
|---|---|---|
| committer | Roman Romanov <rromanov@65gb.net> | 2017-04-25 13:37:32 +0300 |
| commit | d620f6e68872d64ce19b0c3ac02751627ed4849a (patch) | |
| tree | 550cbcb05de05efadb69c3012f8aa7347a653caa /android/3rd_party | |
| parent | 668cfd0f21825e175d422f2ea327e08d86dfbdec (diff) | |
[android] up target api to 23 (+4 squashed commits)
Squashed commits:
[1773b27] [android] Review fixes
[9a09696] [android] Dynamic permissions.
[0bdcdd6] [android] dynamic permissions
[5306cfd] [android] up target api to 23
[android] settings refactoring
[strings] added new strings
[strings] generated translations
Diffstat (limited to 'android/3rd_party')
| -rw-r--r-- | android/3rd_party/BottomSheet/src/main/java/com/cocosw/bottomsheet/BottomSheet.java | 4 | ||||
| -rw-r--r-- | android/3rd_party/BottomSheet/src/main/res/values/attrs.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/3rd_party/BottomSheet/src/main/java/com/cocosw/bottomsheet/BottomSheet.java b/android/3rd_party/BottomSheet/src/main/java/com/cocosw/bottomsheet/BottomSheet.java index 4d6e9df115..33eb1f131a 100644 --- a/android/3rd_party/BottomSheet/src/main/java/com/cocosw/bottomsheet/BottomSheet.java +++ b/android/3rd_party/BottomSheet/src/main/java/com/cocosw/bottomsheet/BottomSheet.java @@ -115,7 +115,7 @@ public class BottomSheet extends Dialog implements DialogInterface { super(context, theme); TypedArray a = getContext() - .obtainStyledAttributes(null, R.styleable.BottomSheet, R.attr.bottomSheetStyle, 0); + .obtainStyledAttributes(null, R.styleable.BottomSheet, R.attr.customBottomSheetStyle, 0); try { more = a.getDrawable(R.styleable.BottomSheet_bs_moreDrawable); close = a.getDrawable(R.styleable.BottomSheet_bs_closeDrawable); @@ -625,7 +625,7 @@ public class BottomSheet extends Dialog implements DialogInterface { */ public Builder(@NonNull Activity context) { this(context, R.style.BottomSheet_Dialog); - TypedArray ta = context.getTheme().obtainStyledAttributes(new int[]{R.attr.bottomSheetStyle}); + TypedArray ta = context.getTheme().obtainStyledAttributes(new int[]{R.attr.customBottomSheetStyle }); try { theme = ta.getResourceId(0, R.style.BottomSheet_Dialog); } finally { diff --git a/android/3rd_party/BottomSheet/src/main/res/values/attrs.xml b/android/3rd_party/BottomSheet/src/main/res/values/attrs.xml index efeacc3378..a526689586 100644 --- a/android/3rd_party/BottomSheet/src/main/res/values/attrs.xml +++ b/android/3rd_party/BottomSheet/src/main/res/values/attrs.xml @@ -2,7 +2,7 @@ <resources> <declare-styleable name="BottomSheet"> - <attr name="bottomSheetStyle" format="reference"/> + <attr name="customBottomSheetStyle" format="reference"/> <attr name="bs_dialogBackground" format="color|reference" /> <attr name="bs_listStyle" format="reference"/> <attr name="bs_dividerColor" format="color|reference" /> |