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

Commit 813d2d86 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while...

Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
parents 908a8111 2cd1e6ed
Loading
Loading
Loading
Loading
+2 −16
Original line number Diff line number Diff line
@@ -148,20 +148,6 @@ public class SlidingTab extends ViewGroup {
        void onGrabbedStateChange(View v, int grabbedState);
    }

    // TODO: For debugging; remove after glitches debugged.
    @Override
    protected void dispatchDraw(Canvas canvas) {
        int orientation = getResources().getConfiguration().orientation;
        if (mOrientation == HORIZONTAL && orientation != Configuration.ORIENTATION_PORTRAIT
                || mOrientation == VERTICAL && orientation != Configuration.ORIENTATION_LANDSCAPE) {
            // UBER HACK ALERT.  This is a workaround for a configuration race condition between
            // orientation changed notification and the resize notification. This just prevents
            // us from drawing under this circumstance, though the view will still be wrong.
            return;
        }
        super.dispatchDraw(canvas);
    }

    /**
     * Simple container class for all things pertinent to a slider.
     * A slider consists of 3 Views:
+23 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/strings.xml
**
** Copyright 2009, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- @hide DO NOT TRANSLATE. Workaround for resource race condition in lockscreen -->
    <bool name="lockscreen_isPortrait">false</bool>
</resources>
+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <!-- Default text encoding for WebSettings. -->
    <string name="default_text_encoding">Latin-1</string>
    <!-- @hide DO NOT TRANSLATE. Workaround for resource race condition in lockscreen. -->
    <bool name="lockscreen_isPortrait">true</bool>
</resources>