diff options
author | Justin Klaassen <justinklaassen@google.com> | 2017-09-18 17:34:52 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2017-09-18 17:34:52 -0400 |
commit | 6affb4632c3e4f0602870d6f8f7ca474ce2aea42 (patch) | |
tree | 6038c55fb185dd79071999a60089544bfa586e0f /data/res | |
parent | f276aee073961ac32d9b86a34aefe4b927265613 (diff) | |
download | android-28-6affb4632c3e4f0602870d6f8f7ca474ce2aea42.tar.gz |
Import Android SDK Platform P [4344336]
/google/data/ro/projects/android/fetch_artifact \
--bid 4344336 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-platforms-4344336.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I84945fb7dac6b4cd4543e03818cae487f1ca400a
Diffstat (limited to 'data/res')
-rw-r--r-- | data/res/layout/autofill_save.xml | 6 | ||||
-rw-r--r-- | data/res/values/attrs_manifest.xml | 5 | ||||
-rw-r--r-- | data/res/values/dimens.xml | 12 | ||||
-rw-r--r-- | data/res/values/strings.xml | 13 | ||||
-rw-r--r-- | data/res/values/symbols.xml | 12 |
5 files changed, 40 insertions, 8 deletions
diff --git a/data/res/layout/autofill_save.xml b/data/res/layout/autofill_save.xml index 50ff50f1..92419c8c 100644 --- a/data/res/layout/autofill_save.xml +++ b/data/res/layout/autofill_save.xml @@ -44,8 +44,14 @@ android:layout_height="wrap_content" android:orientation="horizontal"> + <ImageView + android:id="@+id/autofill_save_icon" + android:layout_width="wrap_content" + android:layout_height="24sp"/> + <TextView android:id="@+id/autofill_save_title" + android:paddingLeft="8dp" android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/autofill_save_title" diff --git a/data/res/values/attrs_manifest.xml b/data/res/values/attrs_manifest.xml index 793b5b2a..e6c829fc 100644 --- a/data/res/values/attrs_manifest.xml +++ b/data/res/values/attrs_manifest.xml @@ -249,6 +249,11 @@ that target runtime permissions ({@link android.os.Build.VERSION_CODES#M} and above) --> <flag name="runtime" value="0x2000" /> + <!-- Additional flag from base permission type: this permission can be granted only + if its protection level is signature, the requesting app resides on the OEM partition, + and the OEM has white-listed the app to receive this permission by the OEM. + --> + <flag name="oem" value="0x4000" /> </attr> <!-- Flags indicating more context for a permission group. --> diff --git a/data/res/values/dimens.xml b/data/res/values/dimens.xml index 9b1ebc87..2c64789f 100644 --- a/data/res/values/dimens.xml +++ b/data/res/values/dimens.xml @@ -346,6 +346,11 @@ <dimen name="notification_text_size">14sp</dimen> <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) --> <dimen name="notification_title_text_size">14sp</dimen> + + <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) when colorized --> + <dimen name="notification_text_size_colorized">16sp</dimen> + <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) when colorized --> + <dimen name="notification_title_text_size_colorized">20sp</dimen> <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) --> <dimen name="notification_subtext_size">12sp</dimen> @@ -604,4 +609,11 @@ <!-- Max height of the the autofill save custom subtitle as a fraction of the screen width/height --> <dimen name="autofill_save_custom_subtitle_max_height">20%</dimen> + <!-- Max (absolute) dimensions (both width and height) of autofill service icon on autofill save affordance. + NOTE: the actual displayed size might is actually smaller than this and is hardcoded in the + autofill_save.xml layout; this dimension is just used to avoid a crash in the UI (if the icon provided + by the autofill service metadata is bigger than these dimentionsit will not be displayed). + --> + <dimen name="autofill_save_icon_max_size">300dp</dimen> + </resources> diff --git a/data/res/values/strings.xml b/data/res/values/strings.xml index bd5b7116..7416113b 100644 --- a/data/res/values/strings.xml +++ b/data/res/values/strings.xml @@ -3785,15 +3785,18 @@ a headphone or other wired audio output jack. [CHAR LIMIT=50] --> <string name="default_audio_route_name" product="default">Phone</string> + <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_dock_speakers">Dock speakers</string> + + <!-- Name of the default audio route when HDMI is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_hdmi">HDMI</string> + <!-- Name of the default audio route when wired headphones are connected. [CHAR LIMIT=50] --> <string name="default_audio_route_name_headphones">Headphones</string> - <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] --> - <string name="default_audio_route_name_dock_speakers">Dock speakers</string> - - <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] --> - <string name="default_media_route_name_hdmi">HDMI</string> + <!-- Name of the default audio route when USB is connected. [CHAR LIMIT=50] --> + <string name="default_audio_route_name_usb">USB</string> <!-- Name of the default audio route category. [CHAR LIMIT=50] --> <string name="default_audio_route_category_name">System</string> diff --git a/data/res/values/symbols.xml b/data/res/values/symbols.xml index 927d9dce..c4a45ee1 100644 --- a/data/res/values/symbols.xml +++ b/data/res/values/symbols.xml @@ -1025,9 +1025,10 @@ <java-symbol type="string" name="granularity_label_link" /> <java-symbol type="string" name="granularity_label_line" /> <java-symbol type="string" name="default_audio_route_name" /> - <java-symbol type="string" name="default_audio_route_name_headphones" /> <java-symbol type="string" name="default_audio_route_name_dock_speakers" /> - <java-symbol type="string" name="default_media_route_name_hdmi" /> + <java-symbol type="string" name="default_audio_route_name_hdmi" /> + <java-symbol type="string" name="default_audio_route_name_headphones" /> + <java-symbol type="string" name="default_audio_route_name_usb" /> <java-symbol type="string" name="default_audio_route_category_name" /> <java-symbol type="string" name="stk_cc_ss_to_dial" /> <java-symbol type="string" name="stk_cc_ss_to_ss" /> @@ -2907,8 +2908,9 @@ <java-symbol type="id" name="autofill_dataset_list"/> <java-symbol type="id" name="autofill" /> <java-symbol type="id" name="autofill_save_custom_subtitle" /> - <java-symbol type="id" name="autofill_save_title" /> + <java-symbol type="id" name="autofill_save_icon" /> <java-symbol type="id" name="autofill_save_no" /> + <java-symbol type="id" name="autofill_save_title" /> <java-symbol type="id" name="autofill_save_yes" /> <java-symbol type="string" name="autofill_error_cannot_autofill" /> <java-symbol type="string" name="autofill_picker_no_suggestions" /> @@ -2932,6 +2934,7 @@ <java-symbol type="style" name="AutofillSaveAnimation" /> <java-symbol type="dimen" name="autofill_dataset_picker_max_size"/> <java-symbol type="dimen" name="autofill_save_custom_subtitle_max_height"/> + <java-symbol type="dimen" name="autofill_save_icon_max_size"/> <java-symbol type="dimen" name="notification_big_picture_max_height"/> <java-symbol type="dimen" name="notification_big_picture_max_width"/> @@ -3055,6 +3058,9 @@ <java-symbol type="array" name="config_allowedSystemInstantAppSettings" /> <java-symbol type="array" name="config_allowedSecureInstantAppSettings" /> + <java-symbol type="dimen" name="notification_text_size_colorized" /> + <java-symbol type="dimen" name="notification_title_text_size_colorized" /> + <java-symbol type="bool" name="config_handleVolumeKeysInWindowManager" /> <java-symbol type="dimen" name="config_inCallNotificationVolume" /> <java-symbol type="string" name="config_inCallNotificationSound" /> |