diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 02:27:28 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 15:13:26 +0000 |
| commit | a89168479cb14f482268af6f1a650b28eba0b393 (patch) | |
| tree | 8552b9d49ecfad6a453ee5f743571b700b4d3d3c /packages/SystemUI/res/layout | |
| parent | 8331d3e508498a19c296fed41b9d4b23ea960031 (diff) | |
| parent | 25b5096f154721c8142d54f1b3af9e2998deffe9 (diff) | |
| download | frameworks_base-a89168479cb14f482268af6f1a650b28eba0b393.zip frameworks_base-a89168479cb14f482268af6f1a650b28eba0b393.tar.gz frameworks_base-a89168479cb14f482268af6f1a650b28eba0b393.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
cmds/bootanimation/BootAnimation.cpp
core/java/android/accounts/AccountManager.java
core/java/android/app/AppOpsManager.java
core/java/android/os/PowerManagerInternal.java
core/java/android/os/storage/IMountService.java
core/java/android/provider/Settings.java
core/java/com/android/internal/widget/ILockSettings.aidl
core/res/res/values-mcc204-mnc12/config.xml
core/res/res/values-mcc219-mnc02/config.xml
core/res/res/values-mcc730-mnc07/config.xml
core/res/res/values/config.xml
core/res/res/values/symbols.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableOutlineView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeParameters.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/power/PowerManagerService.java
telecomm/java/android/telecom/Phone.java
telephony/java/android/telephony/CarrierConfigManager.java
telephony/java/android/telephony/RadioAccessFamily.java
telephony/java/android/telephony/ServiceState.java
telephony/java/android/telephony/SignalStrength.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/ims/ImsCallProfile.java
telephony/java/com/android/ims/ImsReasonInfo.java
telephony/java/com/android/ims/ImsSuppServiceNotification.aidl
telephony/java/com/android/ims/ImsSuppServiceNotification.java
telephony/java/com/android/ims/internal/IImsRegistrationListener.aidl
telephony/java/com/android/internal/telephony/RILConstants.java
Change-Id: I99c6edb8e25a77145b5adef97d0d55bfbe676959
Diffstat (limited to 'packages/SystemUI/res/layout')
| -rw-r--r-- | packages/SystemUI/res/layout/navigation_bar.xml | 8 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml index c92ba45..d58664f 100644 --- a/packages/SystemUI/res/layout/navigation_bar.xml +++ b/packages/SystemUI/res/layout/navigation_bar.xml @@ -213,7 +213,7 @@ android:layout_width="match_parent" android:layout_height="40dp" android:contentDescription="@string/accessibility_menu" - android:src="@drawable/ic_sysbar_menu_land" + android:src="@drawable/ic_sysbar_menu" android:scaleType="centerInside" android:layout_gravity="top" android:visibility="invisible" @@ -223,7 +223,7 @@ <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/recent_apps" android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_recent_land" + android:src="@drawable/ic_sysbar_recent" android:scaleType="center" android:layout_weight="0" android:contentDescription="@string/accessibility_recent" @@ -237,7 +237,7 @@ <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/home" android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_home_land" + android:src="@drawable/ic_sysbar_home" android:scaleType="center" systemui:keyCode="3" systemui:keyRepeat="false" @@ -253,7 +253,7 @@ <com.android.systemui.statusbar.policy.KeyButtonView android:id="@+id/back" android:layout_height="@dimen/navigation_key_width" android:layout_width="match_parent" - android:src="@drawable/ic_sysbar_back_land" + android:src="@drawable/ic_sysbar_back" android:scaleType="center" systemui:keyCode="4" android:layout_weight="0" diff --git a/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml index 561eff6..bfca7b9 100644 --- a/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_notification_brightness_dialog.xml @@ -26,6 +26,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_weight="1" - systemui:text="" /> + /> </LinearLayout> |