Apply theme to half sheet and clean up
https://screenshot.googleplex.com/67T5pt8gK7hLG4C
Test: Screenshot
Bug: 196262706
Change-Id: Ia4d55f7dfff49993222ac3627851ab89279b51d0
diff --git a/nearby/halfsheet/Android.bp b/nearby/halfsheet/Android.bp
index 3f4f258..2b35254 100644
--- a/nearby/halfsheet/Android.bp
+++ b/nearby/halfsheet/Android.bp
@@ -16,45 +16,42 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-java_defaults {
- name: "HalfSheetDefaults",
+android_app {
+ name: "HalfSheetUX",
+ defaults: ["platform_app_defaults"],
srcs: ["src/**/*.java"],
sdk_version: "module_current",
// This is included in tethering apex, which uses min SDK 30
min_sdk_version: "30",
target_sdk_version: "current",
- manifest: "AndroidManifest.xml",
- plugins: ["java_api_finder"],
- jarjar_rules: ":nearby-jarjar-rules",
+ updatable: true,
+ certificate: ":com.android.nearby.halfsheetcertificate",
libs: [
"framework-bluetooth",
"framework-connectivity-tiramisu",
"nearby-service-string",
- ],
+ ],
static_libs: [
"androidx.annotation_annotation",
"androidx.fragment_fragment",
"androidx-constraintlayout_constraintlayout",
"androidx.localbroadcastmanager_localbroadcastmanager",
+ "androidx.core_core",
+ "androidx.appcompat_appcompat",
+ "androidx.recyclerview_recyclerview",
+ "androidx.lifecycle_lifecycle-runtime",
+ "androidx.lifecycle_lifecycle-extensions",
+ "com.google.android.material_material",
"fast-pair-lite-protos",
],
- lint: { strict_updatability_linting: true }
-}
-
-android_app {
- name: "HalfSheetUX",
- defaults: ["HalfSheetDefaults"],
- resource_dirs: ["res"],
- certificate: ":com.android.nearby.halfsheetcertificate",
- updatable: true,
- static_libs: [
- "com.google.android.material_material",
- ],
+ plugins: ["java_api_finder"],
+ manifest: "AndroidManifest.xml",
+ jarjar_rules: ":nearby-jarjar-rules",
apex_available: ["com.android.tethering",],
+ lint: { strict_updatability_linting: true }
}
android_app_certificate {
name: "com.android.nearby.halfsheetcertificate",
certificate: "apk-certs/com.android.nearby.halfsheet"
}
-
diff --git a/nearby/halfsheet/AndroidManifest.xml b/nearby/halfsheet/AndroidManifest.xml
index 3e8b39b..3df7970 100644
--- a/nearby/halfsheet/AndroidManifest.xml
+++ b/nearby/halfsheet/AndroidManifest.xml
@@ -15,17 +15,16 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="com.android.nearby.halfsheet">
- <application android:label="@string/app_name">
+ <application>
<activity
android:name="com.android.nearby.halfsheet.HalfSheetActivity"
- android:exported="true">
+ android:exported="true"
+ android:theme="@style/HalfSheetStyle" >
<intent-filter>
<action android:name="android.nearby.SHOW_HALFSHEET"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>
-
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/nearby/halfsheet/res/layout/activity_half_sheet.xml b/nearby/halfsheet/res/layout/activity_half_sheet.xml
deleted file mode 100644
index 4915d4b..0000000
--- a/nearby/halfsheet/res/layout/activity_half_sheet.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:tools="http://schemas.android.com/tools"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="abc half sheet" />
- </LinearLayout>
-
-</FrameLayout>
-
diff --git a/nearby/halfsheet/res/layout/fast_pair_app_launch_fragment.xml b/nearby/halfsheet/res/layout/fast_pair_app_launch_fragment.xml
deleted file mode 100644
index ad321b2..0000000
--- a/nearby/halfsheet/res/layout/fast_pair_app_launch_fragment.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.LinearLayoutCompat
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:orientation="vertical"
- android:layout_width="match_parent" android:layout_height="match_parent">
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/image_view"
- android:layout_width="match_parent"
- android:layout_height="340dp"
- android:paddingStart="12dp"
- android:paddingEnd="12dp"
- android:paddingTop="12dp">
- <TextView
- android:id="@+id/header_subtitle"
- android:textColor="@color/fast_pair_half_sheet_subtitle_color"
- android:fontFamily="google-sans"
- android:textSize="14sp"
- android:gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
-
- <ImageView
- android:id="@+id/pairing_pic"
- android:layout_width="@dimen/fast_pair_half_sheet_image_size"
- android:layout_height="@dimen/fast_pair_half_sheet_image_size"
- android:paddingTop="18dp"
- android:paddingBottom="18dp"
- android:importantForAccessibility="no"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/header_subtitle" />
-
- <Button
- android:id="@+id/connect_btn"
- android:text="@string/fast_pair_app_launch_button"
- android:layout_height="@dimen/fast_pair_connect_button_height"
- android:layout_width="@dimen/fast_pair_half_sheet_image_size"
- android:background="@color/fast_pair_half_sheet_button_color"
- android:paddingTop="6dp"
- android:paddingBottom="6dp"
- app:layout_constraintTop_toBottomOf="@+id/pairing_pic"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- style="@style/HalfSheetButton" />
-
- </android.support.constraint.ConstraintLayout>
-
-</android.support.v7.widget.LinearLayoutCompat>
diff --git a/nearby/halfsheet/res/values/strings.xml b/nearby/halfsheet/res/values/strings.xml
index a3a2b00..12e3c23 100644
--- a/nearby/halfsheet/res/values/strings.xml
+++ b/nearby/halfsheet/res/values/strings.xml
@@ -15,7 +15,7 @@
-->
<resources>
- <string name="app_name">Nearby HalfSheet Dialog</string>
+
<string name="common_done" description="After pairing process finish button text to dismiss halfsheet">Done</string>
<string name="common_save">Save</string>
<string name="common_connect" description="Button text to start connecting process">Connect</string>