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

resolve merge conflicts of fbf366d to nyc-mr1-dev

Browse Source 
Change-Id: If2c3d07d680c36b206fe49a8e8e7dc20619a5c42
This commit is contained in:
Jason Monk
2016-06-08 16:24:16 -04:00
parent 174e41b1fd fbf366d7ee
commit 5aa661d7c0
6 changed files with 168 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml Normal file
View File

@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:systemui="http://schemas.android.com/apk/res-auto"
android:id="@+id/date_time_alarm_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="16dp"
android:gravity="start"
android:orientation="vertical">
<LinearLayout
android:id="@+id/date_time_group"
android:layout_width="wrap_content"
android:layout_height="19dp"
android:orientation="horizontal"
android:focusable="true" >
<include layout="@layout/split_clock_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/clock" />
<com.android.systemui.statusbar.policy.DateView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:drawableStart="@drawable/header_dot"
android:drawablePadding="6dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
android:textSize="@dimen/qs_time_collapsed_size"
android:gravity="top"
systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/alarm_status_collapsed"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_access_alarms_small"
android:paddingStart="6dp"
android:gravity="center"
android:visibility="gone" />
</LinearLayout>
<com.android.systemui.statusbar.AlphaOptimizedButton
android:id="@+id/alarm_status"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:paddingTop="3dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_access_alarms_small"
android:textColor="#64ffffff"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
android:gravity="top"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone" />
</LinearLayout>

62
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
View File

@@ -118,64 +118,12 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:focusable="true" /> android:focusable="true" />
<LinearLayout <include
android:id="@+id/date_time_alarm_group" android:id="@+id/date_time_alarm_group"
android:layout_width="wrap_content" layout="@layout/status_bar_alarm_group"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginStart="16dp" android:layout_alignParentStart="true"
android:gravity="start" android:layout_alignParentTop="true" />
android:orientation="vertical">
<LinearLayout
android:id="@+id/date_time_group"
android:layout_width="wrap_content"
android:layout_height="19dp"
android:orientation="horizontal"
android:focusable="true" >
<include layout="@layout/split_clock_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/clock" />
<com.android.systemui.statusbar.policy.DateView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:drawableStart="@drawable/header_dot"
android:drawablePadding="6dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
android:textSize="@dimen/qs_time_collapsed_size"
android:gravity="top"
systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/alarm_status_collapsed"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_access_alarms_small"
android:paddingStart="6dp"
android:gravity="center"
android:visibility="gone" />
</LinearLayout>
<com.android.systemui.statusbar.AlphaOptimizedButton
android:id="@+id/alarm_status"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:paddingTop="3dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_access_alarms_small"
android:textColor="#64ffffff"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
android:gravity="top"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone" />
</LinearLayout>
<com.android.systemui.qs.QuickQSPanel <com.android.systemui.qs.QuickQSPanel
android:id="@+id/quick_qs_panel" android:id="@+id/quick_qs_panel"
@@ -189,7 +137,7 @@
android:clipToPadding="false" android:clipToPadding="false"
android:importantForAccessibility="yes" android:importantForAccessibility="yes"
android:focusable="true" android:focusable="true"
android:accessibilityTraversalAfter="@id/date_time_group" android:accessibilityTraversalAfter="@+id/date_time_group"
android:accessibilityTraversalBefore="@id/expand_indicator" /> android:accessibilityTraversalBefore="@id/expand_indicator" />
<com.android.systemui.statusbar.AlphaOptimizedImageView <com.android.systemui.statusbar.AlphaOptimizedImageView

73
packages/SystemUI/res/layout/status_bar_alarm_group.xml Normal file
View File

@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 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.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:systemui="http://schemas.android.com/apk/res-auto"
android:id="@+id/date_time_alarm_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="16dp"
android:gravity="start"
android:orientation="vertical">
<LinearLayout
android:id="@+id/date_time_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:focusable="true" >
<include layout="@layout/split_clock_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/clock" />
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/alarm_status_collapsed"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_access_alarms_small"
android:paddingStart="6dp"
android:gravity="center"
android:visibility="gone" />
</LinearLayout>
<com.android.systemui.statusbar.policy.DateView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_marginTop="-4dp"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
android:textSize="@dimen/qs_time_collapsed_size"
android:gravity="top"
systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />
<com.android.systemui.statusbar.AlphaOptimizedButton
android:id="@+id/alarm_status"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:paddingTop="3dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_access_alarms_small"
android:textColor="#64ffffff"
android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
android:gravity="top"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone" />
</LinearLayout>

2
packages/SystemUI/res/values-sw410dp/config.xml
View File

@@ -22,5 +22,5 @@
<resources> <resources>
<integer name="quick_settings_num_rows">2</integer> <integer name="quick_settings_num_rows">2</integer>
<bool name="quick_settings_show_date">true</bool> <bool name="quick_settings_show_full_alarm">true</bool>
</resources> </resources>

2
packages/SystemUI/res/values/config.xml
View File

@@ -272,6 +272,6 @@
<!-- Nav bar button default ordering/layout --> <!-- Nav bar button default ordering/layout -->
<string name="config_navBarLayout" translatable="false">space,back;home;recent,menu_ime</string> <string name="config_navBarLayout" translatable="false">space,back;home;recent,menu_ime</string>
<bool name="quick_settings_show_date">false</bool> <bool name="quick_settings_show_full_alarm">false</bool>
</resources> </resources>

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -92,6 +92,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
private float mExpansionAmount; private float mExpansionAmount;
private QSTileHost mHost; private QSTileHost mHost;
private View mEdit; private View mEdit;
private boolean mShowFullAlarm;
public QuickStatusBarHeader(Context context, AttributeSet attrs) { public QuickStatusBarHeader(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
@@ -112,8 +113,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group); mDateTimeGroup = (ViewGroup) findViewById(R.id.date_time_group);
mDateTimeGroup.setPivotX(0); mDateTimeGroup.setPivotX(0);
mDateTimeGroup.setPivotY(0); mDateTimeGroup.setPivotY(0);
boolean showDate = getResources().getBoolean(R.bool.quick_settings_show_date); mShowFullAlarm = getResources().getBoolean(R.bool.quick_settings_show_full_alarm);
findViewById(R.id.date).setVisibility(showDate ? View.VISIBLE : View.GONE);
mExpandIndicator = (ExpandableIndicator) findViewById(R.id.expand_indicator); mExpandIndicator = (ExpandableIndicator) findViewById(R.id.expand_indicator);
@@ -163,14 +163,16 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
mDateScaleFactor = dateExpandedSize / dateCollapsedSize; mDateScaleFactor = dateExpandedSize / dateCollapsedSize;
mSecondHalfAnimator = new TouchAnimator.Builder() mSecondHalfAnimator = new TouchAnimator.Builder()
.addFloat(mAlarmStatus, "alpha", 0, 1) .addFloat(mShowFullAlarm ? mAlarmStatus : findViewById(R.id.date), "alpha", 0, 1)
.addFloat(mEmergencyOnly, "alpha", 0, 1) .addFloat(mEmergencyOnly, "alpha", 0, 1)
.setStartDelay(.5f) .setStartDelay(.5f)
.build(); .build();
mFirstHalfAnimator = new TouchAnimator.Builder() if (mShowFullAlarm) {
.addFloat(mAlarmStatusCollapsed, "alpha", 1, 0) mFirstHalfAnimator = new TouchAnimator.Builder()
.setEndDelay(.5f) .addFloat(mAlarmStatusCollapsed, "alpha", 1, 0)
.build(); .setEndDelay(.5f)
.build();
}
mDateSizeAnimator = new TouchAnimator.Builder() mDateSizeAnimator = new TouchAnimator.Builder()
.addFloat(mDateTimeGroup, "scaleX", 1, mDateScaleFactor) .addFloat(mDateTimeGroup, "scaleX", 1, mDateScaleFactor)
.addFloat(mDateTimeGroup, "scaleY", 1, mDateScaleFactor) .addFloat(mDateTimeGroup, "scaleY", 1, mDateScaleFactor)
@@ -241,7 +243,9 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
public void setExpansion(float headerExpansionFraction) { public void setExpansion(float headerExpansionFraction) {
mExpansionAmount = headerExpansionFraction; mExpansionAmount = headerExpansionFraction;
mSecondHalfAnimator.setPosition(headerExpansionFraction); mSecondHalfAnimator.setPosition(headerExpansionFraction);
mFirstHalfAnimator.setPosition(headerExpansionFraction); if (mShowFullAlarm) {
mFirstHalfAnimator.setPosition(headerExpansionFraction);
}
mDateSizeAnimator.setPosition(headerExpansionFraction); mDateSizeAnimator.setPosition(headerExpansionFraction);
mSettingsAlpha.setPosition(headerExpansionFraction); mSettingsAlpha.setPosition(headerExpansionFraction);
@@ -259,7 +263,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
} }
private void updateAlarmVisibilities() { private void updateAlarmVisibilities() {
mAlarmStatus.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE); mAlarmStatus.setVisibility(mAlarmShowing && mShowFullAlarm ? View.VISIBLE : View.INVISIBLE);
mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE); mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE);
} }