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

Commit 9590f3d5 authored by Amith Yamasani's avatar Amith Yamasani Committed by The Android Open Source Project
Browse files

Automated import from //branches/cupcake/...@142029,142029

parent d1eaef30
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
@@ -79,6 +79,25 @@
            android:scrollbarStyle="outsideOverlay"
        />

        <ScrollView android:id="@android:id/empty"
                android:layout_width="fill_parent"
                android:layout_height="fill_parent"
                android:fillViewport="true">

            <TextView android:id="@+id/emptyText"
                android:layout_width="fill_parent"
                android:layout_height="wrap_content"
                android:text="@string/unknown"
                android:textSize="20sp"
                android:textColor="?android:attr/textColorSecondary"
                android:paddingLeft="10dip"
                android:paddingRight="10dip"
                android:paddingTop="10dip"
                android:gravity="center"
                android:lineSpacingMultiplier="0.92"/>

        </ScrollView>

        <View
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
+64 −52
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

package com.android.contacts;

import com.android.internal.telephony.CallerInfo;

import android.app.ListActivity;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -184,6 +186,15 @@ public class CallDetailActivity extends ListActivity implements
                        break;
                }
    
                if (mNumber.equals(CallerInfo.UNKNOWN_NUMBER) ||
                        mNumber.equals(CallerInfo.PRIVATE_NUMBER)) {
                    // List is empty, let the empty view show instead.
                    TextView emptyText = (TextView) findViewById(R.id.emptyText);
                    if (emptyText != null) {
                        emptyText.setText(mNumber.equals(CallerInfo.PRIVATE_NUMBER) 
                                ? R.string.private_num : R.string.unknown);
                    }
                } else {
                    // Perform a reverse-phonebook lookup to find the PERSON_ID
                    String callLabel = null;
                    Uri personUri = null;
@@ -239,6 +250,7 @@ public class CallDetailActivity extends ListActivity implements
                    
                    ViewAdapter adapter = new ViewAdapter(this, actions);
                    setListAdapter(adapter);
                }
            } else {
                // Something went wrong reading in our primary data, so we're going to
                // bail out and show error to users.