743 lines
28 KiB
Diff
743 lines
28 KiB
Diff
|
diff --git a/PreferencesManager/project.properties b/PreferencesManager/project.properties
|
||
|
index 568922b..c0cbb95 100644
|
||
|
--- a/PreferencesManager/project.properties
|
||
|
+++ b/PreferencesManager/project.properties
|
||
|
@@ -11,7 +11,6 @@
|
||
|
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||
|
|
||
|
# Project target.
|
||
|
-target=android-18
|
||
|
-android.library.reference.1=..\\..\\..\\..\\..\\adt-bundle-windows\\sdk\\extras\\android\\support\\v7\\appcompat
|
||
|
-android.library.reference.3=../../StickyListHeaders-master/library
|
||
|
-android.library.reference.2=../../Roboto
|
||
|
+target=android-18
|
||
|
+android.library.reference.1=../../srclib/Support-v7/v7/appcompat
|
||
|
+android.library.reference.2=../../srclib/StickyListHeaders-tots/library
|
||
|
diff --git a/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml b/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml
|
||
|
index 94caed1..aa61951 100644
|
||
|
--- a/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml
|
||
|
+++ b/PreferencesManager/res/layout-v14/dialog_pref_boolean_add.xml
|
||
|
@@ -16,11 +16,11 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
diff --git a/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml b/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml
|
||
|
index 72c8a71..8dc1965 100644
|
||
|
--- a/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout-v14/dialog_pref_boolean_edit.xml
|
||
|
@@ -16,11 +16,11 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
diff --git a/PreferencesManager/res/layout/activity_app_list.xml b/PreferencesManager/res/layout/activity_app_list.xml
|
||
|
index 8be67bc..927c233 100644
|
||
|
--- a/PreferencesManager/res/layout/activity_app_list.xml
|
||
|
+++ b/PreferencesManager/res/layout/activity_app_list.xml
|
||
|
@@ -46,14 +46,14 @@
|
||
|
android:layout_height="wrap_content"
|
||
|
android:layout_marginBottom="10dp" />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
android:gravity="center"
|
||
|
android:text="@string/loading_apps"
|
||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||
|
android:textColor="@android:color/tertiary_text_light"
|
||
|
- app:typeface="robotoslab_light" />
|
||
|
+ />
|
||
|
</LinearLayout>
|
||
|
|
||
|
<LinearLayout
|
||
|
@@ -71,14 +71,14 @@
|
||
|
android:layout_marginBottom="10dp"
|
||
|
android:src="@drawable/empty_view" />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
android:gravity="center"
|
||
|
android:text="@string/empty_apps"
|
||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||
|
android:textColor="@android:color/tertiary_text_light"
|
||
|
- app:typeface="robotoslab_light" />
|
||
|
+ />
|
||
|
</LinearLayout>
|
||
|
|
||
|
-</RelativeLayout>
|
||
|
\ No newline at end of file
|
||
|
+</RelativeLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/activity_file_editor.xml b/PreferencesManager/res/layout/activity_file_editor.xml
|
||
|
index 80fd815..a6b4d13 100644
|
||
|
--- a/PreferencesManager/res/layout/activity_file_editor.xml
|
||
|
+++ b/PreferencesManager/res/layout/activity_file_editor.xml
|
||
|
@@ -19,7 +19,7 @@
|
||
|
android:layout_width="match_parent"
|
||
|
android:layout_height="match_parent" >
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/editText"
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="match_parent"
|
||
|
@@ -31,6 +31,6 @@
|
||
|
android:background="@null"
|
||
|
android:gravity="center_vertical"
|
||
|
android:inputType="textMultiLine|textNoSuggestions|none"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
|
||
|
-</RelativeLayout>
|
||
|
\ No newline at end of file
|
||
|
+</RelativeLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/activity_preferences.xml b/PreferencesManager/res/layout/activity_preferences.xml
|
||
|
index 6d47634..e433ac3 100644
|
||
|
--- a/PreferencesManager/res/layout/activity_preferences.xml
|
||
|
+++ b/PreferencesManager/res/layout/activity_preferences.xml
|
||
|
@@ -56,14 +56,14 @@
|
||
|
android:layout_marginBottom="10dp"
|
||
|
android:src="@drawable/empty_view" />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
android:gravity="center"
|
||
|
android:text="@string/empty_preference_application"
|
||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||
|
android:textColor="@android:color/tertiary_text_light"
|
||
|
- app:typeface="robotoslab_light" />
|
||
|
+ />
|
||
|
</LinearLayout>
|
||
|
|
||
|
<LinearLayout
|
||
|
@@ -82,14 +82,14 @@
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content" />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
android:gravity="center"
|
||
|
android:text="@string/loading_preference_application"
|
||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||
|
android:textColor="@android:color/tertiary_text_light"
|
||
|
- app:typeface="robotoslab_light" />
|
||
|
+ />
|
||
|
</LinearLayout>
|
||
|
|
||
|
-</RelativeLayout>
|
||
|
\ No newline at end of file
|
||
|
+</RelativeLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_about.xml b/PreferencesManager/res/layout/dialog_about.xml
|
||
|
index 7caf943..b0adb1b 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_about.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_about.xml
|
||
|
@@ -21,7 +21,7 @@
|
||
|
android:orientation="vertical"
|
||
|
android:showDividers="middle" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/app_name_and_version"
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -33,14 +33,14 @@
|
||
|
android:drawablePadding="8dp"
|
||
|
android:gravity="center_vertical"
|
||
|
android:textSize="24sp"
|
||
|
- app:typeface="robotoslab_bold" />
|
||
|
+ />
|
||
|
|
||
|
<ScrollView
|
||
|
android:layout_width="match_parent"
|
||
|
android:layout_height="0dp"
|
||
|
android:layout_weight="1" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/about_body"
|
||
|
android:layout_width="match_parent"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -48,7 +48,7 @@
|
||
|
android:padding="16dp"
|
||
|
android:textIsSelectable="true"
|
||
|
android:textSize="16sp"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
</ScrollView>
|
||
|
|
||
|
-</LinearLayout>
|
||
|
\ No newline at end of file
|
||
|
+</LinearLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_boolean_add.xml b/PreferencesManager/res/layout/dialog_pref_boolean_add.xml
|
||
|
index 02497be..a6e127b 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_boolean_add.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_boolean_add.xml
|
||
|
@@ -16,11 +16,11 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml b/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml
|
||
|
index 3d863c9..11eeece 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_boolean_edit.xml
|
||
|
@@ -16,11 +16,11 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml b/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml
|
||
|
index 9a7a066..eb624b2 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_btn_bar_add.xml
|
||
|
@@ -22,12 +22,12 @@
|
||
|
android:layout_height="wrap_content"
|
||
|
android:orientation="horizontal" >
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/btnKO"
|
||
|
style="@style/PreferenceDialogBtn"
|
||
|
android:text="@string/dialog_cancel" />
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/btnOK"
|
||
|
style="@style/PreferenceDialogBtn"
|
||
|
android:text="@string/dialog_add" />
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml b/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml
|
||
|
index 935b6fb..47a9bf7 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_btn_bar_edit.xml
|
||
|
@@ -22,17 +22,17 @@
|
||
|
android:layout_height="wrap_content"
|
||
|
android:orientation="horizontal" >
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/btnKO"
|
||
|
style="@style/PreferenceDialogBtn"
|
||
|
android:text="@string/dialog_cancel" />
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/btnSUPPR"
|
||
|
style="@style/PreferenceDialogBtn"
|
||
|
android:text="@string/dialog_suppr" />
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/btnOK"
|
||
|
style="@style/PreferenceDialogBtn"
|
||
|
android:text="@string/dialog_update" />
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_float_add.xml b/PreferencesManager/res/layout/dialog_pref_float_add.xml
|
||
|
index 617f512..4cd2a3f 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_float_add.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_float_add.xml
|
||
|
@@ -16,15 +16,15 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/value"
|
||
|
style="@style/EditTextValue"
|
||
|
android:inputType="numberSigned|numberDecimal" />
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_float_edit.xml b/PreferencesManager/res/layout/dialog_pref_float_edit.xml
|
||
|
index f68eb16..cd5d651 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_float_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_float_edit.xml
|
||
|
@@ -16,15 +16,15 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/value"
|
||
|
style="@style/EditTextValue"
|
||
|
android:inputType="numberSigned|numberDecimal" />
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_integer_add.xml b/PreferencesManager/res/layout/dialog_pref_integer_add.xml
|
||
|
index 290e342..84755b5 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_integer_add.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_integer_add.xml
|
||
|
@@ -16,15 +16,15 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/value"
|
||
|
style="@style/EditTextValue"
|
||
|
android:inputType="numberSigned" />
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_integer_edit.xml b/PreferencesManager/res/layout/dialog_pref_integer_edit.xml
|
||
|
index fad0607..af228d5 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_integer_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_integer_edit.xml
|
||
|
@@ -16,15 +16,15 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/value"
|
||
|
style="@style/EditTextValue"
|
||
|
android:inputType="numberSigned" />
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_string_add.xml b/PreferencesManager/res/layout/dialog_pref_string_add.xml
|
||
|
index 69e1a9f..ed60ad3 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_string_add.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_string_add.xml
|
||
|
@@ -16,15 +16,15 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/value"
|
||
|
style="@style/EditTextValue"
|
||
|
android:ems="10"
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_string_edit.xml b/PreferencesManager/res/layout/dialog_pref_string_edit.xml
|
||
|
index 3e59626..b35f4ea 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_string_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_string_edit.xml
|
||
|
@@ -16,15 +16,15 @@
|
||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/value"
|
||
|
style="@style/EditTextValue"
|
||
|
android:ems="10"
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_stringset_add.xml b/PreferencesManager/res/layout/dialog_pref_stringset_add.xml
|
||
|
index 89bdac1..b3e0077 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_stringset_add.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_stringset_add.xml
|
||
|
@@ -17,11 +17,11 @@
|
||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
@@ -39,7 +39,7 @@
|
||
|
</LinearLayout>
|
||
|
</ScrollView>
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/action_add_stringset_entry"
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -47,8 +47,8 @@
|
||
|
android:paddingLeft="4dp"
|
||
|
android:paddingRight="4dp"
|
||
|
android:text="@string/action_add_stringset_entry"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
|
||
|
<include layout="@layout/dialog_pref_btn_bar_add" />
|
||
|
|
||
|
-</LinearLayout>
|
||
|
\ No newline at end of file
|
||
|
+</LinearLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml b/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml
|
||
|
index e6a350f..7de1f17 100644
|
||
|
--- a/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml
|
||
|
+++ b/PreferencesManager/res/layout/dialog_pref_stringset_edit.xml
|
||
|
@@ -17,11 +17,11 @@
|
||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
|
style="@style/PreferenceDialogContainer" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/title"
|
||
|
style="@style/PreferenceDialogTitle" />
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:id="@+id/key"
|
||
|
style="@style/EditTextKey" />
|
||
|
|
||
|
@@ -39,7 +39,7 @@
|
||
|
</LinearLayout>
|
||
|
</ScrollView>
|
||
|
|
||
|
- <com.roboto.RobotoButton
|
||
|
+ <Button
|
||
|
android:id="@+id/action_add_stringset_entry"
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -47,8 +47,8 @@
|
||
|
android:paddingLeft="4dp"
|
||
|
android:paddingRight="4dp"
|
||
|
android:text="@string/action_add_stringset_entry"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
|
||
|
<include layout="@layout/dialog_pref_btn_bar_edit" />
|
||
|
|
||
|
-</LinearLayout>
|
||
|
\ No newline at end of file
|
||
|
+</LinearLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/fragment_preferences.xml b/PreferencesManager/res/layout/fragment_preferences.xml
|
||
|
index dcad159..55ba48b 100644
|
||
|
--- a/PreferencesManager/res/layout/fragment_preferences.xml
|
||
|
+++ b/PreferencesManager/res/layout/fragment_preferences.xml
|
||
|
@@ -52,7 +52,7 @@
|
||
|
android:layout_marginBottom="10dp"
|
||
|
android:src="@drawable/empty_view" />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/emptyViewText"
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -60,7 +60,7 @@
|
||
|
android:text="@string/empty_preference_file_valid"
|
||
|
android:textAppearance="?android:attr/textAppearanceLarge"
|
||
|
android:textColor="@android:color/tertiary_text_light"
|
||
|
- app:typeface="robotoslab_light" />
|
||
|
+ />
|
||
|
</LinearLayout>
|
||
|
|
||
|
<ProgressBar
|
||
|
@@ -69,4 +69,4 @@
|
||
|
android:layout_height="wrap_content"
|
||
|
android:layout_centerInParent="true" />
|
||
|
|
||
|
-</RelativeLayout>
|
||
|
\ No newline at end of file
|
||
|
+</RelativeLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/row_application.xml b/PreferencesManager/res/layout/row_application.xml
|
||
|
index f22cc6d..a7ac2d3 100644
|
||
|
--- a/PreferencesManager/res/layout/row_application.xml
|
||
|
+++ b/PreferencesManager/res/layout/row_application.xml
|
||
|
@@ -25,7 +25,7 @@
|
||
|
android:layout_height="48dip"
|
||
|
android:padding="4dp" />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/item_text"
|
||
|
android:layout_width="0dip"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -35,6 +35,6 @@
|
||
|
android:lines="1"
|
||
|
android:paddingLeft="8dp"
|
||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
|
||
|
-</LinearLayout>
|
||
|
\ No newline at end of file
|
||
|
+</LinearLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/row_header.xml b/PreferencesManager/res/layout/row_header.xml
|
||
|
index 64a0c64..27769e0 100644
|
||
|
--- a/PreferencesManager/res/layout/row_header.xml
|
||
|
+++ b/PreferencesManager/res/layout/row_header.xml
|
||
|
@@ -13,7 +13,7 @@
|
||
|
See the License for the specific language governing permissions and
|
||
|
limitations under the License.
|
||
|
-->
|
||
|
-<com.roboto.RobotoTextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
|
android:id="@+id/text_header"
|
||
|
android:layout_width="match_parent"
|
||
|
@@ -22,4 +22,4 @@
|
||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||
|
android:textColor="#33b5e5"
|
||
|
android:textStyle="bold"
|
||
|
- app:typeface="robotoslab_bold" />
|
||
|
\ No newline at end of file
|
||
|
+ />
|
||
|
diff --git a/PreferencesManager/res/layout/row_preference.xml b/PreferencesManager/res/layout/row_preference.xml
|
||
|
index 60d0694..c5e34b5 100644
|
||
|
--- a/PreferencesManager/res/layout/row_preference.xml
|
||
|
+++ b/PreferencesManager/res/layout/row_preference.xml
|
||
|
@@ -27,7 +27,7 @@
|
||
|
android:background="@drawable/abc_list_selector_holo_light"
|
||
|
android:orientation="vertical" >
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/item_name"
|
||
|
android:layout_width="match_parent"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -38,9 +38,9 @@
|
||
|
android:ellipsize="end"
|
||
|
android:lines="1"
|
||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
|
||
|
- <com.roboto.RobotoTextView
|
||
|
+ <TextView
|
||
|
android:id="@+id/item_value"
|
||
|
android:layout_width="match_parent"
|
||
|
android:layout_height="wrap_content"
|
||
|
@@ -52,7 +52,7 @@
|
||
|
android:lines="1"
|
||
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||
|
android:textColor="@android:color/tertiary_text_light"
|
||
|
- app:typeface="robotoslab_light" />
|
||
|
+ />
|
||
|
</LinearLayout>
|
||
|
|
||
|
-</LinearLayout>
|
||
|
\ No newline at end of file
|
||
|
+</LinearLayout>
|
||
|
diff --git a/PreferencesManager/res/layout/row_stringset.xml b/PreferencesManager/res/layout/row_stringset.xml
|
||
|
index e89a4c6..45d07de 100644
|
||
|
--- a/PreferencesManager/res/layout/row_stringset.xml
|
||
|
+++ b/PreferencesManager/res/layout/row_stringset.xml
|
||
|
@@ -19,7 +19,7 @@
|
||
|
android:layout_height="wrap_content"
|
||
|
android:orientation="horizontal" >
|
||
|
|
||
|
- <com.roboto.RobotoEditText
|
||
|
+ <EditText
|
||
|
android:layout_width="wrap_content"
|
||
|
android:layout_height="wrap_content"
|
||
|
android:layout_gravity="center_vertical"
|
||
|
@@ -29,7 +29,7 @@
|
||
|
android:ems="10"
|
||
|
android:gravity="left"
|
||
|
android:inputType="textMultiLine"
|
||
|
- app:typeface="robotoslab_regular" />
|
||
|
+ />
|
||
|
|
||
|
<ImageButton
|
||
|
android:layout_width="wrap_content"
|
||
|
@@ -40,4 +40,4 @@
|
||
|
android:scaleType="centerInside"
|
||
|
android:src="@drawable/abc_ic_clear_search_api_holo_light" />
|
||
|
|
||
|
-</LinearLayout>
|
||
|
\ No newline at end of file
|
||
|
+</LinearLayout>
|
||
|
diff --git a/PreferencesManager/res/values/styles.xml b/PreferencesManager/res/values/styles.xml
|
||
|
index 213092c..3a88864 100644
|
||
|
--- a/PreferencesManager/res/values/styles.xml
|
||
|
+++ b/PreferencesManager/res/values/styles.xml
|
||
|
@@ -45,7 +45,6 @@
|
||
|
<item name="android:layout_height">wrap_content</item>
|
||
|
<item name="android:layout_marginTop">10dp</item>
|
||
|
<item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
|
||
|
- <item name="typeface">robotoslab_light</item>
|
||
|
</style>
|
||
|
|
||
|
<style name="PreferenceDialogBtn">
|
||
|
@@ -54,7 +53,6 @@
|
||
|
<item name="android:layout_margin">4dp</item>
|
||
|
<item name="android:layout_weight">1</item>
|
||
|
<item name="android:background">@drawable/btn</item>
|
||
|
- <item name="typeface">robotoslab_regular</item>
|
||
|
</style>
|
||
|
|
||
|
<style name="EditTextKey">
|
||
|
@@ -69,7 +67,6 @@
|
||
|
<item name="android:gravity">center</item>
|
||
|
<item name="android:hint">@string/hint_key</item>
|
||
|
<item name="android:inputType">textNoSuggestions</item>
|
||
|
- <item name="typeface">robotoslab_regular</item>
|
||
|
</style>
|
||
|
|
||
|
<style name="EditTextValue">
|
||
|
@@ -82,7 +79,6 @@
|
||
|
<item name="android:ems">10</item>
|
||
|
<item name="android:gravity">center</item>
|
||
|
<item name="android:hint">@string/hint_value</item>
|
||
|
- <item name="typeface">robotoslab_regular</item>
|
||
|
</style>
|
||
|
|
||
|
-</resources>
|
||
|
\ No newline at end of file
|
||
|
+</resources>
|
||
|
diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java
|
||
|
index 8b9b255..2bc4960 100644
|
||
|
--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java
|
||
|
+++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/AppListActivity.java
|
||
|
@@ -79,7 +79,6 @@ public class AppListActivity extends ActionBarActivity implements OnQueryTextLis
|
||
|
}
|
||
|
}
|
||
|
});
|
||
|
- getActionBar().setTitle(Utils.applyCustomTypeFace(getString(R.string.app_name), this));
|
||
|
if (savedInstanceState == null || Utils.getPreviousApps() == null) {
|
||
|
startTask();
|
||
|
} else {
|
||
|
diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java
|
||
|
index ccc8cf8..714b3cb 100644
|
||
|
--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java
|
||
|
+++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/FileEditorActivity.java
|
||
|
@@ -269,7 +269,6 @@ public class FileEditorActivity extends ActionBarActivity implements TextWatcher
|
||
|
|
||
|
private void updateTitle() {
|
||
|
Spanned str = Html.fromHtml((mHasContentChanged ? "<font color='#33b5e5'><b>●</b></font> " : "") + mName);
|
||
|
- getActionBar().setTitle(Utils.applyCustomTypeFace(str, this));
|
||
|
}
|
||
|
|
||
|
private void clearSpans(Spannable source) {
|
||
|
diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java
|
||
|
index 09f75ea..b422f8a 100644
|
||
|
--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java
|
||
|
+++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/ui/PreferencesActivity.java
|
||
|
@@ -78,8 +78,6 @@ public class PreferencesActivity extends ActionBarActivity implements OnFragment
|
||
|
|
||
|
packageName = b.getString("PACKAGE_NAME");
|
||
|
|
||
|
- getActionBar().setTitle(Utils.applyCustomTypeFace(b.getString("TITLE"), this));
|
||
|
- getActionBar().setSubtitle(Utils.applyCustomTypeFace(packageName, this));
|
||
|
Drawable drawable = Utils.findDrawable(packageName, this);
|
||
|
if (drawable != null) {
|
||
|
getSupportActionBar().setIcon(drawable);
|
||
|
@@ -151,11 +149,7 @@ public class PreferencesActivity extends ActionBarActivity implements OnFragment
|
||
|
public int getCount() {
|
||
|
return files.size();
|
||
|
}
|
||
|
-
|
||
|
- @Override
|
||
|
- public CharSequence getPageTitle(int position) {
|
||
|
- return Utils.applyCustomTypeFace(files.get(position).getName(), PreferencesActivity.this);
|
||
|
- }
|
||
|
+
|
||
|
}
|
||
|
|
||
|
@Override
|
||
|
diff --git a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java
|
||
|
index f37c917..a66e91a 100644
|
||
|
--- a/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java
|
||
|
+++ b/PreferencesManager/src/fr/simon/marquis/preferencesmanager/util/Utils.java
|
||
|
@@ -47,7 +47,6 @@ import android.util.Log;
|
||
|
import android.view.View;
|
||
|
import android.view.inputmethod.InputMethodManager;
|
||
|
|
||
|
-import com.roboto.RobotoTypefaceManager;
|
||
|
import com.spazedog.lib.rootfw.container.FileStat;
|
||
|
|
||
|
import fr.simon.marquis.preferencesmanager.model.AppEntry;
|
||
|
@@ -218,13 +217,6 @@ public class Utils {
|
||
|
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
|
||
|
}
|
||
|
|
||
|
- public static SpannableString applyCustomTypeFace(CharSequence src, Context ctx) {
|
||
|
- SpannableString span = new SpannableString(src);
|
||
|
-
|
||
|
- span.setSpan(new CustomTypefaceSpan("", RobotoTypefaceManager.obtaintTypeface(ctx, RobotoTypefaceManager.ROBOTOSLAB_REGULAR)), 0,
|
||
|
- span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||
|
- return span;
|
||
|
- }
|
||
|
|
||
|
public static Drawable findDrawable(String packageName, Context ctx) {
|
||
|
if (TextUtils.isEmpty(packageName)) {
|