aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2013-03-22 19:35:24 +0100
committerJorge Ruesga <jorge@ruesga.com>2013-03-22 19:35:24 +0100
commitb28ac1d8e20b311245e858df443f8d29c4fe00aa (patch)
treea335724b1c4a8b8c511f2c7721a171ab90870be3
parent7af879e2a096cef2c4709d9a50572a4a30077564 (diff)
downloadandroid_packages_apps_CMFileManager-b28ac1d8e20b311245e858df443f8d29c4fe00aa.tar.gz
android_packages_apps_CMFileManager-b28ac1d8e20b311245e858df443f8d29c4fe00aa.tar.bz2
android_packages_apps_CMFileManager-b28ac1d8e20b311245e858df443f8d29c4fe00aa.zip
CMFM: Use holo style progress bar
Change-Id: I877e130cbba31f4f800fcc6c6b9510ae7a947ec6 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--res/layout/editor.xml18
-rw-r--r--res/values/dimen.xml2
-rw-r--r--src/com/cyanogenmod/filemanager/activities/EditorActivity.java6
3 files changed, 16 insertions, 10 deletions
diff --git a/res/layout/editor.xml b/res/layout/editor.xml
index 4e6c2201..9b013d81 100644
--- a/res/layout/editor.xml
+++ b/res/layout/editor.xml
@@ -77,22 +77,24 @@
android:layout_alignParentBottom="true"
android:visibility="gone">
- <ProgressBar
- android:id="@+id/editor_progress_bar"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- style="@android:style/Widget.ProgressBar.Horizontal"
- android:indeterminate="false" />
-
<TextView
android:id="@+id/editor_progress_msg"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
android:textAppearance="@style/primary_text_appearance"
android:text="@string/loading_message"
android:gravity="center_vertical|center_horizontal"
android:contentDescription="@null" />
+ <ProgressBar
+ android:id="@+id/editor_progress_bar"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="@android:style/Widget.ProgressBar.Horizontal"
+ android:layout_above="@id/editor_progress_msg"
+ android:indeterminate="false" />
+
</RelativeLayout>
<View
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 253fbdfc..e38055d3 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -103,7 +103,7 @@
<dimen name="console_height">250dp</dimen>
<!-- The progress height -->
- <dimen name="default_progress_height">32dp</dimen>
+ <dimen name="default_progress_height">48dp</dimen>
<!-- Theme button min width -->
<dimen name="themes_min_width_button">300dp</dimen>
diff --git a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
index 21267bec..a3f09d1f 100644
--- a/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/EditorActivity.java
@@ -26,6 +26,7 @@ import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Configuration;
+import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceActivity;
@@ -976,11 +977,14 @@ public class EditorActivity extends Activity implements TextWatcher {
theme.setTextColor(this, (TextView)v, "text_color"); //$NON-NLS-1$
v = findViewById(R.id.ab_button1);
theme.setImageDrawable(this, (ImageView)v, "ab_save_drawable"); //$NON-NLS-1$
- // -View
+ //- View
v = findViewById(R.id.editor_layout);
theme.setBackgroundDrawable(this, v, "background_drawable"); //$NON-NLS-1$
v = findViewById(R.id.editor);
theme.setTextColor(this, (TextView)v, "text_color"); //$NON-NLS-1$
+ //- ProgressBar
+ Drawable dw = theme.getDrawable(this, "horizontal_progress_bar"); //$NON-NLS-1$
+ this.mProgressBar.setProgressDrawable(dw);
}
}