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

Commit 5ac33e19 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Adding history view."

parents 7b0b9a13 c29ff002

packages/SystemUI/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-proto-files-under,src) $(call all-Iaidl-files-under, src) \

    src/com/android/systemui/EventLogTags.logtags



LOCAL_STATIC_JAVA_LIBRARIES := Keyguard

LOCAL_STATIC_JAVA_LIBRARIES := \

    Keyguard \

    android-support-v7-recyclerview

LOCAL_JAVA_LIBRARIES := telephony-common



LOCAL_PACKAGE_NAME := SystemUI

packages/SystemUI/res/layout/recents.xml

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ 
           android:layout_width="match_parent"

           android:layout_height="match_parent" />



    <!-- History View -->

    <ViewStub android:id="@+id/history_view_stub"

           android:layout="@layout/recents_history"

           android:layout_width="match_parent"

           android:layout_height="match_parent" />



    <!-- Nav Bar Scrim View -->

    <ImageView

        android:id="@+id/nav_bar_scrim"

packages/SystemUI/res/layout/recents_history.xml

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

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

-->

<com.android.systemui.recents.history.RecentsHistoryView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="#99000000"

    android:orientation="vertical">

    <TextView

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:padding="14dp"

        android:gravity="start"

        android:text="@string/recents_history_label"

        android:textSize="24sp"

        android:textColor="#FFFFFF"

        android:fontFamily="sans-serif-medium" />

    <android.support.v7.widget.RecyclerView

        android:id="@+id/list"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

</com.android.systemui.recents.history.RecentsHistoryView>
 
 No newline at end of file

packages/SystemUI/res/layout/recents_history_button.xml

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

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

-->

<TextView

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

    android:layout_width="match_parent"

    android:layout_height="@dimen/recents_history_button_height"

    android:gravity="start|center_vertical"

    android:text="@string/recents_show_history_button_label"

    android:textSize="14sp"

    android:textColor="#FFFFFF"

    android:textAllCaps="true"

    android:fontFamily="sans-serif-medium"

    android:visibility="invisible" />
 
 No newline at end of file

packages/SystemUI/res/layout/recents_history_date.xml

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

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

-->

<TextView

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

    android:theme="@android:style/Theme.Material"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="12dp"

    android:gravity="start"

    android:textSize="14sp"

    android:textColor="#009688"

    android:textAllCaps="true"

    android:fontFamily="sans-serif-medium"

    android:background="?android:selectableItemBackground"

    android:alpha="1" />
 
 No newline at end of file