aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue with miscalculation in updating container bounds.

Browse Source 
- There was an issue with the previous logic where the test of whether
  the search bounds changed would always be false if valid search bounds
  were given.  This in conjunction with the fact that the padding was
  changed to only take the bounds left/right into account, meant that
  the container bounds would not be updated if the search bar bounds
  shifted via the insets.

Bug: 22918919
Change-Id: Ia810ddc7a56eae4afc0c7cd558fa6dc9e8e7a95b
This commit is contained in:
Winson
2015-08-06 14:42:50 -07:00
parent d1ea63f24a
commit b0ca1a225f
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/launcher3/BaseContainerView.java
View File

@@ -34,10 +34,12 @@ public abstract class BaseContainerView extends LinearLayout implements Insettab
// The bounds of the search bar. Only the left, top, right are used to inset the
// search bar and the height is determined by the measurement of the layout
private Rect mFixedSearchBarBounds = new Rect();
// The bounds of the container
// The computed bounds of the search bar
private Rect mSearchBarBounds = new Rect();
// The computed bounds of the container
protected Rect mContentBounds = new Rect();
// The padding to apply to the container to achieve the bounds
protected Rect mContentPadding = new Rect();
// The computed padding to apply to the container to achieve the container bounds
private Rect mContentPadding = new Rect();
// The inset to apply to the edges and between the search bar and the container
private int mContainerBoundsInset;
private boolean mHasSearchBar;
@@ -90,7 +92,7 @@ public abstract class BaseContainerView extends LinearLayout implements Insettab
*/
protected void updateBackgroundAndPaddings() {
Rect padding;
Rect searchBarBounds = new Rect(mFixedSearchBarBounds);
Rect searchBarBounds = new Rect();
if (!isValidSearchBarBounds(mFixedSearchBarBounds)) {
// Use the default bounds
padding = new Rect(mInsets.left + mContainerBoundsInset,
@@ -110,14 +112,20 @@ public abstract class BaseContainerView extends LinearLayout implements Insettab
(mHasSearchBar ? 0 : (mInsets.top + mContainerBoundsInset)),
getMeasuredWidth() - mFixedSearchBarBounds.right,
mInsets.bottom + mContainerBoundsInset);
// Use the search bounds
searchBarBounds.set(mFixedSearchBarBounds);
}
if (!padding.equals(mContentPadding) || !searchBarBounds.equals(mFixedSearchBarBounds)) {
// If either the computed container padding has changed, or the computed search bar bounds
// has changed, then notify the container
if (!padding.equals(mContentPadding) || !searchBarBounds.equals(mSearchBarBounds)) {
mContentPadding.set(padding);
mContentBounds.set(padding.left, padding.top,
getMeasuredWidth() - padding.right,
getMeasuredHeight() - padding.bottom);
mFixedSearchBarBounds.set(searchBarBounds);
onUpdateBackgroundAndPaddings(mFixedSearchBarBounds, padding);
mSearchBarBounds.set(searchBarBounds);
onUpdateBackgroundAndPaddings(mSearchBarBounds, padding);
}
}