resolve merge conflicts of a5b457b3bf6f to oc-dr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167

diff --cc packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTile.java
Simple merge

diff --cc packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
index d413030,ad98013..b300e4a
--- 1/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
--- 2/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/SignalTileView.java
@@@ -62,8 -62,10 +63,10 @@@ public class SignalTileView extends QSI
      @Override
      protected View createIcon() {
          mIconFrame = new FrameLayout(mContext);
 -        mSignal = new ImageView(mContext);
 +        mSignal = new SlashImageView(mContext);
          mIconFrame.addView(mSignal);
+         mOverlay = new ImageView(mContext);
+         mIconFrame.addView(mOverlay, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
          return mIconFrame;
      }
  

diff --cc packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
index a4aa262,b52414e..e6c3520
--- 1/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
--- 2/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java
@@@ -127,19 -139,8 +139,9 @@@ public class CellularTile extends QSTil
          state.expandedAccessibilityClassName = Switch.class.getName();
          state.value = mDataController.isMobileDataSupported()
                  && mDataController.isMobileDataEnabled();
-         state.state = cb.airplaneModeEnabled || !cb.enabled ? Tile.STATE_UNAVAILABLE
-                 : state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
-         if (state.slash == null) {
-             state.slash = new SlashState();
-         }
-         state.slash.isSlashed = (state.state == Tile.STATE_INACTIVE);
-         if (state.state == Tile.STATE_ACTIVE) {
-             state.icon = ResourceIcon.get(R.drawable.ic_data_on);
-         } else if (state.state == Tile.STATE_INACTIVE) {
-             state.icon = ResourceIcon.get(R.drawable.ic_data_on);
-         } else {
-             state.icon = ResourceIcon.get(R.drawable.ic_data_unavailable);
-         }
++
+         state.icon = new SignalIcon(cb.mobileSignalIconId);
+         state.state = Tile.STATE_ACTIVE;
      }
  
      @Override

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
index 7633767,0a638d8..5ebcde7
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
@@@ -128,13 -113,12 +128,17 @@@ public class SignalDrawable extends Dra
          mIntrinsicSize = context.getResources().getDimensionPixelSize(R.dimen.signal_icon_size);
          mHandler = new Handler();
          setDarkIntensity(0);
 +
 +        mCornerRadius = context.getResources()
 +                .getDimensionPixelSize(R.dimen.stat_sys_mobile_signal_corner_radius);
 +        mCircleOffsetStraight = mCornerRadius / (float) TAN_THETA;
 +        mCircleOffsetDiag = (float) Math.sqrt(Math.pow(mCircleOffsetStraight, 2.f) / 2.f);
      }
  
+     public void setIntrinsicSize(int size) {
+         mIntrinsicSize = size;
+     }
+ 
      @Override
      public int getIntrinsicWidth() {
          return mIntrinsicSize;