Animate the search bar expansion
Enable the transition between Settings app and Settings Search
Test: Record the transition video and confirm it.
Fix: 175764903
Change-Id: I95125fba17bbf517feee9a10fd828ff8017f7106
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index 9fbc2a2..0e4a76d 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -20,6 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
+ android:transitionGroup="true"
android:orientation="vertical">
<Toolbar
android:id="@+id/action_bar"
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 20d4e7c..18c802c 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -20,11 +20,13 @@
import android.annotation.NonNull;
import android.app.Activity;
+import android.app.ActivityOptions;
import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Toolbar;
@@ -100,7 +102,8 @@
.indexSliceDataAsync(context);
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
.action(context, SettingsEnums.ACTION_SEARCH_RESULTS);
- activity.startActivityForResult(intent, REQUEST_CODE);
+ final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle();
+ activity.startActivityForResult(intent, REQUEST_CODE, bundle);
});
}