Merge "Fix stretched nav bar menu icon" into oc-dev
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index b4e6bd5..e89dc0b 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -808,11 +808,6 @@
public final void scheduleReceiver(Intent intent, ActivityInfo info,
CompatibilityInfo compatInfo, int resultCode, String data, Bundle extras,
boolean sync, int sendingUser, int processState) {
- // TODO: Debugging added for bug:36406078 . Remove when done
- if (Log.isLoggable("36406078", Log.DEBUG)) {
- Log.d(TAG, "scheduleReceiver");
- }
-
updateProcessState(processState, false);
ReceiverData r = new ReceiverData(intent, resultCode, data, extras,
sync, false, mAppThread.asBinder(), sendingUser);
@@ -899,11 +894,6 @@
CompatibilityInfo compatInfo, Map services, Bundle coreSettings,
String buildSerial) {
- // TODO: Debugging added for bug:36406078 . Remove when done
- if (Log.isLoggable("36406078", Log.DEBUG)) {
- Log.d(TAG, "bindApplication: " + processName);
- }
-
if (services != null) {
// Setup the service cache in the ServiceManager
ServiceManager.initServiceCache(services);
@@ -3239,10 +3229,6 @@
if (receiver.getPendingResult() != null) {
data.finish();
}
- // TODO: Debugging added for bug:36406078 . Remove when done
- if (Log.isLoggable("36406078", Log.DEBUG)) {
- Log.d(TAG, "handleReceiver done");
- }
}
// Instantiate a BackupAgent and tell it that it's alive
@@ -5778,10 +5764,6 @@
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
- // TODO: Debugging added for bug:36406078 . Remove when done
- if (Log.isLoggable("36406078", Log.DEBUG)) {
- Log.d(TAG, "handleBindApplication done");
- }
}
/*package*/ final void finishInstrumentation(int resultCode, Bundle results) {
diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml
index 25d5226..1c087b3 100644
--- a/packages/SystemUI/res/layout/qs_detail.xml
+++ b/packages/SystemUI/res/layout/qs_detail.xml
@@ -43,6 +43,8 @@
android:alpha="0"
android:background="@color/qs_detail_progress_track"
android:src="@drawable/indeterminate_anim"
+ android:scaleType="fitXY"
+ android:translationY="16dp"
/>
<com.android.systemui.qs.NonInterceptingScrollView
@@ -57,6 +59,6 @@
android:layout_height="match_parent"/>
</com.android.systemui.qs.NonInterceptingScrollView>
- <include layout="@layout/qs_detail_buttons"/>
+ <include layout="@layout/qs_detail_buttons" />
</com.android.systemui.qs.QSDetail>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
index a30b03b..6b50764 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java
@@ -230,12 +230,8 @@
firstPageBuilder.addFloat(brightness, "translationY", heightDiff, 0);
mBrightnessAnimator = new TouchAnimator.Builder()
.addFloat(brightness, "alpha", 0, 1)
- .addFloat(mQsPanel.getPageIndicator(), "alpha", 0, 1)
- .addFloat(mQsPanel.getDivider(), "alpha", 0, 1)
.setStartDelay(.5f)
.build();
- mAllViews.add(mQsPanel.getPageIndicator());
- mAllViews.add(mQsPanel.getDivider());
mAllViews.add(brightness);
} else {
mBrightnessAnimator = null;
@@ -247,7 +243,11 @@
mFirstPageDelayedAnimator = new TouchAnimator.Builder()
.setStartDelay(EXPANDED_TILE_DELAY)
.addFloat(tileLayout, "alpha", 0, 1)
+ .addFloat(mQsPanel.getPageIndicator(), "alpha", 0, 1)
+ .addFloat(mQsPanel.getDivider(), "alpha", 0, 1)
.addFloat(mQsPanel.getFooter().getView(), "alpha", 0, 1).build();
+ mAllViews.add(mQsPanel.getPageIndicator());
+ mAllViews.add(mQsPanel.getDivider());
mAllViews.add(mQsPanel.getFooter().getView());
float px = 0;
float py = 1;
@@ -264,6 +264,8 @@
}
mNonfirstPageAnimator = new TouchAnimator.Builder()
.addFloat(mQuickQsPanel, "alpha", 1, 0)
+ .addFloat(mQsPanel.getPageIndicator(), "alpha", 0, 1)
+ .addFloat(mQsPanel.getDivider(), "alpha", 0, 1)
.setListener(mNonFirstPageListener)
.setEndDelay(.5f)
.build();
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
index a84138d..716816d 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
@@ -162,11 +162,10 @@
final Builder builder = new Builder()
.addFloat(mSettingsContainer, "translationX", -(remaining - defSpace), 0)
.addFloat(mSettingsButton, "rotation", -120, 0)
- .addFloat(mAlarmStatus, "alpha", 0, 1)
- .addFloat(mAlarmStatus, "translationX", 0, -mDate.getWidth())
- .addFloat(mAlarmStatusCollapsed, "translationX", 0, -mDate.getWidth());
+ .addFloat(mAlarmStatus, "alpha", 0, 1);
if (mAlarmShowing) {
- builder.addFloat(mDate, "alpha", 1, 0);
+ builder.addFloat(mDate, "alpha", 1, 0)
+ .addFloat(mDateTimeGroup, "translationX", 0, -mDate.getWidth());
}
mAnimator = builder.build();
setExpansion(mExpansionAmount);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
index 63563b2..1f49c1a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
@@ -221,7 +221,7 @@
}
// Set bounds on the QS panel so it doesn't run over the header.
- mQsBounds.top = (int) (mHeader.getBottom() * (1 - expansion));
+ mQsBounds.top = (int) (mQSPanel.getHeight() * (1 - expansion));
mQsBounds.right = mQSPanel.getWidth();
mQsBounds.bottom = mQSPanel.getHeight();
mQSPanel.setClipBounds(mQsBounds);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java
index c7979d8..8209ee2 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java
@@ -41,8 +41,8 @@
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.plugins.qs.DetailAdapter;
-import com.android.systemui.qs.QSHost;
import com.android.systemui.plugins.qs.QSTile.BooleanState;
+import com.android.systemui.qs.QSHost;
import com.android.systemui.qs.tileimpl.QSTileImpl;
import com.android.systemui.statusbar.policy.BatteryController;
@@ -102,7 +102,7 @@
@Override
public CharSequence getTileLabel() {
- return mContext.getString(R.string.battery);
+ return mContext.getString(R.string.battery_detail_switch_title);
}
@Override