Skip to content

Commit 56cbf41

Browse files
authored
Merge branch 'master' into master
2 parents 7103cde + c22582a commit 56cbf41

File tree

7 files changed

+1284
-61
lines changed

7 files changed

+1284
-61
lines changed

app/src/main/res/layout/fragment_custom_color.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
android:layout_width="wrap_content"
143143
android:layout_height="wrap_content"
144144
app:ccp_countryPreference="pl"
145-
app:ccp_defaultLanguage="POLISH"
145+
app:ccp_defaultLanguage="BASQUE"
146146
app:ccpDialog_background="@drawable/gradient"
147147
app:ccpDialog_showFastScroller="false"
148148
app:ccpDialog_searchEditTextTint="@android:color/white"

ccp/src/main/java/com/hbb20/CountryCodePicker.java

+1
Original file line numberDiff line numberDiff line change
@@ -2416,6 +2416,7 @@ protected void onDetachedFromWindow() {
24162416
public enum Language {
24172417
AFRIKAANS("af"),
24182418
ARABIC("ar"),
2419+
BASQUE("eu"),
24192420
BENGALI("bn"),
24202421
CHINESE_SIMPLIFIED("zh", "CN", "Hans"),
24212422
CHINESE_TRADITIONAL("zh", "TW", "Hant"),

0 commit comments

Comments
 (0)