diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-28 22:18:51 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-28 22:18:51 +0000 |
| commit | 6f1c81745c9a52160a71d4121a32273a0e2e3b88 (patch) | |
| tree | bdfc9fff900ea1c01f0c7e3a1815db73927668f7 | |
| parent | 455a610e1a5f4cb066d8f4f290f7e6959aafea34 (diff) | |
| parent | 12bd8da77cdc96523cfc401a46bd426d23efb9e3 (diff) | |
| download | development-6f1c81745c9a52160a71d4121a32273a0e2e3b88.tar.gz | |
Snap for 5511141 from 12bd8da77cdc96523cfc401a46bd426d23efb9e3 to qt-aml-release
Change-Id: I87e36cdfe3f25f73350e33bef1ffdffec9fb6137
8 files changed, 16 insertions, 7 deletions
diff --git a/samples/ThemedNavBarKeyboard/src/com/example/android/themednavbarkeyboard/ThemedNavBarKeyboard.java b/samples/ThemedNavBarKeyboard/src/com/example/android/themednavbarkeyboard/ThemedNavBarKeyboard.java index b2b19d52c..6b33f3fee 100644 --- a/samples/ThemedNavBarKeyboard/src/com/example/android/themednavbarkeyboard/ThemedNavBarKeyboard.java +++ b/samples/ThemedNavBarKeyboard/src/com/example/android/themednavbarkeyboard/ThemedNavBarKeyboard.java @@ -57,6 +57,15 @@ public class ThemedNavBarKeyboard extends InputMethodService { private KeyboardLayoutView mLayout; @Override + public void onCreate() { + super.onCreate(); + if (BuildCompat.EFFECTIVE_SDK_INT > Build.VERSION_CODES.P) { + // Disable contrast for extended navbar gradient. + getWindow().getWindow().setNavigationBarContrastEnforced(false); + } + } + + @Override public View onCreateInputView() { mLayout = new KeyboardLayoutView(this, getWindow().getWindow()); return mLayout; diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template index 93ceff59e..d1ffb8c5a 100644 --- a/sdk/build_tools_source.prop_template +++ b/sdk/build_tools_source.prop_template @@ -1,3 +1,3 @@ Pkg.UserSrc=false #Pkg.Revision=${PLATFORM_SDK_VERSION}.0.3 -Pkg.Revision=29.0.0 rc3 +Pkg.Revision=29.0.0 rc4 diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index 9dc99a0a1..ff513ff0c 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} Platform.CodeName= -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} Layoutlib.Api=15 diff --git a/sys-img/images_arm64-v8a_source.prop_template b/sys-img/images_arm64-v8a_source.prop_template index c2c385180..b8ef755aa 100644 --- a/sys-img/images_arm64-v8a_source.prop_template +++ b/sys-img/images_arm64-v8a_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} SystemImage.Abi=arm64-v8a diff --git a/sys-img/images_armeabi-v7a_source.prop_template b/sys-img/images_armeabi-v7a_source.prop_template index 647648279..e24b6930c 100644 --- a/sys-img/images_armeabi-v7a_source.prop_template +++ b/sys-img/images_armeabi-v7a_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 Pkg.Dependencies=emulator#28.1.9 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} diff --git a/sys-img/images_armeabi_source.prop_template b/sys-img/images_armeabi_source.prop_template index e0b869abe..d73fdb298 100644 --- a/sys-img/images_armeabi_source.prop_template +++ b/sys-img/images_armeabi_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 Pkg.Dependencies=emulator#28.1.9 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} diff --git a/sys-img/images_x86_64_source.prop_template b/sys-img/images_x86_64_source.prop_template index b23cce1b5..cbda36c40 100644 --- a/sys-img/images_x86_64_source.prop_template +++ b/sys-img/images_x86_64_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 Pkg.Dependencies=emulator#28.1.9 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} diff --git a/sys-img/images_x86_source.prop_template b/sys-img/images_x86_source.prop_template index bd4149502..9244f309f 100644 --- a/sys-img/images_x86_source.prop_template +++ b/sys-img/images_x86_source.prop_template @@ -1,6 +1,6 @@ Pkg.Desc=Android SDK System Image Pkg.UserSrc=false -Pkg.Revision=4 +Pkg.Revision=5 Pkg.Dependencies=emulator#28.1.9 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} |