Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev

Browse Source 
* commit '79934acb40de31a7c4572bdb7a747edcb12bb8e4':
  Fixed a crash when the detail panel got very big
This commit is contained in:
Selim Cinek
2014-10-07 00:28:51 +00:00
committed by Android Git Automerger
parent 1155ed1920 79934acb40
commit 63a6bc2d99
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/res/drawable/qs_background_primary.xml
View File

@@ -13,11 +13,8 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:top="@dimen/notification_material_rounded_rect_radius_negative" >
<solid android:color="@color/system_primary_color" /> <solid android:color="@color/system_primary_color" />
<corners <corners android:radius="@dimen/notification_material_rounded_rect_radius"/>
android:topLeftRadius="0dp"
android:topRightRadius="0dp"
android:bottomLeftRadius="@dimen/notification_material_rounded_rect_radius"
android:bottomRightRadius="@dimen/notification_material_rounded_rect_radius"/>
</shape> </shape>

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -358,6 +358,9 @@
<!-- radius of the corners of the material rounded rect background --> <!-- radius of the corners of the material rounded rect background -->
<dimen name="notification_material_rounded_rect_radius">2dp</dimen> <dimen name="notification_material_rounded_rect_radius">2dp</dimen>
<!-- radius of the corners of the material rounded rect background but negative-->
<dimen name="notification_material_rounded_rect_radius_negative">-2dp</dimen>
<!-- end margin for multi user switch in expanded quick settings --> <!-- end margin for multi user switch in expanded quick settings -->
<dimen name="multi_user_switch_expanded_margin">8dp</dimen> <dimen name="multi_user_switch_expanded_margin">8dp</dimen>

3
packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java
View File

@@ -55,7 +55,6 @@ public class QSDetailClipper {
if (listener != null) { if (listener != null) {
mAnimator.addListener(listener); mAnimator.addListener(listener);
} }
mDetail.setLayerType(View.LAYER_TYPE_HARDWARE, null);
if (in) { if (in) {
mBackground.startTransition((int)(mAnimator.getDuration() * 0.6)); mBackground.startTransition((int)(mAnimator.getDuration() * 0.6));
mAnimator.addListener(mVisibleOnStart); mAnimator.addListener(mVisibleOnStart);
@@ -82,7 +81,6 @@ public class QSDetailClipper {
} }
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
mDetail.setLayerType(View.LAYER_TYPE_NONE, null);
mAnimator = null; mAnimator = null;
} }
}; };
@@ -90,7 +88,6 @@ public class QSDetailClipper {
private final AnimatorListenerAdapter mGoneOnEnd = new AnimatorListenerAdapter() { private final AnimatorListenerAdapter mGoneOnEnd = new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
mDetail.setLayerType(View.LAYER_TYPE_NONE, null);
mDetail.setVisibility(View.GONE); mDetail.setVisibility(View.GONE);
mBackground.resetTransition(); mBackground.resetTransition();
mAnimator = null; mAnimator = null;