diff options
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/Android.mk | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 40 | ||||
| -rw-r--r-- | core/res/res/anim/lock_screen_enter.xml | 24 | ||||
| -rw-r--r-- | core/res/res/anim/lock_screen_exit.xml | 3 | ||||
| -rw-r--r-- | core/res/res/drawable-hdpi/pickerbox_background.png | bin | 1131 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-hdpi/pickerbox_selected.9.png | bin | 2129 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-hdpi/pickerbox_unselected.9.png | bin | 1419 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/pickerbox_background.png | bin | 4226 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/pickerbox_selected.9.png | bin | 2155 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/pickerbox_unselected.9.png | bin | 1474 -> 0 bytes | |||
| -rw-r--r-- | core/res/res/drawable/pickerbox.xml | 21 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_sim_pin_portrait.xml | 93 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 18 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 1 |
14 files changed, 123 insertions, 79 deletions
diff --git a/core/res/Android.mk b/core/res/Android.mk index 78cb86d..7d11148 100644 --- a/core/res/Android.mk +++ b/core/res/Android.mk @@ -24,7 +24,7 @@ LOCAL_CERTIFICATE := platform # since these resources will be used by many apps. LOCAL_AAPT_FLAGS := -x -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional # Install this alongside the libraries. LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4a7adcc..c49a86a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -403,7 +403,13 @@ android:label="@string/permlab_recordAudio" android:description="@string/permdesc_recordAudio" /> - <!-- Required to be able to access the camera device. --> + <!-- Required to be able to access the camera device. + <p>This will automatically enforce the <a + href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code + <uses-feature>}</a> manifest element for <em>all</em> camera features. + If you do not require all camera features or can properly operate if a camera + is not available, then you must modify your manifest as appropriate in order to + install on devices that don't support all camera features.</p> --> <permission android:name="android.permission.CAMERA" android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" android:protectionLevel="dangerous" @@ -550,12 +556,30 @@ android:label="@string/permlab_changeConfiguration" android:description="@string/permdesc_changeConfiguration" /> - <!-- Allows an application to restart other applications. --> + <!-- @deprecated The {@link android.app.ActivityManager#restartPackage} + API is no longer supported. --> <permission android:name="android.permission.RESTART_PACKAGES" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="dangerous" - android:label="@string/permlab_restartPackages" - android:description="@string/permdesc_restartPackages" /> + android:protectionLevel="normal" + android:label="@string/permlab_killBackgroundProcesses" + android:description="@string/permdesc_killBackgroundProcesses" /> + + <!-- Allows an application to call + {@link android.app.ActivityManager#killBackgroundProcesses}. --> + <permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="normal" + android:label="@string/permlab_killBackgroundProcesses" + android:description="@string/permdesc_killBackgroundProcesses" /> + + <!-- Allows an application to call + {@link android.app.ActivityManager#forceStopPackage}. + @hide --> + <permission android:name="android.permission.FORCE_STOP_PACKAGES" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="signature" + android:label="@string/permlab_forceStopPackages" + android:description="@string/permdesc_forceStopPackages" /> <!-- Allows an application to retrieve state dump information from system services. --> @@ -1126,6 +1150,12 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signatureOrSystem" /> + <!-- Allow an application to read and write the cache partition. --> + <permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" + android:label="@string/permlab_cache_filesystem" + android:description="@string/permdesc_cache_filesystem" + android:protectionLevel="signatureOrSystem" /> + <application android:process="system" android:persistent="true" android:hasCode="false" diff --git a/core/res/res/anim/lock_screen_enter.xml b/core/res/res/anim/lock_screen_enter.xml new file mode 100644 index 0000000..dd47ff8 --- /dev/null +++ b/core/res/res/anim/lock_screen_enter.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2007, 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. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@anim/decelerate_interpolator"> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:duration="@android:integer/config_mediumAnimTime" /> +</set> diff --git a/core/res/res/anim/lock_screen_exit.xml b/core/res/res/anim/lock_screen_exit.xml index 58bc6db..077fc6b 100644 --- a/core/res/res/anim/lock_screen_exit.xml +++ b/core/res/res/anim/lock_screen_exit.xml @@ -17,7 +17,8 @@ */ --> -<set xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@anim/accelerate_interpolator"> +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:interpolator="@anim/accelerate_interpolator"> <alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="@android:integer/config_longAnimTime" /> </set> diff --git a/core/res/res/drawable-hdpi/pickerbox_background.png b/core/res/res/drawable-hdpi/pickerbox_background.png Binary files differdeleted file mode 100644 index 9315a31..0000000 --- a/core/res/res/drawable-hdpi/pickerbox_background.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/pickerbox_selected.9.png b/core/res/res/drawable-hdpi/pickerbox_selected.9.png Binary files differdeleted file mode 100644 index a88ec63..0000000 --- a/core/res/res/drawable-hdpi/pickerbox_selected.9.png +++ /dev/null diff --git a/core/res/res/drawable-hdpi/pickerbox_unselected.9.png b/core/res/res/drawable-hdpi/pickerbox_unselected.9.png Binary files differdeleted file mode 100644 index 9f6b7cb..0000000 --- a/core/res/res/drawable-hdpi/pickerbox_unselected.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/pickerbox_background.png b/core/res/res/drawable-mdpi/pickerbox_background.png Binary files differdeleted file mode 100644 index 6494cd8..0000000 --- a/core/res/res/drawable-mdpi/pickerbox_background.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/pickerbox_selected.9.png b/core/res/res/drawable-mdpi/pickerbox_selected.9.png Binary files differdeleted file mode 100644 index d986a31..0000000 --- a/core/res/res/drawable-mdpi/pickerbox_selected.9.png +++ /dev/null diff --git a/core/res/res/drawable-mdpi/pickerbox_unselected.9.png b/core/res/res/drawable-mdpi/pickerbox_unselected.9.png Binary files differdeleted file mode 100644 index 27ec6b9..0000000 --- a/core/res/res/drawable-mdpi/pickerbox_unselected.9.png +++ /dev/null diff --git a/core/res/res/drawable/pickerbox.xml b/core/res/res/drawable/pickerbox.xml deleted file mode 100644 index 9cb2436..0000000 --- a/core/res/res/drawable/pickerbox.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/pickerbox_selected" /> - <item android:drawable="@drawable/pickerbox_unselected" /> -</selector> - diff --git a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml index 45e96a3..2a23ada 100644 --- a/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml +++ b/core/res/res/layout/keyguard_screen_sim_pin_portrait.xml @@ -16,59 +16,55 @@ ** limitations under the License. */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" android:background="@android:color/background_dark" - > + android:gravity="center_horizontal"> <LinearLayout android:id="@+id/topDisplayGroup" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:orientation="vertical" - > + android:orientation="vertical"> <!-- header text ('Enter Pin Code') --> <TextView android:id="@+id/headerText" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="9dip" android:gravity="center" android:lines="2" - android:textAppearance="?android:attr/textAppearanceLarge" - /> + android:textAppearance="?android:attr/textAppearanceLarge"/> - <RelativeLayout + <!-- password entry --> + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginTop="18dip" + android:orientation="horizontal" android:layout_marginRight="6dip" android:layout_marginLeft="6dip" - android:background="@android:drawable/edit_text" - > + android:gravity="center_vertical" + android:background="@android:drawable/edit_text"> <!-- displays dots as user enters pin --> <TextView android:id="@+id/pinDisplay" - android:layout_width="wrap_content" - android:layout_height="64dip" - android:layout_centerInParent="true" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" android:maxLines="1" android:textAppearance="?android:attr/textAppearanceLargeInverse" android:textStyle="bold" android:inputType="textPassword" - /> + /> <ImageButton android:id="@+id/backspace" android:src="@android:drawable/ic_input_delete" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:layout_marginRight="1dip" - /> - </RelativeLayout> - + android:layout_marginRight="-3dip" + android:layout_marginBottom="-3dip" + /> + </LinearLayout> </LinearLayout> @@ -78,16 +74,14 @@ android:layout_height="wrap_content" android:layout_below="@id/topDisplayGroup" android:layout_marginTop="10dip" - android:orientation="vertical" - > + android:orientation="vertical"> <LinearLayout android:layout_width="fill_parent" android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" - android:orientation="horizontal" - > + android:orientation="horizontal"> <Button android:id="@+id/one" android:layout_width="0sp" @@ -125,8 +119,7 @@ android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" - android:orientation="horizontal" - > + android:orientation="horizontal"> <Button android:id="@+id/four" android:layout_width="0sp" @@ -164,8 +157,7 @@ android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" - android:orientation="horizontal" - > + android:orientation="horizontal"> <Button android:id="@+id/seven" android:layout_width="0sp" @@ -203,8 +195,7 @@ android:layout_height="64dip" android:layout_marginLeft="2dip" android:layout_marginRight="2dip" - android:orientation="horizontal" - > + android:orientation="horizontal"> <Button android:id="@+id/ok" android:layout_width="0sp" @@ -242,27 +233,33 @@ <!-- end keypad --> </LinearLayout> - - <!-- emergency call button --> - <Button - android:id="@+id/emergencyCall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_alignParentBottom="true" - android:drawableLeft="@android:drawable/ic_emergency" - android:drawablePadding="8dip" - android:text="@android:string/lockscreen_emergency_call" - /> - <!-- spacer below keypad --> <View android:id="@+id/spacerBottom" android:layout_width="fill_parent" android:layout_height="1dip" - android:layout_marginBottom="6dip" + android:layout_marginTop="6dip" android:layout_above="@id/emergencyCall" - android:background="@android:drawable/divider_horizontal_dark"/> + android:background="@android:drawable/divider_horizontal_dark" + /> + <!-- The emergency button should take the rest of the space and be centered vertically --> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:gravity="center" + android:orientation="vertical"> + + <!-- emergency call button --> + <Button + android:id="@+id/emergencyCall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:drawableLeft="@android:drawable/ic_emergency" + android:drawablePadding="8dip" + android:text="@android:string/lockscreen_emergency_call" + /> + </LinearLayout> -</RelativeLayout> +</LinearLayout> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index bc354c5..047115c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -462,10 +462,17 @@ size.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permlab_restartPackages">restart other applications</string> + <string name="permlab_killBackgroundProcesses">kill background processes</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_restartPackages">Allows an application to - forcibly restart other applications.</string> + <string name="permdesc_killBackgroundProcesses">Allows an application to + kill background processes of other applications, even if memory + isn\'t low.</string> + + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_forceStopPackages">force stop other applications</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_forceStopPackages">Allows an application to + forcibly stop other applications.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_forceBack">force application to close</string> @@ -1139,6 +1146,11 @@ <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_sdcardWrite">Allows an application to write to the SD card.</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permlab_cache_filesystem">access the cache filesystem</string> + <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> + <string name="permdesc_cache_filesystem">Allows an application to read and write the cache filesystem.</string> + <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip /> <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. --> <string-array name="phoneTypes"> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index b155769..f2b52d9 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -101,6 +101,7 @@ <!-- Standard animations for a non-full-screen window or activity. --> <style name="Animation.LockScreen"> + <item name="windowEnterAnimation">@anim/lock_screen_enter</item> <item name="windowExitAnimation">@anim/lock_screen_exit</item> </style> |
