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

Commit 5ff16e18 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Add 'Recent Conversations' to the conversation page"

parents c91bcbd0 0aef57d6

res/drawable/ic_clear.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    android:viewportWidth="24"

    android:viewportHeight="24"

    android:width="24dp"

    android:height="24dp">

    android:height="24dp"

    android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12Z"

        android:fillColor="#FFFFFF" />

res/layout/conversations_clear_recents.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2020 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.

  -->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    <Button

        android:id="@+id/conversation_settings_clear_recents"

        style="@style/ActionPrimaryButton"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_marginEnd="@dimen/description_margin_sides"

        android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"

        android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"

        android:text="@string/conversation_settings_clear_recents"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>



</LinearLayout>
 
 No newline at end of file

res/layout/preference_widget_clear.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2020 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.

  -->



<!-- Settings button -->

<ImageView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/clear_button"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:paddingStart="?android:attr/listPreferredItemPaddingEnd"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:background="?android:attr/selectableItemBackground"

    android:scaleType="center"

    android:src="@drawable/ic_clear"

    android:contentDescription="@string/clear" />
 
 No newline at end of file

res/values/strings.xml

+10 −1
Original line number Diff line number Diff line
@@ -8535,11 +8535,20 @@ 
    <string name="important_conversations_summary">Show at top of conversation section</string>









    <!-- [CHAR LIMIT=100] preference category title -->









    <string name="other_conversations">Other conversations</string>









    <string name="other_conversations">Non-priority conversations</string>

















    <!-- summary for other conversations list -->









    <string name="other_conversations_summary">Conversations you\u2019ve made changes to</string>

















    <!-- [CHAR LIMIT=100] preference category title -->









    <string name="recent_conversations">Recent conversations</string>

















    <!-- [CHAR LIMIT=20] button title -->









    <string name="conversation_settings_clear_recents">Clear recents</string>

















    <!-- a11y string -->









    <string name="clear">Clear</string>

















    <!-- [CHAR LIMIT=100] Setting to automatically bubble all notifications from favorite conversations -->









    <string name="important_bubble">Bubble priority conversations</string>

































res/xml/conversation_list_settings.xml



+8
−2






























Original line number
Diff line number
Diff line







@@ -43,12 +43,18 @@







        </PreferenceCategory>









    </PreferenceCategory>





























    <!--Other conversations added here -->









    <!-- Non-priority modified conversations added here -->









    <PreferenceCategory









        android:title="@string/other_conversations"









        android:key="other_conversations"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















    <!-- Recent conversations added here -->









    <PreferenceCategory









        android:title="@string/recent_conversations"









        android:key="recent_conversations"









        settings:allowDividerAbove="true"









        settings:allowDividerBelow="false" />



















</PreferenceScreen>