drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair

Browse Source 
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp

* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
This commit is contained in:
Jim Miller
2010-01-18 23:43:01 -08:00
committed by Android Git Automerger
parent da84d6a1b1 813d2d8678
commit 84928fa93c
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/widget/SlidingTab.java
View File

@ -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
core/res/res/values-land/donottranslate.xml Normal file
View File

@ -0,0 +1,23 @@
<?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
core/res/res/values/donottranslate.xml
View File

@ -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>