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

Commit 4811d62d authored by Jim Miller's avatar Jim Miller
Browse files

Fix 2209086: Updated assets and fixed widget dimension calculation. 

Added hvga assets for new lock screen widget.

Tested:
	LockScreen on wvga and hvga devices.
	InCallScreen on wvga and hvga devices.
parent b602c328

core/java/com/android/internal/widget/SlidingTab.java

+26 −7
Original line number Diff line number Diff line
@@ -309,12 +309,30 @@ public class SlidingTab extends ViewGroup { 
            setState(currentState);

        }



        /**

         * Ensure all the dependent widgets are measured.

         */

        public void measure() {

            tab.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),

                    View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));

            text.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),

                    View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));

        }



        /**

         * Get the measured tab width. Must be called after {@link Slider#measure()}.

         * @return

         */

        public int getTabWidth() {

            return tab.getDrawable().getIntrinsicWidth();

            return tab.getMeasuredWidth();

        }



        /**

         * Get the measured tab width. Must be called after {@link Slider#measure()}.

         * @return

         */

        public int getTabHeight() {

            return tab.getDrawable().getIntrinsicHeight();

            return tab.getMeasuredHeight();

        }

    }
@@ -360,11 +378,12 @@ public class SlidingTab extends ViewGroup { 
            throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions");

        }



        final float density = mDensity;

        final int leftTabWidth = (int) (density * mLeftSlider.getTabWidth() + 0.5f);

        final int rightTabWidth = (int) (density * mRightSlider.getTabWidth() + 0.5f);

        final int leftTabHeight = (int) (density * mLeftSlider.getTabHeight() + 0.5f);

        final int rightTabHeight = (int) (density * mRightSlider.getTabHeight() + 0.5f);

        mLeftSlider.measure();

        mRightSlider.measure();

        final int leftTabWidth = mLeftSlider.getTabWidth();

        final int rightTabWidth = mRightSlider.getTabWidth();

        final int leftTabHeight = mLeftSlider.getTabHeight();

        final int rightTabHeight = mRightSlider.getTabHeight();

        final int width;

        final int height;

        if (isHorizontal()) {

core/res/res/drawable-hdpi/ic_jog_dial_answer.png

0 → 100644
+6.06 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_jog_dial_answer_and_end.png

0 → 100644
+6.48 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_jog_dial_answer_and_hold.png

0 → 100644
+6.76 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_jog_dial_decline.png

0 → 100644
+5.57 KiB
Loading image diff...