Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b98c17a7 authored by Valentin Kravtsov's avatar Valentin Kravtsov Committed by Android Git Automerger
Browse files

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

Merge commit 'f9d0f3a8' into froyo-plus-aosp

* commit 'f9d0f3a8':
  Fix for: For Voice IME busy circle displayed below waveform
parents 97f4b4ad f9d0f3a8

java/res/layout/recognition_status.xml

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ 
    <ProgressBar android:id="@+id/progress"

        android:layout_height="60dip"

        android:layout_width="60dip"

        android:layout_marginTop="20dip"

        android:layout_gravity="center_horizontal"

        android:layout_gravity="center"

        android:visibility="gone"

        android:indeterminate="true"

        android:indeterminateOnly="false"

java/src/com/android/inputmethod/voice/RecognitionView.java

+3 −4
Original line number Diff line number Diff line
@@ -274,12 +274,11 @@ public class RecognitionView { 


        final int count = (endIndex - startIndex) / numSamplePerWave;

        final float deltaX = 1.0f * w / count;

        int yMax = h / 2 - 10;

        int yMax = h / 2 - 8;

        Path path = new Path();

        c.translate(0, yMax);

        float x = 0;

        path.moveTo(x, 0);

        yMax -= 10;

        for (int i = 0; i < count; i++) {

            final int avabs = getAverageAbs(waveBuffer, startIndex, i , numSamplePerWave);

            int sign = ( (i & 01) == 0) ? -1 : 1;
@@ -297,8 +296,8 @@ public class RecognitionView { 
        mImage.setImageBitmap(b);

        mImage.setVisibility(View.VISIBLE);

        MarginLayoutParams mProgressParams = (MarginLayoutParams)mProgress.getLayoutParams();

        mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,

                -h / 2 - 18, mContext.getResources().getDisplayMetrics());

        mProgressParams.topMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX,

                -h , mContext.getResources().getDisplayMetrics());



        // Tweak the padding manually to fill out the whole view horizontally.

        // TODO: Do this in the xml layout instead.