Merge "SystemUI: Porting serveral bug fix" (96de0cc1) · Commits · e / os / android_frameworks_base

core/res/res/values-w320dp/dimens.xml

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2011, The Android Open Source Project
		** Copyright (c) 2013, The Linux Foundation. All rights reserved.
		** Not a Contribution.

		** 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.
		*/
		-->
		<resources>

		<dimen name="kg_status_clock_font_size">45dp</dimen>
		<!-- Size of the date font in keyguard's status view -->
		<dimen name="kg_status_date_font_size">10dp</dimen>

		</resources>
		No newline at end of file

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

+12 −10

Original line number	Diff line number	Diff line
		@@ -85,30 +85,30 @@
		android:visibility="invisible"
		/>
		<FrameLayout
		android:id="@+id/mobile_combo_sub3"
		android:id="@+id/mobile_combo"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		>
		<ImageView
		android:id="@+id/mobile_signal_sub3"
		android:id="@+id/mobile_signal"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center\|bottom"
		/>
		<ImageView
		android:id="@+id/mobile_type_sub3"
		android:id="@+id/mobile_type"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center\|bottom"
		/>
		<ImageView
		android:id="@+id/mobile_inout_sub3"
		android:id="@+id/mobile_inout"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="right\|bottom"
		/>
		<ImageView
		android:id="@+id/no_sim_slot3"
		android:id="@+id/no_sim"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		/>
		@@ -117,6 +117,7 @@
		<View
		android:layout_height="8dp"
		android:layout_width="8dp"
		android:visibility="gone"
		android:id="@+id/spacer"
		/>
		<FrameLayout
		@@ -161,6 +162,7 @@
		<View
		android:layout_height="8dp"
		android:layout_width="8dp"
		android:visibility="gone"
		android:id="@+id/spacer"
		/>
		<FrameLayout
		@@ -173,30 +175,30 @@
		android:visibility="invisible"
		/>
		<FrameLayout
		android:id="@+id/mobile_combo"
		android:id="@+id/mobile_combo_sub3"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		>
		<ImageView
		android:id="@+id/mobile_signal"
		android:id="@+id/mobile_signal_sub3"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center\|bottom"
		/>
		<ImageView
		android:id="@+id/mobile_type"
		android:id="@+id/mobile_type_sub3"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center\|bottom"
		/>
		<ImageView
		android:id="@+id/mobile_inout"
		android:id="@+id/mobile_inout_sub3"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="right\|bottom"
		/>
		<ImageView
		android:id="@+id/no_sim"
		android:id="@+id/no_sim_slot3"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		/>

packages/SystemUI/res/layout/msim_status_bar.xml

+6 −4

Original line number	Diff line number	Diff line
		@@ -97,11 +97,13 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		/>
		<ImageView
		<!-- battery must be padded below by 2px to match assets -->
		<com.android.systemui.BatteryMeterView
		android:id="@+id/battery"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:paddingLeft="4dip"
		android:layout_height="16dp"
		android:layout_width="10.5dp"
		android:layout_marginBottom="2px"
		android:layout_marginStart="4dip"
		/>
		</LinearLayout>

packages/SystemUI/res/values-zh-rCN/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@
		<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
		<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
		<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
		<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫游中"</string>
		<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"数据漫游"</string>
		<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"EDGE"</string>
		<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"WLAN"</string>
		<string name="accessibility_no_sim" msgid="8274017118472455155">"无 SIM 卡。"</string>

packages/SystemUI/res/values-zh-rTW/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@
		<string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string>
		<string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string>
		<string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string>
		<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"漫遊中"</string>
		<string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"數據漫遊"</string>
		<string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string>
		<string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
		<string name="accessibility_no_sim" msgid="8274017118472455155">"沒有 SIM 卡。"</string>