commit 31172c303c0c8fb3dd8e9ddff42e64d72a9f8a5a
author Alex Stetson <alexstetson@google.com> Fri May 15 22:14:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 15 22:14:33 2020 +0000
tree 9e84673973758dbd7f7175345e29b5ff230a279e
parent 83a86ab59160891aca8a15f1195f133201974d53
parent 47de38f463e5864c3471876b6faf615f1608cd10

Remove adjustPan from car settings search am: 3360ad616e am: 47de38f463

Change-Id: Ie891865f7cd99d409e4492d52a9287979221d93e

res/values/themes.xml

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 949b6dd..c0453b1 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -21,6 +21,7 @@
     <style name="Theme.Settings.NoActionBar">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="android:windowSoftInputMode">adjustPan</item>
     </style>
 
     <style name="Theme.CarSettings" parent="@style/Theme.CarUi.WithToolbar"/>

src/com/android/settings/intelligence/search/SearchActivity.java

diff --git a/src/com/android/settings/intelligence/search/SearchActivity.java b/src/com/android/settings/intelligence/search/SearchActivity.java
index 8b8bc42..229c926 100644
--- a/src/com/android/settings/intelligence/search/SearchActivity.java
+++ b/src/com/android/settings/intelligence/search/SearchActivity.java
@@ -39,8 +39,6 @@
         }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.search_main);
-        // Keeps layouts in-place when keyboard opens.
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
 
         FragmentManager fragmentManager = getSupportFragmentManager();
         Fragment fragment = fragmentManager.findFragmentById(R.id.main_content);