Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 636cc6ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "First commit of dynamic home page feature"""

parents dbb465fb 082f8ee9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
    androidx.preference_preference \
    androidx.recyclerview_recyclerview \
    androidx.legacy_legacy-preference-v14 \
    com.google.android.material_material \

LOCAL_JAVA_LIBRARIES := \
    bouncycastle \
+8 −1
Original line number Diff line number Diff line
@@ -123,12 +123,19 @@
                android:value="true" />
        </activity>

        <activity android:name=".SettingsHomepageActivity"
                  android:taskAffinity="com.android.settings.root"
                  android:label="@string/settings_label_launcher"
                  android:theme="@style/Theme.Settings.Home"
                  android:launchMode="singleTask">
        </activity>

        <!-- Alias for launcher activity only, as this belongs to each profile. -->
        <activity-alias android:name="Settings"
                android:taskAffinity="com.android.settings.root"
                android:label="@string/settings_label_launcher"
                android:launchMode="singleTask"
                android:targetActivity="Settings">
                android:targetActivity=".SettingsHomepageActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.DEFAULT" />
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
      android:fillColor="?android:attr/colorAccent"
      android:pathData="M4,13L4,13c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h0c-0.55,0 -1,0.45 -1,1v0C3,12.55 3.45,13 4,13zM4,17L4,17c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h0c-0.55,0 -1,0.45 -1,1v0C3,16.55 3.45,17 4,17zM4,9L4,9c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h0C3.45,7 3,7.45 3,8v0C3,8.55 3.45,9 4,9zM7,13h14v-2H7V13zM7,17h14v-2H7V17zM7,7v2h14V7H7z"/>
</vector>
+49 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2018 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/tools"
    android:id="@+id/search_bar_container"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="?android:attr/colorPrimary">
    <androidx.cardview.widget.CardView
        android:id="@+id/search_bar"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="@dimen/search_bar_margin"
        app:cardCornerRadius="@dimen/search_bar_corner_radius"
        app:cardBackgroundColor="?android:attr/colorBackground"
        app:cardElevation="@dimen/search_bar_card_elevation">
        <Toolbar
            android:id="@+id/search_action_bar"
            android:layout_width="match_parent"
            android:layout_height="@dimen/search_bar_height"
            android:background="?android:attr/selectableItemBackground"
            android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
            android:navigationIcon="@drawable/ic_search_24dp"
            android:theme="?android:attr/actionBarTheme">
            <TextView
                android:id="@+id/search_action_bar_title"
                style="@style/TextAppearance.SearchBar"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="@string/search_menu"/>
        </Toolbar>
    </androidx.cardview.widget.CardView>
</FrameLayout>
 No newline at end of file
+75 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
     Copyright (C) 2018 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<androidx.coordinatorlayout.widget.CoordinatorLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">

    <FrameLayout
        android:id="@id/main_content"
        android:layout_height="match_parent"
        android:layout_width="match_parent" />
    <RelativeLayout
        android:id="@+id/bottom_sheet"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="?android:attr/windowBackground"
        android:minHeight="@dimen/homepage_bottomsheet_height"
        app:layout_behavior="@string/bottom_sheet_behavior"
        app:behavior_peekHeight="@dimen/homepage_bottomsheet_height">

        <androidx.coordinatorlayout.widget.CoordinatorLayout
            android:id="@+id/bottom_area"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

            <com.google.android.material.floatingactionbutton.FloatingActionButton
                android:id="@+id/search_fab"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:src="@drawable/ic_search_24dp"
                app:backgroundTint="@android:color/white"
                app:layout_anchor="@id/bar" />

            <com.google.android.material.bottomappbar.BottomAppBar
                android:id="@+id/bar"
                android:layout_width="match_parent"
                android:layout_height="@dimen/homepage_bottombar_height"
                android:layout_alignParentTop="true"
                android:layout_marginTop="@dimen/homepage_bottombar_top_margin"
                android:clickable="true"
                app:fabAttached="true"
                app:fabAlignmentMode="end"
                app:fabCradleDiameter="@dimen/homepage_bottombar_fab_cradle"
                app:navigationIcon="@drawable/ic_list_24dp"
                style="@style/Widget.MaterialComponents.BottomAppBar" />
        </androidx.coordinatorlayout.widget.CoordinatorLayout>

        <include layout="@layout/search_bar"
                 android:visibility="invisible" />

        <FrameLayout
            android:id="@+id/bottom_sheet_fragment"
            android:layout_below="@id/bottom_area"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />

    </RelativeLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>
 No newline at end of file
Loading