Merge branch 'ub-launcher3-master' into launcher3merge2018-09-13 (4e99548b) · Commits · e / os / android_packages_apps_Trebuchet

res/layout/snackbar.xml

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -25,17 +25,23 @@
	android:gravity="center_vertical"		android:gravity="center_vertical"
	android:paddingLeft="8dp"		android:paddingLeft="8dp"
	android:paddingRight="8dp"		android:paddingRight="8dp"
	android:textSize="14sp"		android:lines="1"
	android:textColor="?android:attr/textColorPrimary"/>		android:ellipsize="end"
			android:textSize="@dimen/snackbar_max_text_size"
			android:textColor="?android:attr/textColorPrimary"
			android:theme="@style/TextTitle"/>
	<TextView		<TextView
	android:id="@+id/action"		android:id="@+id/action"
	android:layout_height="@dimen/snackbar_content_height"		android:layout_height="@dimen/snackbar_content_height"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_weight="0"		android:layout_weight="0"
	android:gravity="center"		android:gravity="center"
	android:padding="8dp"		android:paddingLeft="8dp"
			android:paddingRight="8dp"
	android:background="?android:attr/selectableItemBackground"		android:background="?android:attr/selectableItemBackground"
	android:textStyle="bold"		android:textStyle="bold"
	android:textColor="?android:attr/textColorPrimary"		android:textSize="@dimen/snackbar_max_text_size"
	android:textAllCaps="true"/>		android:textColor="?android:attr/colorAccent"
			android:theme="@style/TextTitle"
			android:capitalize="sentences"/>
	</merge>		</merge>
			No newline at end of file

res/values-si/strings.xml

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -114,8 +114,7 @@
	<string name="action_move_here" msgid="2170188780612570250">"මෙතනට අයිතමය ගෙන එන්න"</string>		<string name="action_move_here" msgid="2170188780612570250">"මෙතනට අයිතමය ගෙන එන්න"</string>
	<string name="item_added_to_workspace" msgid="4211073925752213539">"අයිතමය මුල් තිරය වෙත එකතු කරන ලදි"</string>		<string name="item_added_to_workspace" msgid="4211073925752213539">"අයිතමය මුල් තිරය වෙත එකතු කරන ලදි"</string>
	<string name="item_removed" msgid="851119963877842327">"අයිතමය ඉවත් කරන ලදි"</string>		<string name="item_removed" msgid="851119963877842327">"අයිතමය ඉවත් කරන ලදි"</string>
	<!-- no translation found for undo (4151576204245173321) -->		<string name="undo" msgid="4151576204245173321">"අස් කරන්න"</string>
	<skip />
	<string name="action_move" msgid="4339390619886385032">"අයිතමය ගෙනයන්න"</string>		<string name="action_move" msgid="4339390619886385032">"අයිතමය ගෙනයන්න"</string>
	<string name="move_to_empty_cell" msgid="2833711483015685619">"පේළිය <xliff:g id="NUMBER_0">%1$s</xliff:g> තීරුව <xliff:g id="NUMBER_1">%2$s</xliff:g> වෙත ගෙන යන්න"</string>		<string name="move_to_empty_cell" msgid="2833711483015685619">"පේළිය <xliff:g id="NUMBER_0">%1$s</xliff:g> තීරුව <xliff:g id="NUMBER_1">%2$s</xliff:g> වෙත ගෙන යන්න"</string>
	<string name="move_to_position" msgid="6750008980455459790">"<xliff:g id="NUMBER">%1$s</xliff:g> ස්ථානය වෙත ගෙන යන්න"</string>		<string name="move_to_position" msgid="6750008980455459790">"<xliff:g id="NUMBER">%1$s</xliff:g> ස්ථානය වෙත ගෙන යන්න"</string>

res/values/dimens.xml

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -230,5 +230,10 @@
	<dimen name="snackbar_height">48dp</dimen>		<dimen name="snackbar_height">48dp</dimen>
	<dimen name="snackbar_content_height">32dp</dimen>		<dimen name="snackbar_content_height">32dp</dimen>
	<dimen name="snackbar_padding">8dp</dimen>		<dimen name="snackbar_padding">8dp</dimen>
	<dimen name="snackbar_margin">16dp</dimen>		<dimen name="snackbar_min_margin_left_right">6dp</dimen>
			<dimen name="snackbar_max_margin_left_right">72dp</dimen>
			<dimen name="snackbar_margin_bottom">30dp</dimen>
			<dimen name="snackbar_elevation">3dp</dimen>
			<dimen name="snackbar_min_text_size">12sp</dimen>
			<dimen name="snackbar_max_text_size">14sp</dimen>
	</resources>		</resources>

res/values/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -262,7 +262,7 @@
	<!-- Accessibility confirmation for item removed. [CHAR_LIMIT=50]-->		<!-- Accessibility confirmation for item removed. [CHAR_LIMIT=50]-->
	<string name="item_removed">Item removed</string>		<string name="item_removed">Item removed</string>

	<!-- Action shown in snackbar to undo item removal. [CHAR_LIMIT=15] -->		<!-- Action shown in snackbar to undo item removal. [CHAR_LIMIT=20] -->
	<string name="undo">Undo</string>		<string name="undo">Undo</string>

	<!-- Accessibility action to move an item on the workspace. [CHAR_LIMIT=30] -->		<!-- Accessibility action to move an item on the workspace. [CHAR_LIMIT=30] -->

src/com/android/launcher3/util/ConfigMonitor.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -111,8 +111,12 @@ public class ConfigMonitor extends BroadcastReceiver implements DisplayListener

	private void killProcess() {		private void killProcess() {
	Log.d(TAG, "restarting launcher");		Log.d(TAG, "restarting launcher");
			try {
	mContext.unregisterReceiver(this);		mContext.unregisterReceiver(this);
	mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);		mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
			} catch (Exception e) {
			// We are going to die anyway, ignore any error die to race condition in registering.
			}
	android.os.Process.killProcess(android.os.Process.myPid());		android.os.Process.killProcess(android.os.Process.myPid());
	}		}