Merge "Add screen recording QS tile" (0b56225e) · Commits · e / os / android_frameworks_base

packages/SystemUI/AndroidManifest.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,8 @@
		</receiver>

		<activity android:name=".screenrecord.ScreenRecordDialog"
		android:theme="@style/ScreenRecord" />
		android:theme="@style/ScreenRecord"
		android:excludeFromRecents="true" />
		<service android:name=".screenrecord.RecordingService" />

		<receiver android:name=".SysuiRestartReceiver"

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path
		android:fillColor="#FF000000"
		android:pathData="M18,10.48L18,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-4.48l4,3.98v-11l-4,3.98zM16,9.69L16,18L4,18L4,6h12v3.69z"/>
		</vector>

deleted100644 → 0

+0 −36

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:gravity="top"
		android:orientation="vertical"
		android:padding="@dimen/global_actions_padding"
		android:background="@drawable/rounded_bg_full">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">
		<CheckBox
		android:id="@+id/checkbox_mic"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:text="@string/screenrecord_mic_label"/>
		<CheckBox
		android:id="@+id/checkbox_taps"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:text="@string/screenrecord_taps_label"/>
		<Button
		android:id="@+id/record_button"
		android:layout_width="match_parent"
		android:layout_height="50dp"
		android:text="@string/screenrecord_start_label"
		/>
		</LinearLayout>

		</LinearLayout>

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@

		<!-- The default tiles to display in QuickSettings -->
		<string name="quick_settings_tiles_default" translatable="false">
		wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast
		wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast,screenrecord
		</string>

		<!-- The minimum number of tiles to display in QuickSettings -->
		@@ -117,7 +117,7 @@

		<!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
		<string name="quick_settings_tiles_stock" translatable="false">
		wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night,controls
		wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night,controls,screenrecord
		</string>

		<!-- The tiles to display in QuickSettings -->

+7 −0

Original line number	Diff line number	Diff line
		@@ -928,6 +928,13 @@
		<!-- QuickSettings: NFC (on) [CHAR LIMIT=NONE] -->
		<string name="quick_settings_nfc_on">NFC is enabled</string>

		<!-- QuickSettings: Screen record tile [CHAR LIMIT=NONE] -->
		<string name="quick_settings_screen_record_label">Screen Record</string>
		<!-- QuickSettings: Text to prompt the user to begin a new recording [CHAR LIMIT=20] -->
		<string name="quick_settings_screen_record_start">Start</string>
		<!-- QuickSettings: Text to prompt the user to stop an ongoing recording [CHAR LIMIT=20] -->
		<string name="quick_settings_screen_record_stop">Stop</string>

		<!-- Recents: Text that shows above the navigation bar after launching a few apps. [CHAR LIMIT=NONE] -->
		<string name="recents_swipe_up_onboarding">Swipe up to switch apps</string>
		<!-- Recents: Text that shows above the navigation bar after launching several apps. [CHAR LIMIT=NONE] -->