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

Commit 395bfec8 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents 77ad8d8b 04c585e3

core/java/android/accounts/GrantCredentialsPermissionActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.view.ViewGroup; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.text.TextUtils;

import com.android.internal.R;



/**
@@ -59,7 +60,7 @@ public class GrantCredentialsPermissionActivity extends Activity implements View 


        TextView messageView = (TextView) getWindow().findViewById(R.id.message);

        String authTokenLabel = getIntent().getExtras().getString(EXTRAS_AUTH_TOKEN_LABEL);

        if (authTokenLabel.length() == 0) {

        if (TextUtils.isEmpty(authTokenLabel)) {

            CharSequence grantCredentialsPermissionFormat = getResources().getText(

                    R.string.grant_credentials_permission_message_desc);

            messageView.setText(String.format(grantCredentialsPermissionFormat.toString(),

core/java/android/os/LocalPowerManager.java

+2 −0
Original line number Diff line number Diff line
@@ -45,4 +45,6 @@ public interface LocalPowerManager { 


    // the same as the method on PowerManager

    public void userActivity(long time, boolean noChangeLights, int eventType);



    boolean isScreenOn();

}

core/java/com/android/internal/widget/SlidingTab.java

+23 −20
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ public class SlidingTab extends ViewGroup { 
        }



        void setHintText(int resId) {

            // TODO: Text should be blank if widget is vertical

            text.setText(resId);

        }
@@ -564,8 +563,10 @@ public class SlidingTab extends ViewGroup { 
     * @param resId

     */

    public void setLeftHintText(int resId) {

        if (isHorizontal()) {

            mLeftSlider.setHintText(resId);

        }

    }



    /**

     * Sets the right handle icon to a given resource.
@@ -592,8 +593,10 @@ public class SlidingTab extends ViewGroup { 
     * @param resId

     */

    public void setRightHintText(int resId) {

        if (isHorizontal()) {

            mRightSlider.setHintText(resId);

        }

    }



    /**

     * Triggers haptic feedback.

core/res/res/layout/keyguard_screen_sim_pin_portrait.xml

+3 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


    <LinearLayout android:id="@+id/topDisplayGroup"

        android:layout_width="fill_parent"

        android:layout_height="115dip"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:orientation="vertical"

            >
@@ -35,6 +35,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="9dip"

            android:gravity="center"

            android:lines="2"

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

            />

core/res/res/values-ar-rEG/donottranslate-cldr.xml

+2 −2
Original line number Diff line number Diff line
@@ -144,6 +144,6 @@ 
    <string name="same_month_mdy1_mdy2">%3$s-%8$s %2$s، %9$s</string>

    <string name="same_year_wday1_mdy1_wday2_mdy2">%1$s، %3$s %2$s - %6$s، %8$s %7$s، %9$s</string>

    <string name="short_format_month">%b</string>

    <string name="full_wday_month_day_no_year">E d MMMM</string>

    <string name="abbrev_wday_month_day_year">EEE، d MMMM y</string>

    <string name="full_wday_month_day_no_year">EEEE d MMMM</string>

    <string name="abbrev_wday_month_day_year">EEE، d MMMM yyyy</string>

</resources>