am b98c17a7: am f9d0f3a8: Fix for: For Voice IME busy circle displayed below waveform

main
Valentin Kravtsov 2010-04-15 06:36:59 -07:00 committed by Android Git Automerger
commit 17450fd29b
2 changed files with 4 additions and 6 deletions

View File

@ -63,8 +63,7 @@
<ProgressBar android:id="@+id/progress" <ProgressBar android:id="@+id/progress"
android:layout_height="60dip" android:layout_height="60dip"
android:layout_width="60dip" android:layout_width="60dip"
android:layout_marginTop="20dip" android:layout_gravity="center"
android:layout_gravity="center_horizontal"
android:visibility="gone" android:visibility="gone"
android:indeterminate="true" android:indeterminate="true"
android:indeterminateOnly="false" android:indeterminateOnly="false"

View File

@ -274,12 +274,11 @@ public class RecognitionView {
final int count = (endIndex - startIndex) / numSamplePerWave; final int count = (endIndex - startIndex) / numSamplePerWave;
final float deltaX = 1.0f * w / count; final float deltaX = 1.0f * w / count;
int yMax = h / 2 - 10; int yMax = h / 2 - 8;
Path path = new Path(); Path path = new Path();
c.translate(0, yMax); c.translate(0, yMax);
float x = 0; float x = 0;
path.moveTo(x, 0); path.moveTo(x, 0);
yMax -= 10;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
final int avabs = getAverageAbs(waveBuffer, startIndex, i , numSamplePerWave); final int avabs = getAverageAbs(waveBuffer, startIndex, i , numSamplePerWave);
int sign = ( (i & 01) == 0) ? -1 : 1; int sign = ( (i & 01) == 0) ? -1 : 1;
@ -297,8 +296,8 @@ public class RecognitionView {
mImage.setImageBitmap(b); mImage.setImageBitmap(b);
mImage.setVisibility(View.VISIBLE); mImage.setVisibility(View.VISIBLE);
MarginLayoutParams mProgressParams = (MarginLayoutParams)mProgress.getLayoutParams(); MarginLayoutParams mProgressParams = (MarginLayoutParams)mProgress.getLayoutParams();
mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,
-h / 2 - 18, mContext.getResources().getDisplayMetrics()); -h , mContext.getResources().getDisplayMetrics());
// Tweak the padding manually to fill out the whole view horizontally. // Tweak the padding manually to fill out the whole view horizontally.
// TODO: Do this in the xml layout instead. // TODO: Do this in the xml layout instead.