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

Commit a4d231da authored by Michael Chan's avatar Michael Chan Committed by Android (Google) Code Review
Browse files

Merge "Add opp Transfer history to avoid cluster of notificatoins To reduce... 

Merge "Add opp Transfer history to avoid cluster of notificatoins To reduce the cluster of Opp nofications, we introduce the concept of Opp transfer history. Only 2 notifications exist for finished opp transfers, one is for outbound transfers, and another is for inbound transfers. User can see all detailed items in corresponding screen when click the notification."
parents 9cd6142d bb3904d8

android/app/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        <activity android:name=".opp.BluetoothOppTransferHistory"

                  android:label=""

                  android:excludeFromRecents="true"

                  android:configChanges="orientation|keyboardHidden">

        </activity>

        <activity android:name=".pbap.BluetoothPbapActivity"

            android:excludeFromRecents="true"

            android:theme="@*android:style/Theme.Dialog.Alert">

android/app/res/layout/bluetooth_transfer_item.xml

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

<!--

/*

**

** Copyright 2010, 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.

*/

-->



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

    android:layout_width="fill_parent"

    android:layout_height="wrap_content">



    <ImageView android:id="@+id/transfer_icon"

        android:layout_width="@android:dimen/app_icon_size"

        android:layout_height="@android:dimen/app_icon_size"

        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:scaleType="fitCenter"

    />



    <TextView android:id="@+id/transfer_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:maxLines="1"

        android:layout_alignParentTop="true"

        android:layout_toRightOf="@id/transfer_icon"

        android:textAppearance="?android:attr/textAppearanceMedium"

    />



    <TextView android:id="@+id/targetdevice"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_toRightOf="@id/transfer_icon"

        android:layout_below="@id/transfer_title"

        android:maxLines="1"

        android:textAppearance="?android:attr/textAppearanceSmall"

    />



    <TextView android:id="@+id/complete_date"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:maxLines="1"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:layout_below="@id/targetdevice"

        android:layout_alignParentRight="true"

        android:visibility="gone"

    />



    <TextView android:id="@+id/complete_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/targetdevice"

        android:layout_toRightOf="@id/transfer_icon"

        android:layout_toLeftOf="@id/complete_date"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:visibility="gone"

    />

</RelativeLayout>

android/app/res/layout/bluetooth_transfers_page.xml

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

<!--

/*

**

** Copyright 2010, 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.

*/

-->

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

    <ListView

        android:id="@+id/list"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"/>

    <ViewStub

        android:id="@+id/empty"

        android:layout="@layout/no_transfers"

        android:layout_width="fill_parent"

        android:layout_height="fill_parent"/>

</merge>

android/app/res/layout/no_transfers.xml

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

<!-- Copyright (C) 2010 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="fill_parent"

    android:layout_height="fill_parent"

    android:text="@string/no_transfers"

    android:gravity="center"

    android:textStyle="bold"

    />

android/app/res/menu/transferhistory.xml

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

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

-->



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



    <item android:id="@+id/transfer_menu_clear_all"

        android:title="@string/transfer_menu_clear_all"

        android:icon="@*android:drawable/ic_menu_clear_playlist" />

</menu>