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

Commit 4ae320e4 authored by Joel Galenson's avatar Joel Galenson
Browse files

Use the new app info header. 

Use the new app info header from SettingsLib that shows the app name
and icon and has buttons to control it.

For now I'm disabling those buttons, however, as I'm hoping to move
the existing functionality into SettingsLib rather than copy-pasting
it.

Bug: 63532550
Test: Open screens, see new header.
Change-Id: I412e62250931e88e7cfe3af74a6fad8677b63f81
parent a2c2e691

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ 
    SettingsLibRestrictedLockUtils \

    SettingsLibAppPreference \

    SettingsLibSearchWidget \

    SettingsLibSettingsSpinner

    SettingsLibSettingsSpinner \

    SettingsLayoutPreference \

    ActionButtonsPreference



LOCAL_STATIC_JAVA_LIBRARIES := \

    androidx.annotation_annotation

res/drawable/ic_delete.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  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="#FF000000"

        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,8h2v9h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v9h-2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_force_stop.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  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="#FF000000"

        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,8h2v9h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v9h-2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_open.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  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="#FF000000"

        android:pathData="M19,19H5V5h7V3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2V19zM14,3v2h3.59l-9.83,9.83l1.41,1.41L19,6.41V10h2V3H14z"/>

</vector>
 
 No newline at end of file

res/layout/app_permission.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    android:layout_height="wrap_content"

    android:orientation="vertical">



    <include layout="@layout/header" />

    <include layout="@layout/button_header" />



    <ScrollView

        android:layout_width="match_parent"