diff options
286 files changed, 11239 insertions, 3616 deletions
diff --git a/Android.mk b/Android.mk index 93e1c4f13928..5c57044a6eba 100644 --- a/Android.mk +++ b/Android.mk @@ -115,6 +115,7 @@ LOCAL_SRC_FILES += \ core/java/android/content/pm/IPackageMoveObserver.aidl \ core/java/android/content/pm/IPackageStatsObserver.aidl \ core/java/android/database/IContentObserver.aidl \ + core/java/android/hardware/IUsbManager.aidl \ core/java/android/net/IConnectivityManager.aidl \ core/java/android/net/INetworkManagementEventObserver.aidl \ core/java/android/net/IThrottleManager.aidl \ diff --git a/api/current.xml b/api/current.xml index 16984b53f2fd..bf5fb5adaa4b 100644 --- a/api/current.xml +++ b/api/current.xml @@ -111,6 +111,17 @@ visibility="public" > </field> +<field name="ACCESS_USB" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.permission.ACCESS_USB"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACCESS_WIFI_STATE" type="java.lang.String" transient="false" @@ -22680,6 +22691,19 @@ <parameter name="id" type="int"> </parameter> </method> +<method name="dispatchGenericMotionEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ev" type="android.view.MotionEvent"> +</parameter> +</method> <method name="dispatchKeyEvent" return="boolean" abstract="false" @@ -23510,6 +23534,19 @@ visibility="public" > </method> +<method name="onGenericMotionEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> <method name="onKeyDown" return="boolean" abstract="false" @@ -27506,6 +27543,19 @@ visibility="public" > </method> +<method name="dispatchGenericMotionEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="ev" type="android.view.MotionEvent"> +</parameter> +</method> <method name="dispatchKeyEvent" return="boolean" abstract="false" @@ -27861,6 +27911,19 @@ visibility="public" > </method> +<method name="onGenericMotionEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> <method name="onKeyDown" return="boolean" abstract="false" @@ -28744,6 +28807,29 @@ deprecated="not deprecated" visibility="public" > +<method name="completedDownload" + return="long" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="title" type="java.lang.String"> +</parameter> +<parameter name="description" type="java.lang.String"> +</parameter> +<parameter name="isMediaScannerScannable" type="boolean"> +</parameter> +<parameter name="mimeType" type="java.lang.String"> +</parameter> +<parameter name="path" type="java.lang.String"> +</parameter> +<parameter name="length" type="long"> +</parameter> +</method> <method name="enqueue" return="long" abstract="false" @@ -29147,6 +29233,17 @@ visibility="public" > </field> +<field name="INTENT_EXTRAS_SORT_BY_SIZE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.app.DownloadManager.extra_sortBySize"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="PAUSED_QUEUED_FOR_WIFI" type="int" transient="false" @@ -49139,6 +49236,17 @@ visibility="public" > </field> +<field name="USB_SERVICE" + type="java.lang.String" + transient="false" + volatile="false" + value=""usb"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="VIBRATOR_SERVICE" type="java.lang.String" transient="false" @@ -93987,6 +94095,1296 @@ > </field> </class> +<class name="UsbConstants" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<constructor name="UsbConstants" + type="android.hardware.UsbConstants" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<field name="USB_CLASS_APP_SPEC" + type="int" + transient="false" + volatile="false" + value="254" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_AUDIO" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_CDC_DATA" + type="int" + transient="false" + volatile="false" + value="10" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_COMM" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_CONTENT_SEC" + type="int" + transient="false" + volatile="false" + value="13" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_CSCID" + type="int" + transient="false" + volatile="false" + value="11" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_HID" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_HUB" + type="int" + transient="false" + volatile="false" + value="9" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_MASS_STORAGE" + type="int" + transient="false" + volatile="false" + value="8" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_MISC" + type="int" + transient="false" + volatile="false" + value="239" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_PER_INTERFACE" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_PHYSICA" + type="int" + transient="false" + volatile="false" + value="5" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_PRINTER" + type="int" + transient="false" + volatile="false" + value="7" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_STILL_IMAGE" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_VENDOR_SPEC" + type="int" + transient="false" + volatile="false" + value="255" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_VIDEO" + type="int" + transient="false" + volatile="false" + value="14" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CLASS_WIRELESS_CONTROLLER" + type="int" + transient="false" + volatile="false" + value="224" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_DIR_IN" + type="int" + transient="false" + volatile="false" + value="128" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_DIR_OUT" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_DIR_MASK" + type="int" + transient="false" + volatile="false" + value="128" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_NUMBER_MASK" + type="int" + transient="false" + volatile="false" + value="15" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_XFERTYPE_MASK" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_XFER_BULK" + type="int" + transient="false" + volatile="false" + value="2" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_XFER_CONTROL" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_XFER_INT" + type="int" + transient="false" + volatile="false" + value="3" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_ENDPOINT_XFER_ISOC" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_SUBCLASS_VENDOR_SPEC" + type="int" + transient="false" + volatile="false" + value="255" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_TYPE_CLASS" + type="int" + transient="false" + volatile="false" + value="32" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_TYPE_MASK" + type="int" + transient="false" + volatile="false" + value="96" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_TYPE_RESERVED" + type="int" + transient="false" + volatile="false" + value="96" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_TYPE_STANDARD" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_TYPE_VENDOR" + type="int" + transient="false" + volatile="false" + value="64" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="UsbDevice" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<method name="bulkTransfer" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="endpoint" type="android.hardware.UsbEndpoint"> +</parameter> +<parameter name="buffer" type="byte[]"> +</parameter> +<parameter name="length" type="int"> +</parameter> +<parameter name="timeout" type="int"> +</parameter> +</method> +<method name="claimInterface" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="intf" type="android.hardware.UsbInterface"> +</parameter> +<parameter name="force" type="boolean"> +</parameter> +</method> +<method name="close" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="controlTransfer" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="requestType" type="int"> +</parameter> +<parameter name="request" type="int"> +</parameter> +<parameter name="value" type="int"> +</parameter> +<parameter name="index" type="int"> +</parameter> +<parameter name="buffer" type="byte[]"> +</parameter> +<parameter name="length" type="int"> +</parameter> +<parameter name="timeout" type="int"> +</parameter> +</method> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDeviceClass" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDeviceId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDeviceId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="name" type="java.lang.String"> +</parameter> +</method> +<method name="getDeviceName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDeviceName" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="id" type="int"> +</parameter> +</method> +<method name="getDeviceProtocol" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDeviceSubclass" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getFileDescriptor" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInterface" + return="android.hardware.UsbInterface" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +</method> +<method name="getInterfaceCount" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getProductId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getSerial" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getVendorId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="releaseInterface" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="intf" type="android.hardware.UsbInterface"> +</parameter> +</method> +<method name="requestWait" + return="android.hardware.UsbRequest" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parcel" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="UsbEndpoint" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getAddress" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getAttributes" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDevice" + return="android.hardware.UsbDevice" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDirection" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getEndpointNumber" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInterface" + return="android.hardware.UsbInterface" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInterval" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getMaxPacketSize" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getType" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parcel" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="UsbInterface" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<implements name="android.os.Parcelable"> +</implements> +<method name="describeContents" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getDevice" + return="android.hardware.UsbDevice" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getEndpoint" + return="android.hardware.UsbEndpoint" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="index" type="int"> +</parameter> +</method> +<method name="getEndpointCount" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getId" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInterfaceClass" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInterfaceProtocol" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getInterfaceSubclass" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="writeToParcel" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="parcel" type="android.os.Parcel"> +</parameter> +<parameter name="flags" type="int"> +</parameter> +</method> +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="UsbManager" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<method name="getDeviceList" + return="java.util.HashMap<java.lang.String, android.hardware.UsbDevice>" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="isFunctionEnabled" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="function" type="java.lang.String"> +</parameter> +</method> +<method name="isFunctionSupported" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="function" type="java.lang.String"> +</parameter> +</method> +<method name="openDevice" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="device" type="android.hardware.UsbDevice"> +</parameter> +</method> +<field name="ACTION_USB_DEVICE_ATTACHED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.action.USB_DEVICE_ATTACHED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_USB_DEVICE_DETACHED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.action.USB_DEVICE_DETACHED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_USB_STATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.action.USB_STATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_DEVICE" + type="java.lang.String" + transient="false" + volatile="false" + value=""device"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_DEVICE_CLASS" + type="java.lang.String" + transient="false" + volatile="false" + value=""device_class"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_DEVICE_NAME" + type="java.lang.String" + transient="false" + volatile="false" + value=""device_name"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_DEVICE_PROTOCOL" + type="java.lang.String" + transient="false" + volatile="false" + value=""device_protocol"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_DEVICE_SUBCLASS" + type="java.lang.String" + transient="false" + volatile="false" + value=""device_subclass"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_PRODUCT_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""product_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_VENDOR_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""vendor_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CONFIGURATION" + type="java.lang.String" + transient="false" + volatile="false" + value=""configuration"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_CONNECTED" + type="java.lang.String" + transient="false" + volatile="false" + value=""connected"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_FUNCTION_ADB" + type="java.lang.String" + transient="false" + volatile="false" + value=""adb"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_FUNCTION_DISABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""disabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_FUNCTION_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""enabled"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_FUNCTION_MASS_STORAGE" + type="java.lang.String" + transient="false" + volatile="false" + value=""mass_storage"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_FUNCTION_MTP" + type="java.lang.String" + transient="false" + volatile="false" + value=""mtp"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="USB_FUNCTION_RNDIS" + type="java.lang.String" + transient="false" + volatile="false" + value=""rndis"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +</class> +<class name="UsbRequest" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<constructor name="UsbRequest" + type="android.hardware.UsbRequest" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</constructor> +<method name="cancel" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="close" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getClientData" + return="java.lang.Object" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="getEndpoint" + return="android.hardware.UsbEndpoint" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +<method name="initialize" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="endpoint" type="android.hardware.UsbEndpoint"> +</parameter> +</method> +<method name="queue" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="buffer" type="java.nio.ByteBuffer"> +</parameter> +<parameter name="length" type="int"> +</parameter> +</method> +<method name="setClientData" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="data" type="java.lang.Object"> +</parameter> +</method> +</class> </package> <package name="android.inputmethodservice" > @@ -112507,6 +113905,71 @@ <parameter name="uid" type="int"> </parameter> </method> +<method name="getUidRxPackets" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidTcpRxBytes" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidTcpRxSegments" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidTcpTxBytes" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidTcpTxSegments" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> <method name="getUidTxBytes" return="long" abstract="false" @@ -112520,6 +113983,71 @@ <parameter name="uid" type="int"> </parameter> </method> +<method name="getUidTxPackets" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidUdpRxBytes" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidUdpRxPackets" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidUdpTxBytes" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> +<method name="getUidUdpTxPackets" + return="long" + abstract="false" + native="true" + synchronized="false" + static="true" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="uid" type="int"> +</parameter> +</method> <field name="UNSUPPORTED" type="int" transient="false" @@ -194328,10 +195856,10 @@ synchronized="false" static="true" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > -<parameter name="addr" type="int"> +<parameter name="ipv4Address" type="int"> </parameter> </method> <method name="formatShortFileSize" @@ -207301,6 +208829,17 @@ visibility="public" > </field> +<field name="SOURCE_CLASS_JOYSTICK" + type="int" + transient="false" + volatile="false" + value="16" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SOURCE_CLASS_MASK" type="int" transient="false" @@ -207356,6 +208895,28 @@ visibility="public" > </field> +<field name="SOURCE_GAMEPAD" + type="int" + transient="false" + volatile="false" + value="1025" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SOURCE_JOYSTICK" + type="int" + transient="false" + volatile="false" + value="16777232" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SOURCE_KEYBOARD" type="int" transient="false" @@ -209198,6 +210759,182 @@ visibility="public" > </field> +<field name="KEYCODE_BUTTON_1" + type="int" + transient="false" + volatile="false" + value="188" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_10" + type="int" + transient="false" + volatile="false" + value="197" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_11" + type="int" + transient="false" + volatile="false" + value="198" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_12" + type="int" + transient="false" + volatile="false" + value="199" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_13" + type="int" + transient="false" + volatile="false" + value="200" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_14" + type="int" + transient="false" + volatile="false" + value="201" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_15" + type="int" + transient="false" + volatile="false" + value="202" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_16" + type="int" + transient="false" + volatile="false" + value="203" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_2" + type="int" + transient="false" + volatile="false" + value="189" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_3" + type="int" + transient="false" + volatile="false" + value="190" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_4" + type="int" + transient="false" + volatile="false" + value="191" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_5" + type="int" + transient="false" + volatile="false" + value="192" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_6" + type="int" + transient="false" + volatile="false" + value="193" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_7" + type="int" + transient="false" + volatile="false" + value="194" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_8" + type="int" + transient="false" + volatile="false" + value="195" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="KEYCODE_BUTTON_9" + type="int" + transient="false" + volatile="false" + value="196" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="KEYCODE_BUTTON_A" type="int" transient="false" @@ -216315,6 +218052,19 @@ <parameter name="canvas" type="android.graphics.Canvas"> </parameter> </method> +<method name="dispatchGenericMotionEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> <method name="dispatchKeyEvent" return="boolean" abstract="false" @@ -218470,6 +220220,19 @@ <parameter name="previouslyFocusedRect" type="android.graphics.Rect"> </parameter> </method> +<method name="onGenericMotionEvent" + return="boolean" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> <method name="onKeyDown" return="boolean" abstract="false" @@ -220330,6 +222093,17 @@ visibility="public" > </method> +<field name="DRAG_FLAG_GLOBAL" + type="int" + transient="false" + volatile="false" + value="1" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="DRAWING_CACHE_QUALITY_AUTO" type="int" transient="false" @@ -225484,6 +227258,19 @@ <parameter name="hardwareAccelerated" type="boolean"> </parameter> </method> +<method name="superDispatchGenericMotionEvent" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> <method name="superDispatchKeyEvent" return="boolean" abstract="true" @@ -225829,6 +227616,19 @@ deprecated="not deprecated" visibility="public" > +<method name="dispatchGenericMotionEvent" + return="boolean" + abstract="true" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="event" type="android.view.MotionEvent"> +</parameter> +</method> <method name="dispatchKeyEvent" return="boolean" abstract="true" diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index b1b7715a8aab..f74e3c83b2cd 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -143,7 +143,7 @@ static void dumpstate() { dump_file("BINDER STATS", "/sys/kernel/debug/binder/stats"); dump_file("BINDER STATE", "/sys/kernel/debug/binder/state"); - run_command("FILESYSTEMS & FREE SPACE", 10, "df", NULL); + run_command("FILESYSTEMS & FREE SPACE", 10, "su", "root", "df", NULL); dump_file("PACKAGE SETTINGS", "/data/system/packages.xml"); dump_file("PACKAGE UID ERRORS", "/data/system/uiderrors.txt"); diff --git a/cmds/dumpstate/utils.c b/cmds/dumpstate/utils.c index f92acbbbf332..b2f9e800dca7 100644 --- a/cmds/dumpstate/utils.c +++ b/cmds/dumpstate/utils.c @@ -167,6 +167,7 @@ int run_command(const char *title, int timeout_seconds, const char *command, ... execvp(command, (char**) args); printf("*** exec(%s): %s\n", command, strerror(errno)); + fflush(stdout); _exit(-1); } @@ -178,7 +179,7 @@ int run_command(const char *title, int timeout_seconds, const char *command, ... if (p == pid) { if (WIFSIGNALED(status)) { printf("*** %s: Killed by signal %d\n", command, WTERMSIG(status)); - } else if (WEXITSTATUS(status) > 0) { + } else if (WIFEXITED(status) && WEXITSTATUS(status) > 0) { printf("*** %s: Exit code %d\n", command, WEXITSTATUS(status)); } if (title) printf("[%s: %.1fs elapsed]\n\n", command, elapsed); diff --git a/cmds/servicemanager/service_manager.c b/cmds/servicemanager/service_manager.c index ba7f807eb6ac..2df450f34def 100644 --- a/cmds/servicemanager/service_manager.c +++ b/cmds/servicemanager/service_manager.c @@ -34,7 +34,6 @@ static struct { { AID_MEDIA, "media.player" }, { AID_MEDIA, "media.camera" }, { AID_MEDIA, "media.audio_policy" }, - { AID_DRMIO, "drm.drmIOService" }, { AID_DRM, "drm.drmManager" }, { AID_NFC, "nfc" }, { AID_RADIO, "radio.phone" }, diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 8b6b819ad7b2..04d839db2c07 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -2109,7 +2109,39 @@ public class Activity extends ContextThemeWrapper public boolean onTrackballEvent(MotionEvent event) { return false; } - + + /** + * Called when a generic motion event was not handled by any of the + * views inside of the activity. + * <p> + * Generic motion events are dispatched to the focused view to describe + * the motions of input devices such as joysticks. The + * {@link MotionEvent#getSource() source} of the motion event specifies + * the class of input that was received. Implementations of this method + * must examine the bits in the source before processing the event. + * The following code example shows how this is done. + * </p> + * <code> + * public boolean onGenericMotionEvent(MotionEvent event) { + * if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { + * float x = event.getX(); + * float y = event.getY(); + * // process the joystick motion + * return true; + * } + * return super.onGenericMotionEvent(event); + * } + * </code> + * + * @param event The generic motion event being processed. + * + * @return Return true if you have consumed the event, false if you haven't. + * The default implementation always returns false. + */ + public boolean onGenericMotionEvent(MotionEvent event) { + return false; + } + /** * Called whenever a key, touch, or trackball event is dispatched to the * activity. Implement this method if you wish to know that the user has @@ -2292,6 +2324,24 @@ public class Activity extends ContextThemeWrapper return onTrackballEvent(ev); } + /** + * Called to process generic motion events. You can override this to + * intercept all generic motion events before they are dispatched to the + * window. Be sure to call this implementation for generic motion events + * that should be handled normally. + * + * @param ev The generic motion event. + * + * @return boolean Return true if this event was consumed. + */ + public boolean dispatchGenericMotionEvent(MotionEvent ev) { + onUserInteraction(); + if (getWindow().superDispatchGenericMotionEvent(ev)) { + return true; + } + return onGenericMotionEvent(ev); + } + public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { event.setClassName(getClass().getName()); event.setPackageName(getPackageName()); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 6f639906097d..8737e93495c9 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -41,7 +41,9 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase.CursorFactory; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; +import android.hardware.IUsbManager; import android.hardware.SensorManager; +import android.hardware.UsbManager; import android.location.CountryDetector; import android.location.ICountryDetector; import android.location.ILocationManager; @@ -399,6 +401,12 @@ class ContextImpl extends Context { return new UiModeManager(); }}); + registerService(USB_SERVICE, new StaticServiceFetcher() { + public Object createStaticService() { + IBinder b = ServiceManager.getService(USB_SERVICE); + return new UsbManager(IUsbManager.Stub.asInterface(b)); + }}); + registerService(VIBRATOR_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { return new Vibrator(); diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index 23d4065622ac..de5d6a1bdf18 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -620,7 +620,39 @@ public class Dialog implements DialogInterface, Window.Callback, public boolean onTrackballEvent(MotionEvent event) { return false; } - + + /** + * Called when a generic motion event was not handled by any of the + * views inside of the dialog. + * <p> + * Generic motion events are dispatched to the focused view to describe + * the motions of input devices such as joysticks. The + * {@link MotionEvent#getSource() source} of the motion event specifies + * the class of input that was received. Implementations of this method + * must examine the bits in the source before processing the event. + * The following code example shows how this is done. + * </p> + * <code> + * public boolean onGenericMotionEvent(MotionEvent event) { + * if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { + * float x = event.getX(); + * float y = event.getY(); + * // process the joystick motion + * return true; + * } + * return super.onGenericMotionEvent(event); + * } + * </code> + * + * @param event The generic motion event being processed. + * + * @return Return true if you have consumed the event, false if you haven't. + * The default implementation always returns false. + */ + public boolean onGenericMotionEvent(MotionEvent event) { + return false; + } + public void onWindowAttributesChanged(WindowManager.LayoutParams params) { if (mDecor != null) { mWindowManager.updateViewLayout(mDecor, params); @@ -709,6 +741,23 @@ public class Dialog implements DialogInterface, Window.Callback, return onTrackballEvent(ev); } + /** + * Called to process generic motion events. You can override this to + * intercept all generic motion events before they are dispatched to the + * window. Be sure to call this implementation for generic motion events + * that should be handled normally. + * + * @param ev The generic motion event. + * + * @return boolean Return true if this event was consumed. + */ + public boolean dispatchGenericMotionEvent(MotionEvent ev) { + if (mWindow.superDispatchGenericMotionEvent(ev)) { + return true; + } + return onGenericMotionEvent(ev); + } + public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { event.setClassName(getClass().getName()); event.setPackageName(mContext.getPackageName()); diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index 297d24604d00..e82bad70d3b0 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -24,13 +24,12 @@ import android.database.Cursor; import android.database.CursorWrapper; import android.net.ConnectivityManager; import android.net.Uri; -import android.os.Binder; import android.os.Environment; import android.os.ParcelFileDescriptor; import android.provider.Downloads; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; -import android.util.Log; +import android.text.TextUtils; import android.util.Pair; import java.io.File; @@ -53,7 +52,6 @@ import java.util.List; * download in a notification or from the downloads UI. */ public class DownloadManager { - private static final String TAG = "DownloadManager"; /** * An identifier for a particular download, unique across the system. Clients use this ID to @@ -268,6 +266,13 @@ public class DownloadManager { public final static String ACTION_VIEW_DOWNLOADS = "android.intent.action.VIEW_DOWNLOADS"; /** + * Intent extra included with {@link #ACTION_VIEW_DOWNLOADS} to start DownloadApp in + * sort-by-size mode. + */ + public final static String INTENT_EXTRAS_SORT_BY_SIZE = + "android.app.DownloadManager.extra_sortBySize"; + + /** * Intent extra included with {@link #ACTION_DOWNLOAD_COMPLETE} intents, indicating the ID (as a * long) of the download that just completed. */ @@ -387,6 +392,10 @@ public class DownloadManager { mUri = uri; } + Request(String uriString) { + mUri = Uri.parse(uriString); + } + /** * Set the local destination for the downloaded file. Must be a file URI to a path on * external storage, and the calling application must have the WRITE_EXTERNAL_STORAGE @@ -1070,6 +1079,68 @@ public class DownloadManager { return null; } } + + /** + * Adds a file to the downloads database system, so it could appear in Downloads App + * (and thus become eligible for management by the Downloads App). + * <p> + * It is helpful to make the file scannable by MediaScanner by setting the param + * isMediaScannerScannable to true. It makes the file visible in media managing + * applications such as Gallery App, which could be a useful purpose of using this API. + * + * @param title the title that would appear for this file in Downloads App. + * @param description the description that would appear for this file in Downloads App. + * @param isMediaScannerScannable true if the file is to be scanned by MediaScanner. Files + * scanned by MediaScanner appear in the applications used to view media (for example, + * Gallery app). + * @param mimeType mimetype of the file. + * @param path absolute pathname to the file. The file should be world-readable, so that it can + * be managed by the Downloads App and any other app that is used to read it (for example, + * Gallery app to display the file, if the file contents represent a video/image). + * @param length length of the downloaded file + * @return an ID for the download entry added to the downloads app, unique across the system + * This ID is used to make future calls related to this download. + */ + public long completedDownload(String title, String description, + boolean isMediaScannerScannable, String mimeType, String path, long length) { + // make sure the input args are non-null/non-zero + validateArgumentIsNonEmpty("title", title); + validateArgumentIsNonEmpty("description", description); + validateArgumentIsNonEmpty("path", path); + validateArgumentIsNonEmpty("mimeType", mimeType); + if (length <= 0) { + throw new IllegalArgumentException(" invalid value for param: totalBytes"); + } + + // if there is already an entry with the given path name in downloads.db, return its id + Request request = new Request(NON_DOWNLOADMANAGER_DOWNLOAD) + .setTitle(title) + .setDescription(description) + .setMimeType(mimeType); + ContentValues values = request.toContentValues(null); + values.put(Downloads.Impl.COLUMN_DESTINATION, + Downloads.Impl.DESTINATION_NON_DOWNLOADMANAGER_DOWNLOAD); + values.put(Downloads.Impl._DATA, path); + values.put(Downloads.Impl.COLUMN_STATUS, Downloads.Impl.STATUS_SUCCESS); + values.put(Downloads.Impl.COLUMN_TOTAL_BYTES, length); + values.put(Downloads.Impl.COLUMN_MEDIA_SCANNED, + (isMediaScannerScannable) ? Request.SCANNABLE_VALUE_YES : + Request.SCANNABLE_VALUE_NO); + Uri downloadUri = mResolver.insert(Downloads.Impl.CONTENT_URI, values); + if (downloadUri == null) { + return -1; + } + return Long.parseLong(downloadUri.getLastPathSegment()); + } + private static final String NON_DOWNLOADMANAGER_DOWNLOAD = + "non-dwnldmngr-download-dont-retry2download"; + + private static void validateArgumentIsNonEmpty(String paramName, String val) { + if (TextUtils.isEmpty(val)) { + throw new IllegalArgumentException(paramName + " can't be null"); + } + } + /** * Get the DownloadProvider URI for the download with the given ID. */ @@ -1144,7 +1215,8 @@ public class DownloadManager { private String getLocalUri() { long destinationType = getLong(getColumnIndex(Downloads.Impl.COLUMN_DESTINATION)); if (destinationType == Downloads.Impl.DESTINATION_FILE_URI || - destinationType == Downloads.Impl.DESTINATION_EXTERNAL) { + destinationType == Downloads.Impl.DESTINATION_EXTERNAL || + destinationType == Downloads.Impl.DESTINATION_NON_DOWNLOADMANAGER_DOWNLOAD) { String localPath = getString(getColumnIndex(COLUMN_LOCAL_FILENAME)); if (localPath == null) { return null; diff --git a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java index 7b083f10e2bd..aa1adcbbc2a8 100644 --- a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java +++ b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java @@ -18,7 +18,7 @@ package android.bluetooth; import android.content.Context; import android.net.ConnectivityManager; -import android.net.DhcpInfo; +import android.net.DhcpInfoInternal; import android.net.LinkAddress; import android.net.LinkCapabilities; import android.net.LinkProperties; @@ -251,23 +251,12 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker { public void run() { //TODO(): Add callbacks for failure and success case. //Currently this thread runs independently. - DhcpInfo dhcpInfo = new DhcpInfo(); - if (!NetworkUtils.runDhcp(mIface, dhcpInfo)) { + DhcpInfoInternal dhcpInfoInternal = new DhcpInfoInternal(); + if (!NetworkUtils.runDhcp(mIface, dhcpInfoInternal)) { Log.e(TAG, "DHCP request error:" + NetworkUtils.getDhcpError()); return; } - mLinkProperties.addLinkAddress(new LinkAddress( - NetworkUtils.intToInetAddress(dhcpInfo.ipAddress), - NetworkUtils.intToInetAddress(dhcpInfo.netmask))); - mLinkProperties.setGateway(NetworkUtils.intToInetAddress(dhcpInfo.gateway)); - InetAddress dns1Addr = NetworkUtils.intToInetAddress(dhcpInfo.dns1); - if (dns1Addr == null || dns1Addr.equals("0.0.0.0")) { - mLinkProperties.addDns(dns1Addr); - } - InetAddress dns2Addr = NetworkUtils.intToInetAddress(dhcpInfo.dns2); - if (dns2Addr == null || dns2Addr.equals("0.0.0.0")) { - mLinkProperties.addDns(dns2Addr); - } + mLinkProperties = dhcpInfoInternal.makeLinkProperties(); mLinkProperties.setInterfaceName(mIface); mNetworkInfo.setIsAvailable(true); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index d14cf4d56fc1..051ae9e6a827 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1663,6 +1663,16 @@ public abstract class Context { public static final String SIP_SERVICE = "sip"; /** + * Use with {@link #getSystemService} to retrieve a {@link + * android.hardware.UsbManager} for access to USB devices (as a USB host) + * and for controlling this device's behavior as a USB device. + * + * @see #getSystemService + * @see android.harware.UsbManager + */ + public static final String USB_SERVICE = "usb"; + + /** * Determine whether the given permission is allowed for a particular * process and user ID running in the system. * diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 6e3663e341d5..e7b96e7f4098 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -2794,7 +2794,7 @@ public class Intent implements Parcelable, Cloneable { * @param action The Intent action, such as ACTION_VIEW. */ public Intent(String action) { - mAction = action; + setAction(action); } /** @@ -2814,7 +2814,7 @@ public class Intent implements Parcelable, Cloneable { * @param uri The Intent data URI. */ public Intent(String action, Uri uri) { - mAction = action; + setAction(action); mData = uri; } @@ -2863,7 +2863,7 @@ public class Intent implements Parcelable, Cloneable { */ public Intent(String action, Uri uri, Context packageContext, Class<?> cls) { - mAction = action; + setAction(action); mData = uri; mComponent = new ComponentName(packageContext, cls); } @@ -2985,7 +2985,7 @@ public class Intent implements Parcelable, Cloneable { // action if (uri.startsWith("action=", i)) { - intent.mAction = value; + intent.setAction(value); } // categories @@ -4061,7 +4061,7 @@ public class Intent implements Parcelable, Cloneable { * @see #getAction */ public Intent setAction(String action) { - mAction = action; + mAction = action != null ? action.intern() : null; return this; } @@ -4165,7 +4165,7 @@ public class Intent implements Parcelable, Cloneable { if (mCategories == null) { mCategories = new HashSet<String>(); } - mCategories.add(category); + mCategories.add(category.intern()); return this; } @@ -5678,7 +5678,7 @@ public class Intent implements Parcelable, Cloneable { } public void readFromParcel(Parcel in) { - mAction = in.readString(); + setAction(in.readString()); mData = Uri.CREATOR.createFromParcel(in); mType = in.readString(); mFlags = in.readInt(); @@ -5694,7 +5694,7 @@ public class Intent implements Parcelable, Cloneable { mCategories = new HashSet<String>(); int i; for (i=0; i<N; i++) { - mCategories.add(in.readString()); + mCategories.add(in.readString().intern()); } } else { mCategories = null; diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 452fd8ae8d6a..61d74248c6be 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -461,7 +461,7 @@ public class IntentFilter implements Parcelable { * @return True if the action is explicitly mentioned in the filter. */ public final boolean hasAction(String action) { - return mActions.contains(action); + return action != null && mActions.contains(action); } /** @@ -470,14 +470,10 @@ public class IntentFilter implements Parcelable { * * @param action The desired action to look for. * - * @return True if the action is listed in the filter or the filter does - * not specify any actions. + * @return True if the action is listed in the filter. */ public final boolean matchAction(String action) { - if (action == null || mActions == null || mActions.size() == 0) { - return false; - } - return mActions.contains(action); + return hasAction(action); } /** @@ -818,9 +814,9 @@ public class IntentFilter implements Parcelable { if (mDataPaths == null) { return false; } - Iterator<PatternMatcher> i = mDataPaths.iterator(); - while (i.hasNext()) { - final PatternMatcher pe = i.next(); + final int numDataPaths = mDataPaths.size(); + for (int i = 0; i < numDataPaths; i++) { + final PatternMatcher pe = mDataPaths.get(i); if (pe.match(data)) { return true; } @@ -849,9 +845,9 @@ public class IntentFilter implements Parcelable { if (mDataAuthorities == null) { return NO_MATCH_DATA; } - Iterator<AuthorityEntry> i = mDataAuthorities.iterator(); - while (i.hasNext()) { - final AuthorityEntry ae = i.next(); + final int numDataAuthorities = mDataAuthorities.size(); + for (int i = 0; i < numDataAuthorities; i++) { + final AuthorityEntry ae = mDataAuthorities.get(i); int match = ae.match(data); if (match >= 0) { return match; @@ -1098,7 +1094,7 @@ public class IntentFilter implements Parcelable { */ public final int match(String action, String type, String scheme, Uri data, Set<String> categories, String logTag) { - if (action != null && !matchAction(action)) { + if (!matchAction(action)) { if (Config.LOGV) Log.v( logTag, "No matching action " + action + " for " + this); return NO_MATCH_ACTION; @@ -1119,11 +1115,11 @@ public class IntentFilter implements Parcelable { return dataMatch; } - String categoryMatch = matchCategories(categories); - if (categoryMatch != null) { - if (Config.LOGV) Log.v( - logTag, "No matching category " - + categoryMatch + " for " + this); + String categoryMismatch = matchCategories(categories); + if (categoryMismatch != null) { + if (Config.LOGV) { + Log.v(logTag, "No matching category " + categoryMismatch + " for " + this); + } return NO_MATCH_CATEGORY; } @@ -1469,9 +1465,9 @@ public class IntentFilter implements Parcelable { if (typeLength == slashpos+2 && type.charAt(slashpos+1) == '*') { // Need to look through all types for one that matches // our base... - final Iterator<String> it = t.iterator(); - while (it.hasNext()) { - String v = it.next(); + final int numTypes = t.size(); + for (int i = 0; i < numTypes; i++) { + final String v = t.get(i); if (type.regionMatches(0, v, 0, slashpos+1)) { return true; } diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 68cb2bcca9ca..659b9379ebe4 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -1406,6 +1406,7 @@ public class SyncManager implements OnAccountsUpdateListener { public void handleMessage(Message msg) { long earliestFuturePollTime = Long.MAX_VALUE; long nextPendingSyncTime = Long.MAX_VALUE; + // Setting the value here instead of a method because we want the dumpsys logs // to have the most recent value used. try { diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 7676258b4659..e8292cc15004 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3085,11 +3085,7 @@ public class PackageParser { if (!sCompatibilityModeEnabled) { ai.disableCompatibilityMode(); } - if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED) { - ai.enabled = true; - } else if (p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) { - ai.enabled = false; - } + ai.enabled = p.mSetEnabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED; return ai; } diff --git a/core/java/android/database/sqlite/SQLiteCompiledSql.java b/core/java/android/database/sqlite/SQLiteCompiledSql.java index feea47e32e65..bdb96b17f86f 100644 --- a/core/java/android/database/sqlite/SQLiteCompiledSql.java +++ b/core/java/android/database/sqlite/SQLiteCompiledSql.java @@ -103,6 +103,11 @@ import android.util.Log; protected void finalize() throws Throwable { try { if (nStatement == 0) return; + // don't worry about finalizing this object if it is ALREADY in the + // queue of statements to be finalized later + if (mDatabase.isInQueueOfStatementsToBeFinalized(nStatement)) { + return; + } // finalizer should NEVER get called // but if the database itself is not closed and is GC'ed, then // all sub-objects attached to the database could end up getting GC'ed too. diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index b3fd9147f23c..8c5483f97cef 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -2274,6 +2274,17 @@ public class SQLiteDatabase extends SQLiteClosable { } } + /* package */ boolean isInQueueOfStatementsToBeFinalized(int id) { + if (!isOpen()) { + // database already closed. this statement will already have been finalized. + // return true so that the caller doesn't have to worry about finalizing this statement. + return true; + } + synchronized(mClosedStatementIds) { + return mClosedStatementIds.contains(id); + } + } + /* package */ void closePendingStatements() { if (!isOpen()) { // since this database is already closed, no need to finalize anything. diff --git a/drm/drmioserver/main_drmioserver.cpp b/core/java/android/hardware/IUsbManager.aidl index 7ed048d6738a..b50b6b91effd 100644 --- a/drm/drmioserver/main_drmioserver.cpp +++ b/core/java/android/hardware/IUsbManager.aidl @@ -14,27 +14,15 @@ * limitations under the License. */ -#include <sys/types.h> -#include <unistd.h> -#include <grp.h> +package android.hardware; -#include <binder/IPCThreadState.h> -#include <binder/ProcessState.h> -#include <binder/IServiceManager.h> -#include <utils/Log.h> -#include <private/android_filesystem_config.h> +import android.os.Bundle; +import android.os.ParcelFileDescriptor; -#include <DrmIOService.h> - -using namespace android; - -int main(int argc, char** argv) +/** @hide */ +interface IUsbManager { - sp<ProcessState> proc(ProcessState::self()); - sp<IServiceManager> sm = defaultServiceManager(); - LOGI("ServiceManager: %p", sm.get()); - DrmIOService::instantiate(); - ProcessState::self()->startThreadPool(); - IPCThreadState::self()->joinThreadPool(); + /* Returns a list of all currently attached USB devices */ + void getDeviceList(out Bundle devices); + ParcelFileDescriptor openDevice(String deviceName); } - diff --git a/core/java/android/hardware/UsbConstants.java b/core/java/android/hardware/UsbConstants.java new file mode 100644 index 000000000000..29a335cdbed8 --- /dev/null +++ b/core/java/android/hardware/UsbConstants.java @@ -0,0 +1,63 @@ +/* + * 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. + */ + +package android.hardware; + +/** + * Contains constants for the USB protocol. + * These constants correspond to definitions in linux/usb/ch9.h in the linux kernel. + */ +public final class UsbConstants { + + public static final int USB_ENDPOINT_DIR_MASK = 0x80; + public static final int USB_DIR_OUT = 0; + public static final int USB_DIR_IN = 0x80; + + public static final int USB_TYPE_MASK = (0x03 << 5); + public static final int USB_TYPE_STANDARD = (0x00 << 5); + public static final int USB_TYPE_CLASS = (0x01 << 5); + public static final int USB_TYPE_VENDOR = (0x02 << 5); + public static final int USB_TYPE_RESERVED = (0x03 << 5); + + public static final int USB_ENDPOINT_NUMBER_MASK = 0x0f; + + // flags for endpoint attributes + public static final int USB_ENDPOINT_XFERTYPE_MASK = 0x03; + public static final int USB_ENDPOINT_XFER_CONTROL = 0; + public static final int USB_ENDPOINT_XFER_ISOC = 1; + public static final int USB_ENDPOINT_XFER_BULK = 2; + public static final int USB_ENDPOINT_XFER_INT = 3; + + public static final int USB_CLASS_PER_INTERFACE = 0; + public static final int USB_CLASS_AUDIO = 1; + public static final int USB_CLASS_COMM = 2; + public static final int USB_CLASS_HID = 3; + public static final int USB_CLASS_PHYSICA = 5; + public static final int USB_CLASS_STILL_IMAGE = 6; + public static final int USB_CLASS_PRINTER = 7; + public static final int USB_CLASS_MASS_STORAGE = 8; + public static final int USB_CLASS_HUB = 9; + public static final int USB_CLASS_CDC_DATA = 0x0a; + public static final int USB_CLASS_CSCID = 0x0b; + public static final int USB_CLASS_CONTENT_SEC = 0x0d; + public static final int USB_CLASS_VIDEO = 0x0e; + public static final int USB_CLASS_WIRELESS_CONTROLLER = 0xe0; + public static final int USB_CLASS_MISC = 0xef; + public static final int USB_CLASS_APP_SPEC = 0xfe; + public static final int USB_CLASS_VENDOR_SPEC = 0xff; + public static final int USB_SUBCLASS_VENDOR_SPEC = 0xff; + +}
\ No newline at end of file diff --git a/core/java/android/hardware/UsbDevice.aidl b/core/java/android/hardware/UsbDevice.aidl new file mode 100644 index 000000000000..6dfd43fe1097 --- /dev/null +++ b/core/java/android/hardware/UsbDevice.aidl @@ -0,0 +1,19 @@ +/* + * 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. + */ + +package android.hardware; + +parcelable UsbDevice; diff --git a/core/java/android/hardware/UsbDevice.java b/core/java/android/hardware/UsbDevice.java new file mode 100644 index 000000000000..ca7dae305845 --- /dev/null +++ b/core/java/android/hardware/UsbDevice.java @@ -0,0 +1,336 @@ +/* + * 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. + */ + +package android.hardware; + +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.ParcelFileDescriptor; +import android.util.Log; + +import java.io.FileDescriptor; + + +/** + * A class representing a USB device. + */ +public final class UsbDevice implements Parcelable { + + private static final String TAG = "UsbDevice"; + + private String mName; + private int mVendorId; + private int mProductId; + private int mClass; + private int mSubclass; + private int mProtocol; + private Parcelable[] mInterfaces; + + // used by the JNI code + private int mNativeContext; + + private UsbDevice() { + } + + + /** + * UsbDevice should only be instantiated by UsbService implementation + * @hide + */ + public UsbDevice(String name, int vendorId, int productId, + int Class, int subClass, int protocol, Parcelable[] interfaces) { + mName = name; + mVendorId = vendorId; + mProductId = productId; + mClass = Class; + mSubclass = subClass; + mProtocol = protocol; + mInterfaces = interfaces; + } + + /** + * Returns the name of the device. + * In the standard implementation, this is the path of the device file + * for the device in the usbfs file system. + * + * @return the device name + */ + public String getDeviceName() { + return mName; + } + + /** + * Returns a unique integer ID for the device. + * This is a convenience for clients that want to use an integer to represent + * the device, rather than the device name. + * IDs are not persistent across USB disconnects. + * + * @return the device ID + */ + public int getDeviceId() { + return getDeviceId(mName); + } + + /** + * Returns a vendor ID for the device. + * + * @return the device vendor ID + */ + public int getVendorId() { + return mVendorId; + } + + /** + * Returns a product ID for the device. + * + * @return the device product ID + */ + public int getProductId() { + return mProductId; + } + + /** + * Returns the devices's class field. + * Some useful constants for USB device classes can be found in + * {@link android.hardware.UsbConstants} + * + * @return the devices's class + */ + public int getDeviceClass() { + return mClass; + } + + /** + * Returns the device's subclass field. + * + * @return the device's subclass + */ + public int getDeviceSubclass() { + return mSubclass; + } + + /** + * Returns the device's subclass field. + * + * @return the device's protocol + */ + public int getDeviceProtocol() { + return mProtocol; + } + + /** + * Returns the number of {@link android.hardware.UsbInterface}s this device contains. + * + * @return the number of interfaces + */ + public int getInterfaceCount() { + return mInterfaces.length; + } + + /** + * Returns the {@link android.hardware.UsbInterface} at the given index. + * + * @return the interface + */ + public UsbInterface getInterface(int index) { + return (UsbInterface)mInterfaces[index]; + } + + /* package */ boolean open(ParcelFileDescriptor pfd) { + return native_open(mName, pfd.getFileDescriptor()); + } + + /** + * Releases all system resources related to the device. + */ + public void close() { + native_close(); + } + + /** + * Returns an integer file descriptor for the device, or + * -1 if the device is not opened. + * This is intended for passing to native code to access the device + */ + public int getFileDescriptor() { + return native_get_fd(); + } + + /** + * Claims exclusive access to a {@link android.hardware.UsbInterface}. + * This must be done before sending or receiving data on any + * {@link android.hardware.UsbEndpoint}s belonging to the interface + * @param intf the interface to claim + * @param force true to disconnect kernel driver if necessary + * @return true if the interface was successfully claimed + */ + public boolean claimInterface(UsbInterface intf, boolean force) { + return native_claim_interface(intf.getId(), force); + } + + /** + * Releases exclusive access to a {@link android.hardware.UsbInterface}. + * + * @return true if the interface was successfully released + */ + public boolean releaseInterface(UsbInterface intf) { + return native_release_interface(intf.getId()); + } + + /** + * Performs a control transaction on endpoint zero for this device. + * The direction of the transfer is determined by the request type. + * If requestType & {@link UsbConstants#USB_ENDPOINT_DIR_MASK} is + * {@link UsbConstants#USB_DIR_OUT}, then the transfer is a write, + * and if it is {@link UsbConstants#USB_DIR_IN}, then the transfer + * is a read. + * + * @param requestType request type for this transaction + * @param request request ID for this transaction + * @param value value field for this transaction + * @param index index field for this transaction + * @param buffer buffer for data portion of transaction, + * or null if no data needs to be sent or received + * @param length the length of the data to send or receive + * @param timeout in milliseconds + * @return length of data transferred (or zero) for success, + * or negative value for failure + */ + public int controlTransfer(int requestType, int request, int value, + int index, byte[] buffer, int length, int timeout) { + return native_control_request(requestType, request, value, index, buffer, length, timeout); + } + + /** + * Performs a bulk transaction on the given endpoint. + * The direction of the transfer is determined by the direction of the endpoint + * + * @param endpoint the endpoint for this transaction + * @param buffer buffer for data to send or receive, + * @param length the length of the data to send or receive + * @param timeout in milliseconds + * @return length of data transferred (or zero) for success, + * or negative value for failure + */ + public int bulkTransfer(UsbEndpoint endpoint, byte[] buffer, int length, int timeout) { + return native_bulk_request(endpoint.getAddress(), buffer, length, timeout); + } + + /** + * Waits for the result of a {@link android.hardware.UsbRequest#queue} operation + * Note that this may return requests queued on multiple {@link android.hardware.UsbEndpoint}s. + * When multiple endpoints are in use, {@link android.hardware.UsbRequest#getEndpoint} and + * {@link android.hardware.UsbRequest#getClientData} can be useful in determining how to process + * the result of this function. + * + * @return a completed USB request, or null if an error occurred + */ + public UsbRequest requestWait() { + UsbRequest request = native_request_wait(); + if (request != null) { + request.dequeue(); + } + return request; + } + + /** + * Returns the serial number for the device. + * This will return null if the device has not been opened. + * + * @return the device serial number + */ + public String getSerial() { + return native_get_serial(); + } + + @Override + public boolean equals(Object o) { + if (o instanceof UsbDevice) { + return ((UsbDevice)o).mName.equals(mName); + } else if (o instanceof String) { + return ((String)o).equals(mName); + } else { + return false; + } + } + + @Override + public String toString() { + return "UsbDevice[mName=" + mName + ",mVendorId=" + mVendorId + + ",mProductId=" + mProductId + ",mClass=" + mClass + + ",mSubclass=" + mSubclass + ",mProtocol=" + mProtocol + + ",mInterfaces=" + mInterfaces + "]"; + } + + public static final Parcelable.Creator<UsbDevice> CREATOR = + new Parcelable.Creator<UsbDevice>() { + public UsbDevice createFromParcel(Parcel in) { + String name = in.readString(); + int vendorId = in.readInt(); + int productId = in.readInt(); + int clasz = in.readInt(); + int subClass = in.readInt(); + int protocol = in.readInt(); + Parcelable[] interfaces = in.readParcelableArray(UsbInterface.class.getClassLoader()); + UsbDevice result = new UsbDevice(name, vendorId, productId, clasz, subClass, protocol, interfaces); + for (int i = 0; i < interfaces.length; i++) { + ((UsbInterface)interfaces[i]).setDevice(result); + } + return result; + } + + public UsbDevice[] newArray(int size) { + return new UsbDevice[size]; + } + }; + + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeString(mName); + parcel.writeInt(mVendorId); + parcel.writeInt(mProductId); + parcel.writeInt(mClass); + parcel.writeInt(mSubclass); + parcel.writeInt(mProtocol); + parcel.writeParcelableArray(mInterfaces, 0); + } + + public static int getDeviceId(String name) { + return native_get_device_id(name); + } + + public static String getDeviceName(int id) { + return native_get_device_name(id); + } + + private native boolean native_open(String deviceName, FileDescriptor pfd); + private native void native_close(); + private native int native_get_fd(); + private native boolean native_claim_interface(int interfaceID, boolean force); + private native boolean native_release_interface(int interfaceID); + private native int native_control_request(int requestType, int request, int value, + int index, byte[] buffer, int length, int timeout); + private native int native_bulk_request(int endpoint, byte[] buffer, int length, int timeout); + private native UsbRequest native_request_wait(); + private native String native_get_serial(); + + private static native int native_get_device_id(String name); + private static native String native_get_device_name(int id); +} diff --git a/core/java/android/hardware/UsbEndpoint.aidl b/core/java/android/hardware/UsbEndpoint.aidl new file mode 100644 index 000000000000..51fc67bfb7f4 --- /dev/null +++ b/core/java/android/hardware/UsbEndpoint.aidl @@ -0,0 +1,19 @@ +/* + * 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. + */ + +package android.hardware; + +parcelable UsbEndpoint; diff --git a/core/java/android/hardware/UsbEndpoint.java b/core/java/android/hardware/UsbEndpoint.java new file mode 100644 index 000000000000..8d4099dfd73e --- /dev/null +++ b/core/java/android/hardware/UsbEndpoint.java @@ -0,0 +1,176 @@ +/* + * 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. + */ + +package android.hardware; + +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * A class representing an endpoint on a {@link android.hardware.UsbInterface}. + */ +public final class UsbEndpoint implements Parcelable { + + private int mAddress; + private int mAttributes; + private int mMaxPacketSize; + private int mInterval; + private UsbInterface mInterface; + + private UsbEndpoint() { + } + + /** + * UsbEndpoint should only be instantiated by UsbService implementation + * @hide + */ + public UsbEndpoint(int address, int attributes, int maxPacketSize, int interval) { + mAddress = address; + mAttributes = attributes; + mMaxPacketSize = maxPacketSize; + mInterval = interval; + } + + /** + * Returns the endpoint's address field. + * + * @return the endpoint's address + */ + public int getAddress() { + return mAddress; + } + + /** + * Extracts the endpoint's endpoint number from its address + * + * @return the endpoint's endpoint number + */ + public int getEndpointNumber() { + return mAddress & UsbConstants.USB_ENDPOINT_NUMBER_MASK; + } + + /** + * Returns the endpoint's direction. + * Returns {@link android.hardware.UsbConstants#USB_DIR_OUT} + * if the direction is host to device, and + * {@link android.hardware.UsbConstants#USB_DIR_IN} if the + * direction is device to host. + * + * @return the endpoint's direction + */ + public int getDirection() { + return mAddress & UsbConstants.USB_ENDPOINT_DIR_MASK; + } + + /** + * Returns the endpoint's attributes field. + * + * @return the endpoint's attributes + */ + public int getAttributes() { + return mAttributes; + } + + /** + * Returns the endpoint's type. + * Possible results are: + * <ul> + * <li>{@link android.hardware.UsbConstants#USB_ENDPOINT_XFER_CONTROL} (endpoint zero) + * <li>{@link android.hardware.UsbConstants#USB_ENDPOINT_XFER_ISOC} (isochronous endpoint) + * <li>{@link android.hardware.UsbConstants#USB_ENDPOINT_XFER_BULK} (bulk endpoint) + * <li>{@link android.hardware.UsbConstants#USB_ENDPOINT_XFER_INT} (interrupt endpoint) + * </ul> + * + * @return the endpoint's type + */ + public int getType() { + return mAttributes & UsbConstants.USB_ENDPOINT_XFERTYPE_MASK; + } + + /** + * Returns the endpoint's maximum packet size. + * + * @return the endpoint's maximum packet size + */ + public int getMaxPacketSize() { + return mMaxPacketSize; + } + + /** + * Returns the endpoint's interval field. + * + * @return the endpoint's interval + */ + public int getInterval() { + return mInterval; + } + + /** + * Returns the {@link android.hardware.UsbInterface} this endpoint belongs to. + * + * @return the endpoint's interface + */ + public UsbInterface getInterface() { + return mInterface; + } + + /** + * Returns the {@link android.hardware.UsbDevice} this endpoint belongs to. + * + * @return the endpoint's device + */ + public UsbDevice getDevice() { + return mInterface.getDevice(); + } + + // only used for parcelling + /* package */ void setInterface(UsbInterface intf) { + mInterface = intf; + } + + @Override + public String toString() { + return "UsbEndpoint[mAddress=" + mAddress + ",mAttributes=" + mAttributes + + ",mMaxPacketSize=" + mMaxPacketSize + ",mInterval=" + mInterval +"]"; + } + + public static final Parcelable.Creator<UsbEndpoint> CREATOR = + new Parcelable.Creator<UsbEndpoint>() { + public UsbEndpoint createFromParcel(Parcel in) { + int address = in.readInt(); + int attributes = in.readInt(); + int maxPacketSize = in.readInt(); + int interval = in.readInt(); + return new UsbEndpoint(address, attributes, maxPacketSize, interval); + } + + public UsbEndpoint[] newArray(int size) { + return new UsbEndpoint[size]; + } + }; + + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeInt(mAddress); + parcel.writeInt(mAttributes); + parcel.writeInt(mMaxPacketSize); + parcel.writeInt(mInterval); + } +} diff --git a/core/java/android/hardware/UsbInterface.aidl b/core/java/android/hardware/UsbInterface.aidl new file mode 100644 index 000000000000..a715ccd0221d --- /dev/null +++ b/core/java/android/hardware/UsbInterface.aidl @@ -0,0 +1,19 @@ +/* + * 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. + */ + +package android.hardware; + +parcelable UsbInterface; diff --git a/core/java/android/hardware/UsbInterface.java b/core/java/android/hardware/UsbInterface.java new file mode 100644 index 000000000000..deef81f1d438 --- /dev/null +++ b/core/java/android/hardware/UsbInterface.java @@ -0,0 +1,159 @@ +/* + * 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. + */ + +package android.hardware; + +import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * A class representing an interface on a {@link android.hardware.UsbDevice}. + */ +public final class UsbInterface implements Parcelable { + + private int mId; + private int mClass; + private int mSubclass; + private int mProtocol; + private UsbDevice mDevice; + private Parcelable[] mEndpoints; + + private UsbInterface() { + } + + /** + * UsbInterface should only be instantiated by UsbService implementation + * @hide + */ + public UsbInterface(int id, int Class, int subClass, int protocol, + Parcelable[] endpoints) { + mId = id; + mClass = Class; + mSubclass = subClass; + mProtocol = protocol; + mEndpoints = endpoints; + } + + /** + * Returns the interface's ID field. + * + * @return the interface's ID + */ + public int getId() { + return mId; + } + + /** + * Returns the interface's class field. + * Some useful constants for USB classes can be found in + * {@link android.hardware.UsbConstants} + * + * @return the interface's class + */ + public int getInterfaceClass() { + return mClass; + } + + /** + * Returns the interface's subclass field. + * + * @return the interface's subclass + */ + public int getInterfaceSubclass() { + return mSubclass; + } + + /** + * Returns the interface's protocol field. + * + * @return the interface's protocol + */ + public int getInterfaceProtocol() { + return mProtocol; + } + + /** + * Returns the number of {@link android.hardware.UsbEndpoint}s this interface contains. + * + * @return the number of endpoints + */ + public int getEndpointCount() { + return mEndpoints.length; + } + + /** + * Returns the {@link android.hardware.UsbEndpoint} at the given index. + * + * @return the endpoint + */ + public UsbEndpoint getEndpoint(int index) { + return (UsbEndpoint)mEndpoints[index]; + } + + /** + * Returns the {@link android.hardware.UsbDevice} this interface belongs to. + * + * @return the interface's device + */ + public UsbDevice getDevice() { + return mDevice; + } + + // only used for parcelling + /* package */ void setDevice(UsbDevice device) { + mDevice = device; + } + + @Override + public String toString() { + return "UsbInterface[mId=" + mId + ",mClass=" + mClass + + ",mSubclass=" + mSubclass + ",mProtocol=" + mProtocol + + ",mEndpoints=" + mEndpoints + "]"; + } + + public static final Parcelable.Creator<UsbInterface> CREATOR = + new Parcelable.Creator<UsbInterface>() { + public UsbInterface createFromParcel(Parcel in) { + int id = in.readInt(); + int Class = in.readInt(); + int subClass = in.readInt(); + int protocol = in.readInt(); + Parcelable[] endpoints = in.readParcelableArray(UsbEndpoint.class.getClassLoader()); + UsbInterface result = new UsbInterface(id, Class, subClass, protocol, endpoints); + for (int i = 0; i < endpoints.length; i++) { + ((UsbEndpoint)endpoints[i]).setInterface(result); + } + return result; + } + + public UsbInterface[] newArray(int size) { + return new UsbInterface[size]; + } + }; + + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel parcel, int flags) { + parcel.writeInt(mId); + parcel.writeInt(mClass); + parcel.writeInt(mSubclass); + parcel.writeInt(mProtocol); + parcel.writeParcelableArray(mEndpoints, 0); + } +} diff --git a/core/java/android/hardware/UsbManager.java b/core/java/android/hardware/UsbManager.java index 18790d254e00..8fad210619d4 100644 --- a/core/java/android/hardware/UsbManager.java +++ b/core/java/android/hardware/UsbManager.java @@ -17,17 +17,31 @@ package android.hardware; +import android.os.Bundle; +import android.os.ParcelFileDescriptor; +import android.os.RemoteException; +import android.util.Log; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.HashMap; /** - * Class for accessing USB state information. - * @hide + * This class allows you to access the state of USB, both in host and device mode. + * + * <p>You can obtain an instance of this class by calling + * {@link android.content.Context#getSystemService(java.lang.String) Context.getSystemService()}. + * + * {@samplecode + * UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE); + * } */ public class UsbManager { + private static final String TAG = "UsbManager"; + /** - * Broadcast Action: A sticky broadcast for USB state change events. + * Broadcast Action: A sticky broadcast for USB state change events when in device mode. * * This is a sticky broadcast for clients that includes USB connected/disconnected state, * the USB configuration that is currently set and a bundle containing name/value pairs @@ -39,6 +53,22 @@ public class UsbManager { public static final String ACTION_USB_STATE = "android.hardware.action.USB_STATE"; + /** + * Broadcast Action: A broadcast for USB device attached event. + * + * This intent is sent when a USB device is attached to the USB bus when in host mode. + */ + public static final String ACTION_USB_DEVICE_ATTACHED = + "android.hardware.action.USB_DEVICE_ATTACHED"; + + /** + * Broadcast Action: A broadcast for USB device detached event. + * + * This intent is sent when a USB device is detached from the USB bus when in host mode. + */ + public static final String ACTION_USB_DEVICE_DETACHED = + "android.hardware.action.USB_DEVICE_DETACHED"; + /** * Boolean extra indicating whether USB is connected or disconnected. * Used in extras for the {@link #ACTION_USB_STATE} broadcast. @@ -87,6 +117,103 @@ public class UsbManager { */ public static final String USB_FUNCTION_DISABLED = "disabled"; + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} and + * {@link #ACTION_USB_DEVICE_DETACHED} broadcasts + * containing the device's ID (String). + */ + public static final String EXTRA_DEVICE_NAME = "device_name"; + + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} broadcast + * containing the device's vendor ID (int). + */ + public static final String EXTRA_VENDOR_ID = "vendor_id"; + + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} broadcast + * containing the device's product ID (int). + */ + public static final String EXTRA_PRODUCT_ID = "product_id"; + + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} broadcast + * containing the device's class (int). + */ + public static final String EXTRA_DEVICE_CLASS = "device_class"; + + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} broadcast + * containing the device's class (int). + */ + public static final String EXTRA_DEVICE_SUBCLASS = "device_subclass"; + + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} broadcast + * containing the device's class (int). + */ + public static final String EXTRA_DEVICE_PROTOCOL = "device_protocol"; + + /** + * Name of extra for {@link #ACTION_USB_DEVICE_ATTACHED} broadcast + * containing the UsbDevice object for the device. + */ + public static final String EXTRA_DEVICE = "device"; + + private IUsbManager mService; + + /** + * {@hide} + */ + public UsbManager(IUsbManager service) { + mService = service; + } + + /** + * Returns a HashMap containing all USB devices currently attached. + * USB device name is the key for the returned HashMap. + * The result will be empty if no devices are attached, or if + * USB host mode is inactive or unsupported. + * + * @return HashMap containing all connected USB devices. + */ + public HashMap<String,UsbDevice> getDeviceList() { + Bundle bundle = new Bundle(); + try { + mService.getDeviceList(bundle); + HashMap<String,UsbDevice> result = new HashMap<String,UsbDevice>(); + for (String name : bundle.keySet()) { + result.put(name, (UsbDevice)bundle.get(name)); + } + return result; + } catch (RemoteException e) { + Log.e(TAG, "RemoteException in getDeviceList", e); + return null; + } + } + + /** + * Opens the device so it can be used to send and receive + * data using {@link android.hardware.UsbRequest}. + * + * @param device the device to open + * @return true if we successfully opened the device + */ + public boolean openDevice(UsbDevice device) { + try { + ParcelFileDescriptor pfd = mService.openDevice(device.getDeviceName()); + if (pfd == null) { + return false; + } + boolean result = device.open(pfd); + pfd.close(); + return result; + } catch (Exception e) { + Log.e(TAG, "exception in UsbManager.openDevice", e); + return false; + } + } + private static File getFunctionEnableFile(String function) { return new File("/sys/class/usb_composite/" + function + "/enable"); } @@ -94,6 +221,9 @@ public class UsbManager { /** * Returns true if the specified USB function is supported by the kernel. * Note that a USB function maybe supported but disabled. + * + * @param function name of the USB function + * @return true if the USB function is supported. */ public static boolean isFunctionSupported(String function) { return getFunctionEnableFile(function).exists(); @@ -101,6 +231,9 @@ public class UsbManager { /** * Returns true if the specified USB function is currently enabled. + * + * @param function name of the USB function + * @return true if the USB function is enabled. */ public static boolean isFunctionEnabled(String function) { try { diff --git a/core/java/android/hardware/UsbRequest.java b/core/java/android/hardware/UsbRequest.java new file mode 100644 index 000000000000..ae3a289e11d5 --- /dev/null +++ b/core/java/android/hardware/UsbRequest.java @@ -0,0 +1,177 @@ +/* + * 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. + */ + +package android.hardware; + +import android.util.Log; + +import java.nio.ByteBuffer; + +/** + * A class representing USB request packet. + * This can be used for both reading and writing data to or from a + * {@link android.hardware.UsbDevice}. + * UsbRequests are sent asynchronously via {@link #queue} and the results + * are read by {@link android.hardware.UsbDevice#requestWait}. + */ +public class UsbRequest { + + private static final String TAG = "UsbRequest"; + + // used by the JNI code + private int mNativeContext; + + private UsbEndpoint mEndpoint; + + // for temporarily saving current buffer across queue and dequeue + private ByteBuffer mBuffer; + private int mLength; + + // for client use + private Object mClientData; + + public UsbRequest() { + } + + /** + * Initializes the request so it can read or write data on the given endpoint. + * Whether the request allows reading or writing depends on the direction of the endpoint. + * + * @param endpoint the endpoint to be used for this request. + * @return true if the request was successfully opened. + */ + public boolean initialize(UsbEndpoint endpoint) { + mEndpoint = endpoint; + return native_init(endpoint.getDevice(), + endpoint.getAddress(), endpoint.getAttributes(), + endpoint.getMaxPacketSize(), endpoint.getInterval()); + } + + /** + * Releases all resources related to this request. + */ + public void close() { + mEndpoint = null; + native_close(); + } + + @Override + protected void finalize() throws Throwable { + try { + if (mEndpoint != null) { + Log.v(TAG, "endpoint still open in finalize(): " + this); + close(); + } + } finally { + super.finalize(); + } + } + + /** + * Returns the endpoint for the request, or null if the request is not opened. + * + * @return the request's endpoint + */ + public UsbEndpoint getEndpoint() { + return mEndpoint; + } + + /** + * Returns the client data for the request. + * This can be used in conjunction with {@link #setClientData} + * to associate another object with this request, which can be useful for + * maintaining state between calls to {@link #queue} and + * {@link android.hardware.UsbDevice#requestWait} + * + * @return the client data for the request + */ + public Object getClientData() { + return mClientData; + } + + /** + * Sets the client data for the request. + * This can be used in conjunction with {@link #getClientData} + * to associate another object with this request, which can be useful for + * maintaining state between calls to {@link #queue} and + * {@link android.hardware.UsbDevice#requestWait} + * + * @param data the client data for the request + */ + public void setClientData(Object data) { + mClientData = data; + } + + /** + * Queues the request to send or receive data on its endpoint. + * For OUT endpoints, the given buffer data will be sent on the endpoint. + * For IN endpoints, the endpoint will attempt to read the given number of bytes + * into the specified buffer. + * If the queueing operation is successful, we return true and the result will be + * returned via {@link android.hardware.UsbDevice#requestWait} + * + * @param buffer the buffer containing the bytes to write, or location to store + * the results of a read + * @param length number of bytes to read or write + * @return true if the queueing operation succeeded + */ + public boolean queue(ByteBuffer buffer, int length) { + boolean out = (mEndpoint.getDirection() == UsbConstants.USB_DIR_OUT); + boolean result; + if (buffer.isDirect()) { + result = native_queue_direct(buffer, length, out); + } else if (buffer.hasArray()) { + result = native_queue_array(buffer.array(), length, out); + } else { + throw new IllegalArgumentException("buffer is not direct and has no array"); + } + if (result) { + // save our buffer for when the request has completed + mBuffer = buffer; + mLength = length; + } + return result; + } + + /* package */ void dequeue() { + boolean out = (mEndpoint.getDirection() == UsbConstants.USB_DIR_OUT); + if (mBuffer.isDirect()) { + native_dequeue_direct(); + } else { + native_dequeue_array(mBuffer.array(), mLength, out); + } + mBuffer = null; + mLength = 0; + } + + /** + * Cancels a pending queue operation. + * + * @return true if cancelling succeeded + */ + public boolean cancel() { + return native_cancel(); + } + + private native boolean native_init(UsbDevice device, int ep_address, int ep_attributes, + int ep_max_packet_size, int ep_interval); + private native void native_close(); + private native boolean native_queue_array(byte[] buffer, int length, boolean out); + private native void native_dequeue_array(byte[] buffer, int length, boolean out); + private native boolean native_queue_direct(ByteBuffer buffer, int length, boolean out); + private native void native_dequeue_direct(); + private native boolean native_cancel(); +} diff --git a/core/java/android/net/DhcpInfo.java b/core/java/android/net/DhcpInfo.java index 9c81c193672c..e2660e40f57c 100644 --- a/core/java/android/net/DhcpInfo.java +++ b/core/java/android/net/DhcpInfo.java @@ -18,6 +18,7 @@ package android.net; import android.os.Parcelable; import android.os.Parcel; +import java.net.InetAddress; /** * A simple object for retrieving the results of a DHCP request. @@ -65,10 +66,7 @@ public class DhcpInfo implements Parcelable { } private static void putAddress(StringBuffer buf, int addr) { - buf.append(addr & 0xff).append('.'). - append((addr >>>= 8) & 0xff).append('.'). - append((addr >>>= 8) & 0xff).append('.'). - append((addr >>>= 8) & 0xff); + buf.append(NetworkUtils.intToInetAddress(addr).getHostAddress()); } /** Implement the Parcelable interface {@hide} */ diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java new file mode 100644 index 000000000000..6e981dfea5ee --- /dev/null +++ b/core/java/android/net/DhcpInfoInternal.java @@ -0,0 +1,107 @@ +/* + * 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. + */ + +package android.net; + +import android.text.TextUtils; +import android.util.Log; + +import java.net.InetAddress; +import java.net.Inet4Address; +import java.net.UnknownHostException; + +/** + * A simple object for retrieving the results of a DHCP request. + * Replaces (internally) the IPv4-only DhcpInfo class. + * @hide + */ +public class DhcpInfoInternal { + private final static String TAG = "DhcpInfoInternal"; + public String ipAddress; + public String gateway; + public int prefixLength; + + public String dns1; + public String dns2; + + public String serverAddress; + public int leaseDuration; + + public DhcpInfoInternal() { + } + + private int convertToInt(String addr) { + try { + InetAddress inetAddress = NetworkUtils.numericToInetAddress(addr); + if (inetAddress instanceof Inet4Address) { + return NetworkUtils.inetAddressToInt(inetAddress); + } + } catch (IllegalArgumentException e) {} + return 0; + } + + public DhcpInfo makeDhcpInfo() { + DhcpInfo info = new DhcpInfo(); + info.ipAddress = convertToInt(ipAddress); + info.gateway = convertToInt(gateway); + try { + InetAddress inetAddress = NetworkUtils.numericToInetAddress(ipAddress); + info.netmask = NetworkUtils.prefixLengthToNetmaskInt(prefixLength); + } catch (IllegalArgumentException e) {} + info.dns1 = convertToInt(dns1); + info.dns2 = convertToInt(dns2); + info.serverAddress = convertToInt(serverAddress); + info.leaseDuration = leaseDuration; + return info; + } + + public LinkAddress makeLinkAddress() { + if (TextUtils.isEmpty(ipAddress)) { + Log.e(TAG, "makeLinkAddress with empty ipAddress"); + return null; + } + return new LinkAddress(NetworkUtils.numericToInetAddress(ipAddress), prefixLength); + } + + public LinkProperties makeLinkProperties() { + LinkProperties p = new LinkProperties(); + p.addLinkAddress(makeLinkAddress()); + if (TextUtils.isEmpty(gateway) == false) { + p.setGateway(NetworkUtils.numericToInetAddress(gateway)); + } else { + Log.e(TAG, "makeLinkProperties with empty gateway!"); + } + if (TextUtils.isEmpty(dns1) == false) { + p.addDns(NetworkUtils.numericToInetAddress(dns1)); + } else { + Log.e(TAG, "makeLinkProperties with empty dns1!"); + } + if (TextUtils.isEmpty(dns2) == false) { + p.addDns(NetworkUtils.numericToInetAddress(dns2)); + } else { + Log.e(TAG, "makeLinkProperties with empty dns2!"); + } + return p; + } + + public String toString() { + return "addr: " + ipAddress + "/" + prefixLength + + " gateway: " + gateway + + " dns: " + dns1 + "," + dns2 + + " dhcpServer: " + serverAddress + + " leaseDuration: " + leaseDuration; + } +} diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 8a653ddd55e6..97f96daff787 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -77,7 +77,7 @@ public class NetworkUtils { * the IP address information. * @return {@code true} for success, {@code false} for failure */ - public native static boolean runDhcp(String interfaceName, DhcpInfo ipInfo); + public native static boolean runDhcp(String interfaceName, DhcpInfoInternal ipInfo); /** * Shut down the DHCP client daemon. @@ -104,45 +104,20 @@ public class NetworkUtils { public native static String getDhcpError(); /** - * When static IP configuration has been specified, configure the network - * interface according to the values supplied. - * @param interfaceName the name of the interface to configure - * @param ipInfo the IP address, default gateway, and DNS server addresses - * with which to configure the interface. - * @return {@code true} for success, {@code false} for failure - */ - public static boolean configureInterface(String interfaceName, DhcpInfo ipInfo) { - return configureNative(interfaceName, - ipInfo.ipAddress, - ipInfo.netmask, - ipInfo.gateway, - ipInfo.dns1, - ipInfo.dns2); - } - - private native static boolean configureNative( - String interfaceName, int ipAddress, int netmask, int gateway, int dns1, int dns2); - - /** * Convert a IPv4 address from an integer to an InetAddress. - * @param hostAddr is an Int corresponding to the IPv4 address in network byte order - * @return the IP address as an {@code InetAddress}, returns null if - * unable to convert or if the int is an invalid address. + * @param hostAddress an int corresponding to the IPv4 address in network byte order */ public static InetAddress intToInetAddress(int hostAddress) { - InetAddress inetAddress; byte[] addressBytes = { (byte)(0xff & hostAddress), (byte)(0xff & (hostAddress >> 8)), (byte)(0xff & (hostAddress >> 16)), (byte)(0xff & (hostAddress >> 24)) }; try { - inetAddress = InetAddress.getByAddress(addressBytes); - } catch(UnknownHostException e) { - return null; + return InetAddress.getByAddress(addressBytes); + } catch (UnknownHostException e) { + throw new AssertionError(); } - - return inetAddress; } /** @@ -175,6 +150,29 @@ public class NetworkUtils { } /** + * Create an InetAddress from a string where the string must be a standard + * representation of a V4 or V6 address. Avoids doing a DNS lookup on failure + * but it will throw an IllegalArgumentException in that case. + * @param addrString + * @return the InetAddress + * @hide + */ + public static InetAddress numericToInetAddress(String addrString) + throws IllegalArgumentException { + // TODO - do this for real, using a hidden method on InetAddress that aborts + // instead of doing dns step + if (!InetAddress.isNumeric(addrString)) { + throw new IllegalArgumentException("numericToInetAddress with non numeric: '" + + addrString + "'"); + } + try { + return InetAddress.getByName(addrString); + } catch (UnknownHostException e) { + throw new IllegalArgumentException(e); + } + } + + /** * Add a default route through the specified gateway. * @param interfaceName interface on which the route should be added * @param gw the IP address of the gateway to which the route is desired, diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index 0d64dab179e9..0492fcec856b 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -122,4 +122,139 @@ public class TrafficStats { * @return number of bytes */ public static native long getUidRxBytes(int uid); + + /** + * Get the number of packets (TCP segments + UDP) sent through + * the network for this UID. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of packets. + * If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidTxPackets(int uid); + + /** + * Get the number of packets (TCP segments + UDP) received through + * the network for this UID. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of packets + */ + public static native long getUidRxPackets(int uid); + + /** + * Get the number of TCP payload bytes sent for this UID. + * This total does not include protocol and control overheads at + * the transport and the lower layers of the networking stack. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of bytes. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidTcpTxBytes(int uid); + + /** + * Get the number of TCP payload bytes received for this UID. + * This total does not include protocol and control overheads at + * the transport and the lower layers of the networking stack. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of bytes. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidTcpRxBytes(int uid); + + /** + * Get the number of UDP payload bytes sent for this UID. + * This total does not include protocol and control overheads at + * the transport and the lower layers of the networking stack. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of bytes. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidUdpTxBytes(int uid); + + /** + * Get the number of UDP payload bytes received for this UID. + * This total does not include protocol and control overheads at + * the transport and the lower layers of the networking stack. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of bytes. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidUdpRxBytes(int uid); + + /** + * Get the number of TCP segments sent for this UID. + * Does not include TCP control packets (SYN/ACKs/FIN/..). + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of TCP segments. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidTcpTxSegments(int uid); + + /** + * Get the number of TCP payload bytes received for this UID. + * Does not include TCP control packets (SYN/ACKs/FIN/..). + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of TCP segments. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidTcpRxSegments(int uid); + + + /** + * Get the number of UDP packets sent for this UID. + * Includes DNS requests. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of packets. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidUdpTxPackets(int uid); + + /** + * Get the number of UDP packets received for this UID. + * Includes DNS responses. + * The statistics are across all interfaces. + * + * {@see android.os.Process#myUid()}. + * + * @param uid The UID of the process to examine. + * @return number of packets. If the statistics are not supported by this device, + * {@link #UNSUPPORTED} will be returned. + */ + public static native long getUidUdpRxPackets(int uid); } diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index 6d19f4174183..4991914204d9 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -244,7 +244,7 @@ public class RecoverySystem { // algorithm is used by the signature (which should be // SHA1withRSA). - String da = sigInfo.getdigestAlgorithm(); + String da = sigInfo.getDigestAlgorithm(); String dea = sigInfo.getDigestEncryptionAlgorithm(); String alg = null; if (da == null || dea == null) { diff --git a/core/java/android/provider/Applications.java b/core/java/android/provider/Applications.java index 7aabc5080928..3686d173052b 100644 --- a/core/java/android/provider/Applications.java +++ b/core/java/android/provider/Applications.java @@ -18,6 +18,7 @@ package android.provider; import android.content.ComponentName; import android.content.ContentResolver; +import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; @@ -26,10 +27,12 @@ import java.util.List; /** * The Applications provider gives information about installed applications. * - * @hide Only used by ApplicationsProvider so far. + * @hide Only used by ApplicationsProvider and Launchers so far. */ public class Applications { + private static final String TAG = "ApplicationsProvider"; + /** * The content authority for this provider. */ @@ -65,6 +68,26 @@ public class Applications { ContentResolver.CURSOR_DIR_BASE_TYPE + "/" + APPLICATION_SUB_TYPE; /** + * The path that should be used when an application is launched. The aim is + * to help ApplicationsProvider keep track of which applications the user + * uses the most, and improve app ranking based on this. + */ + public static final String INCREASE_LAUNCH_COUNT_PATH = "increase_launch_count"; + + public static final Uri INCREASE_LAUNCH_COUNT_URI = CONTENT_URI.buildUpon() + .appendPath(INCREASE_LAUNCH_COUNT_PATH).build(); + + /** + * The package name parameter for the "increase launch count" call. + */ + public static final String INCREASE_LAUNCH_COUNT_PACKAGE = "packageName"; + + /** + * The classname parameter for the "increase launch count" call. + */ + public static final String INCREASE_LAUNCH_COUNT_CLASS = "className"; + + /** * no public constructor since this is a utility class */ private Applications() {} @@ -79,6 +102,20 @@ public class Applications { } /** + * Increases the launch count of an application. Launch counts are used + * by the ApplicationsProvider to improve ranking. + */ + public static void increaseLaunchCount( + final ContentResolver resolver, final ComponentName componentName) { + + ContentValues parameters = new ContentValues(); + parameters.put(INCREASE_LAUNCH_COUNT_PACKAGE, componentName.getPackageName()); + parameters.put(INCREASE_LAUNCH_COUNT_CLASS, componentName.getClassName()); + + resolver.insert(INCREASE_LAUNCH_COUNT_URI, parameters); + } + + /** * Gets the application component name from an application URI. * * @param appUri A URI of the form diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index 013edd395ae7..5557a0dcd157 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -466,6 +466,12 @@ public final class Downloads { public static final int DESTINATION_SYSTEMCACHE_PARTITION = 5; /** + * This download was completed by the caller (i.e., NOT downloadmanager) + * and caller wants to have this download displayed in Downloads App. + */ + public static final int DESTINATION_NON_DOWNLOADMANAGER_DOWNLOAD = 6; + + /** * This download is allowed to run. */ public static final int CONTROL_RUN = 0; diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index 7456acd33360..cd3bc3e7c32a 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -648,8 +648,7 @@ class BluetoothEventLoop { } else { Log.i(TAG, "Rejecting incoming A2DP / AVRCP connection from " + address); } - } else if (BluetoothUuid.isInputDevice(uuid) && !isOtherInputDeviceConnected(address) && - isKeyboard(address)) { + } else if (BluetoothUuid.isInputDevice(uuid) && !isOtherInputDeviceConnected(address)) { BluetoothInputDevice inputDevice = new BluetoothInputDevice(mContext); authorized = inputDevice.getInputDevicePriority(device) > BluetoothInputDevice.PRIORITY_OFF; @@ -668,17 +667,6 @@ class BluetoothEventLoop { return authorized; } - private boolean isKeyboard(String address) { - BluetoothClass btClass = new BluetoothClass(mBluetoothService.getRemoteClass(address)); - int btDeviceClass = btClass.getDeviceClass(); - if (btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD || - btDeviceClass == BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING) { - return true; - } - log("Incoming Connect: Input device class: " + btDeviceClass + " Not a keyboard"); - return false; - } - private boolean isOtherInputDeviceConnected(String address) { List<BluetoothDevice> devices = mBluetoothService.lookupInputDevicesMatchingStates(new int[] { diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 115370b2f0cb..943a3ffae44e 100644 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1727,15 +1727,6 @@ public class BluetoothService extends IBluetooth.Stub { getInputDevicePriority(device) == BluetoothInputDevice.PRIORITY_OFF) { return false; } - - BluetoothClass btClass = new BluetoothClass(getRemoteClass(device.getAddress())); - int btDeviceClass = btClass.getDeviceClass(); - if (btDeviceClass != BluetoothClass.Device.PERIPHERAL_KEYBOARD && - btDeviceClass != BluetoothClass.Device.PERIPHERAL_KEYBOARD_POINTING) { - log("Input device btDeviceClass: " + btDeviceClass + " Not a keyboard"); - return false; - } - BluetoothDeviceProfileState state = mDeviceProfileState.get(device.getAddress()); if (state != null) { Message msg = new Message(); diff --git a/core/java/android/text/format/Formatter.java b/core/java/android/text/format/Formatter.java index baaa3ceae2a3..5ae65df9826a 100644 --- a/core/java/android/text/format/Formatter.java +++ b/core/java/android/text/format/Formatter.java @@ -17,32 +17,33 @@ package android.text.format; import android.content.Context; +import android.net.NetworkUtils; /** * Utility class to aid in formatting common values that are not covered - * by the standard java.util.Formatter. + * by {@link java.util.Formatter} */ public final class Formatter { /** * Formats a content size to be in the form of bytes, kilobytes, megabytes, etc - * + * * @param context Context to use to load the localized units - * @param number size value to be formated - * @return formated string with the number + * @param number size value to be formatted + * @return formatted string with the number */ public static String formatFileSize(Context context, long number) { return formatFileSize(context, number, false); } - + /** * Like {@link #formatFileSize}, but trying to generate shorter numbers - * (showing fewer digits of precisin). + * (showing fewer digits of precision). */ public static String formatShortFileSize(Context context, long number) { return formatFileSize(context, number, true); } - + private static String formatFileSize(Context context, long number, boolean shorter) { if (context == null) { return ""; @@ -92,21 +93,21 @@ public final class Formatter { getString(com.android.internal.R.string.fileSizeSuffix, value, context.getString(suffix)); } - + /** * Returns a string in the canonical IP format ###.###.###.### from a packed integer containing * the IP address. The IP address is expected to be in little-endian format (LSB first). That * is, 0x01020304 will return "4.3.2.1". - * - * @param addr the IP address as a packed integer with LSB first. + * + * @param ipv4Address the IP address as a packed integer with LSB first. * @return string with canonical IP address format. + * + * @deprecated this method doesn't support IPv6 addresses. Prefer {@link + * java.net.InetAddress#getHostAddress()}, which supports both IPv4 and + * IPv6 addresses. */ - public static String formatIpAddress(int addr) { - StringBuffer buf = new StringBuffer(); - buf.append(addr & 0xff).append('.'). - append((addr >>>= 8) & 0xff).append('.'). - append((addr >>>= 8) & 0xff).append('.'). - append((addr >>>= 8) & 0xff); - return buf.toString(); + @Deprecated + public static String formatIpAddress(int ipv4Address) { + return NetworkUtils.intToInetAddress(ipv4Address).getHostAddress(); } } diff --git a/core/java/android/util/FastImmutableArraySet.java b/core/java/android/util/FastImmutableArraySet.java new file mode 100644 index 000000000000..4175c6057ecf --- /dev/null +++ b/core/java/android/util/FastImmutableArraySet.java @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2011 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. + */ + +package android.util; + +import java.util.AbstractSet; +import java.util.Iterator; + +/** + * A fast immutable set wrapper for an array that is optimized for non-concurrent iteration. + * The same iterator instance is reused each time to avoid creating lots of garbage. + * Iterating over an array in this fashion is 2.5x faster than iterating over a {@link HashSet} + * so it is worth copying the contents of the set to an array when iterating over it + * hundreds of times. + * @hide + */ +public final class FastImmutableArraySet<T> extends AbstractSet<T> { + FastIterator<T> mIterator; + T[] mContents; + + public FastImmutableArraySet(T[] contents) { + mContents = contents; + } + + @Override + public Iterator<T> iterator() { + FastIterator<T> it = mIterator; + if (it == null) { + it = new FastIterator<T>(mContents); + mIterator = it; + } else { + it.mIndex = 0; + } + return it; + } + + @Override + public int size() { + return mContents.length; + } + + private static final class FastIterator<T> implements Iterator<T> { + private final T[] mContents; + int mIndex; + + public FastIterator(T[] contents) { + mContents = contents; + } + + @Override + public boolean hasNext() { + return mIndex != mContents.length; + } + + @Override + public T next() { + return mContents[mIndex++]; + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + } +} diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index dd04975c11d6..e799f7696c65 100755 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -98,7 +98,16 @@ public final class InputDevice implements Parcelable { * Use {@link #getMotionRange} to query the range of positions. */ public static final int SOURCE_CLASS_POSITION = 0x00000008; - + + /** + * The input source is a joystick. + * + * A {@link MotionEvent} should be interpreted as absolute joystick movements. + * + * Use {@link #getMotionRange} to query the range of positions. + */ + public static final int SOURCE_CLASS_JOYSTICK = 0x00000010; + /** * The input source is unknown. */ @@ -117,7 +126,15 @@ public final class InputDevice implements Parcelable { * @see #SOURCE_CLASS_BUTTON */ public static final int SOURCE_DPAD = 0x00000200 | SOURCE_CLASS_BUTTON; - + + /** + * The input source is a game pad. + * (It may also be a {@link #SOURCE_JOYSTICK}). + * + * @see #SOURCE_CLASS_BUTTON + */ + public static final int SOURCE_GAMEPAD = 0x00000400 | SOURCE_CLASS_BUTTON; + /** * The input source is a touch screen pointing device. * @@ -148,7 +165,15 @@ public final class InputDevice implements Parcelable { * @see #SOURCE_CLASS_POSITION */ public static final int SOURCE_TOUCHPAD = 0x00100000 | SOURCE_CLASS_POSITION; - + + /** + * The input source is a joystick. + * (It may also be a {@link #SOURCE_GAMEPAD}). + * + * @see #SOURCE_CLASS_JOYSTICK + */ + public static final int SOURCE_JOYSTICK = 0x01000000 | SOURCE_CLASS_JOYSTICK; + /** * A special input source constant that is used when filtering input devices * to match devices that provide any type of input source. diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 941331a224dc..766969ad7c5b 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -533,8 +533,40 @@ public class KeyEvent extends InputEvent implements Parcelable { /** Key code constant: App switch key. * Should bring up the application switcher dialog. */ public static final int KEYCODE_APP_SWITCH = 187; - - private static final int LAST_KEYCODE = KEYCODE_APP_SWITCH; + /** Key code constant: Generic Game Pad Button #1.*/ + public static final int KEYCODE_BUTTON_1 = 188; + /** Key code constant: Generic Game Pad Button #2.*/ + public static final int KEYCODE_BUTTON_2 = 189; + /** Key code constant: Generic Game Pad Button #3.*/ + public static final int KEYCODE_BUTTON_3 = 190; + /** Key code constant: Generic Game Pad Button #4.*/ + public static final int KEYCODE_BUTTON_4 = 191; + /** Key code constant: Generic Game Pad Button #5.*/ + public static final int KEYCODE_BUTTON_5 = 192; + /** Key code constant: Generic Game Pad Button #6.*/ + public static final int KEYCODE_BUTTON_6 = 193; + /** Key code constant: Generic Game Pad Button #7.*/ + public static final int KEYCODE_BUTTON_7 = 194; + /** Key code constant: Generic Game Pad Button #8.*/ + public static final int KEYCODE_BUTTON_8 = 195; + /** Key code constant: Generic Game Pad Button #9.*/ + public static final int KEYCODE_BUTTON_9 = 196; + /** Key code constant: Generic Game Pad Button #10.*/ + public static final int KEYCODE_BUTTON_10 = 197; + /** Key code constant: Generic Game Pad Button #11.*/ + public static final int KEYCODE_BUTTON_11 = 198; + /** Key code constant: Generic Game Pad Button #12.*/ + public static final int KEYCODE_BUTTON_12 = 199; + /** Key code constant: Generic Game Pad Button #13.*/ + public static final int KEYCODE_BUTTON_13 = 200; + /** Key code constant: Generic Game Pad Button #14.*/ + public static final int KEYCODE_BUTTON_14 = 201; + /** Key code constant: Generic Game Pad Button #15.*/ + public static final int KEYCODE_BUTTON_15 = 202; + /** Key code constant: Generic Game Pad Button #16.*/ + public static final int KEYCODE_BUTTON_16 = 203; + + private static final int LAST_KEYCODE = KEYCODE_BUTTON_16; // NOTE: If you add a new keycode here you must also add it to: // isSystem() @@ -741,6 +773,22 @@ public class KeyEvent extends InputEvent implements Parcelable { "KEYCODE_PROG_YELLOW", "KEYCODE_PROG_BLUE", "KEYCODE_APP_SWITCH", + "KEYCODE_BUTTON_1", + "KEYCODE_BUTTON_2", + "KEYCODE_BUTTON_3", + "KEYCODE_BUTTON_4", + "KEYCODE_BUTTON_5", + "KEYCODE_BUTTON_6", + "KEYCODE_BUTTON_7", + "KEYCODE_BUTTON_8", + "KEYCODE_BUTTON_9", + "KEYCODE_BUTTON_10", + "KEYCODE_BUTTON_11", + "KEYCODE_BUTTON_12", + "KEYCODE_BUTTON_13", + "KEYCODE_BUTTON_14", + "KEYCODE_BUTTON_15", + "KEYCODE_BUTTON_16", }; // Symbolic names of all metakeys in bit order from least significant to most significant. diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java index b95de64aa4df..5db4895670b9 100644 --- a/core/java/android/view/MotionEvent.java +++ b/core/java/android/view/MotionEvent.java @@ -26,7 +26,8 @@ import android.os.SystemClock; * class may hold either absolute or relative movements, depending on what * it is being used for. * <p> - * On pointing devices such as touch screens, pointer coordinates specify absolute + * On pointing devices with source class {@link InputDevice#SOURCE_CLASS_POINTER} + * such as touch screens, the pointer coordinates specify absolute * positions such as view X/Y coordinates. Each complete gesture is represented * by a sequence of motion events with actions that describe pointer state transitions * and movements. A gesture starts with a motion event with {@link #ACTION_DOWN} @@ -38,11 +39,18 @@ import android.os.SystemClock; * by a motion event with {@link #ACTION_UP} or when gesture is canceled * with {@link #ACTION_CANCEL}. * </p><p> - * On trackballs, the pointer coordinates specify relative movements as X/Y deltas. + * On trackball devices with source class {@link InputDevice#SOURCE_CLASS_TRACKBALL}, + * the pointer coordinates specify relative movements as X/Y deltas. * A trackball gesture consists of a sequence of movements described by motion * events with {@link #ACTION_MOVE} interspersed with occasional {@link #ACTION_DOWN} * or {@link #ACTION_UP} motion events when the trackball button is pressed or released. * </p><p> + * On joystick devices with source class {@link InputDevice#SOURCE_CLASS_JOYSTICK}, + * the pointer coordinates specify the absolute position of the joystick axes. + * The joystick axis values are normalized to a range of -1.0 to 1.0 where 0.0 corresponds + * to the center position. More information about the set of available axes and the + * range of motion can be obtained using {@link InputDevice#getMotionRange}. + * </p><p> * Motion events always report movements for all pointers at once. The number * of pointers only ever changes by one as individual pointers go up and down, * except when the gesture is canceled. diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 0326a8f46182..83f91190f74d 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -99,6 +99,17 @@ public class Surface implements Parcelable { */ public static final int OPAQUE = 0x00000400; + /** + * Application requires a hardware-protected path to an + * external display sink. If a hardware-protected path is not available, + * then this surface will not be displayed on the external sink. + * + * @hide + */ + public static final int PROTECTED_APP = 0x00000800; + + // 0x1000 is reserved for an independent DRM protected flag in framework + /** Creates a normal surface. This is the default. */ public static final int FX_SURFACE_NORMAL = 0x00000000; diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f9629bd9975e..4fc9d806cabb 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2280,8 +2280,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility boolean mCanAcceptDrop; /** - * Flag indicating that a drag can cross window boundaries - * @hide + * Flag indicating that a drag can cross window boundaries. When + * {@link #startDrag(ClipData, DragShadowBuilder, Object, int)} is called + * with this flag set, all visible applications will be able to participate + * in the drag operation and receive the dragged content. */ public static final int DRAG_FLAG_GLOBAL = 1; @@ -4630,6 +4632,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } /** + * Pass a generic motion event down to the focused view. + * + * @param event The motion event to be dispatched. + * @return True if the event was handled by the view, false otherwise. + */ + public boolean dispatchGenericMotionEvent(MotionEvent event) { + return onGenericMotionEvent(event); + } + + /** * Called when the window containing this view gains or loses window focus. * ViewGroups should override to route to their children. * @@ -5136,6 +5148,37 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility } /** + * Implement this method to handle generic motion events. + * <p> + * Generic motion events are dispatched to the focused view to describe + * the motions of input devices such as joysticks. The + * {@link MotionEvent#getSource() source} of the motion event specifies + * the class of input that was received. Implementations of this method + * must examine the bits in the source before processing the event. + * The following code example shows how this is done. + * </p> + * <code> + * public boolean onGenericMotionEvent(MotionEvent event) { + * if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) { + * float x = event.getX(); + * float y = event.getY(); + * // process the joystick motion + * return true; + * } + * return super.onGenericMotionEvent(event); + * } + * </code> + * + * @param event The generic motion event being processed. + * + * @return Return true if you have consumed the event, false if you haven't. + * The default implementation always returns false. + */ + public boolean onGenericMotionEvent(MotionEvent event) { + return false; + } + + /** * Implement this method to handle touch screen motion events. * * @param event The motion event. diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index d0509b20134a..58d4f498ba03 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -1141,6 +1141,19 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager * {@inheritDoc} */ @Override + public boolean dispatchGenericMotionEvent(MotionEvent event) { + if ((mPrivateFlags & (FOCUSED | HAS_BOUNDS)) == (FOCUSED | HAS_BOUNDS)) { + return super.dispatchGenericMotionEvent(event); + } else if (mFocused != null && (mFocused.mPrivateFlags & HAS_BOUNDS) == HAS_BOUNDS) { + return mFocused.dispatchGenericMotionEvent(event); + } + return false; + } + + /** + * {@inheritDoc} + */ + @Override public boolean dispatchTouchEvent(MotionEvent ev) { if (!onFilterTouchEventForSecurity(ev)) { return false; diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index b1d509acfe79..ec1a373397ae 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -128,6 +128,11 @@ public final class ViewRoot extends Handler implements ViewParent, final TrackballAxis mTrackballAxisX = new TrackballAxis(); final TrackballAxis mTrackballAxisY = new TrackballAxis(); + int mLastJoystickXDirection; + int mLastJoystickYDirection; + int mLastJoystickXKeyCode; + int mLastJoystickYKeyCode; + final int[] mTmpLocation = new int[2]; final TypedValue mTmpValue = new TypedValue(); @@ -1924,6 +1929,7 @@ public final class ViewRoot extends Handler implements ViewParent, public final static int DISPATCH_DRAG_EVENT = 1015; public final static int DISPATCH_DRAG_LOCATION_EVENT = 1016; public final static int DISPATCH_SYSTEM_UI_VISIBILITY = 1017; + public final static int DISPATCH_GENERIC_MOTION = 1018; @Override public void handleMessage(Message msg) { @@ -1960,6 +1966,9 @@ public final class ViewRoot extends Handler implements ViewParent, case DISPATCH_TRACKBALL: deliverTrackballEvent((MotionEvent) msg.obj, msg.arg1 != 0); break; + case DISPATCH_GENERIC_MOTION: + deliverGenericMotionEvent((MotionEvent) msg.obj, msg.arg1 != 0); + break; case DISPATCH_APP_VISIBILITY: handleAppVisibility(msg.arg1 != 0); break; @@ -2472,6 +2481,102 @@ public final class ViewRoot extends Handler implements ViewParent, } } + private void deliverGenericMotionEvent(MotionEvent event, boolean sendDone) { + final int source = event.getSource(); + final boolean isJoystick = (source & InputDevice.SOURCE_CLASS_JOYSTICK) != 0; + + // If there is no view, then the event will not be handled. + if (mView == null || !mAdded) { + if (isJoystick) { + updateJoystickDirection(event, false); + } + finishGenericMotionEvent(event, sendDone, false); + return; + } + + // Deliver the event to the view. + if (mView.dispatchGenericMotionEvent(event)) { + ensureTouchMode(false); + if (isJoystick) { + updateJoystickDirection(event, false); + } + finishGenericMotionEvent(event, sendDone, true); + return; + } + + if (isJoystick) { + // Translate the joystick event into DPAD keys and try to deliver those. + updateJoystickDirection(event, true); + finishGenericMotionEvent(event, sendDone, true); + } else { + finishGenericMotionEvent(event, sendDone, false); + } + } + + private void finishGenericMotionEvent(MotionEvent event, boolean sendDone, boolean handled) { + event.recycle(); + if (sendDone) { + finishInputEvent(handled); + } + } + + private void updateJoystickDirection(MotionEvent event, boolean synthesizeNewKeys) { + final long time = event.getEventTime(); + final int metaState = event.getMetaState(); + final int deviceId = event.getDeviceId(); + final int source = event.getSource(); + final int xDirection = joystickAxisValueToDirection(event.getX()); + final int yDirection = joystickAxisValueToDirection(event.getY()); + + if (xDirection != mLastJoystickXDirection) { + if (mLastJoystickXKeyCode != 0) { + deliverKeyEvent(new KeyEvent(time, time, + KeyEvent.ACTION_UP, mLastJoystickXKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source), false); + mLastJoystickXKeyCode = 0; + } + + mLastJoystickXDirection = xDirection; + + if (xDirection != 0 && synthesizeNewKeys) { + mLastJoystickXKeyCode = xDirection > 0 + ? KeyEvent.KEYCODE_DPAD_RIGHT : KeyEvent.KEYCODE_DPAD_LEFT; + deliverKeyEvent(new KeyEvent(time, time, + KeyEvent.ACTION_DOWN, mLastJoystickXKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source), false); + } + } + + if (yDirection != mLastJoystickYDirection) { + if (mLastJoystickYKeyCode != 0) { + deliverKeyEvent(new KeyEvent(time, time, + KeyEvent.ACTION_UP, mLastJoystickYKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source), false); + mLastJoystickYKeyCode = 0; + } + + mLastJoystickYDirection = yDirection; + + if (yDirection != 0 && synthesizeNewKeys) { + mLastJoystickYKeyCode = yDirection > 0 + ? KeyEvent.KEYCODE_DPAD_DOWN : KeyEvent.KEYCODE_DPAD_UP; + deliverKeyEvent(new KeyEvent(time, time, + KeyEvent.ACTION_DOWN, mLastJoystickYKeyCode, 0, metaState, + deviceId, 0, KeyEvent.FLAG_FALLBACK, source), false); + } + } + } + + private static int joystickAxisValueToDirection(float value) { + if (value >= 0.5f) { + return 1; + } else if (value <= -0.5f) { + return -1; + } else { + return 0; + } + } + /** * Returns true if the key is used for keyboard navigation. * @param keyEvent The key event. @@ -3114,11 +3219,7 @@ public final class ViewRoot extends Handler implements ViewParent, } else if ((source & InputDevice.SOURCE_CLASS_TRACKBALL) != 0) { dispatchTrackball(event, sendDone); } else { - // TODO - Log.v(TAG, "Dropping unsupported motion event (unimplemented): " + event); - if (sendDone) { - finishInputEvent(false); - } + dispatchGenericMotion(event, sendDone); } } @@ -3143,7 +3244,14 @@ public final class ViewRoot extends Handler implements ViewParent, msg.arg1 = sendDone ? 1 : 0; sendMessageAtTime(msg, event.getEventTime()); } - + + private void dispatchGenericMotion(MotionEvent event, boolean sendDone) { + Message msg = obtainMessage(DISPATCH_GENERIC_MOTION); + msg.obj = event; + msg.arg1 = sendDone ? 1 : 0; + sendMessageAtTime(msg, event.getEventTime()); + } + public void dispatchAppVisibility(boolean visible) { Message msg = obtainMessage(DISPATCH_APP_VISIBILITY); msg.arg1 = visible ? 1 : 0; diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java index 217e731c39f9..2095a935ae0b 100644 --- a/core/java/android/view/Window.java +++ b/core/java/android/view/Window.java @@ -187,6 +187,18 @@ public abstract class Window { public boolean dispatchTrackballEvent(MotionEvent event); /** + * Called to process generic motion events. At the very least your + * implementation must call + * {@link android.view.Window#superDispatchGenericMotionEvent} to do the + * standard processing. + * + * @param event The generic motion event. + * + * @return boolean Return true if this event was consumed. + */ + public boolean dispatchGenericMotionEvent(MotionEvent event); + + /** * Called to process population of {@link AccessibilityEvent}s. * * @param event The event. @@ -1101,6 +1113,14 @@ public abstract class Window { public abstract boolean superDispatchTrackballEvent(MotionEvent event); /** + * Used by custom windows, such as Dialog, to pass the generic motion event + * further down the view hierarchy. Application developers should + * not need to implement or call this. + * + */ + public abstract boolean superDispatchGenericMotionEvent(MotionEvent event); + + /** * Retrieve the top-level window decor view (containing the standard * window frame/decorations and the client's content inside of that), which * can be added as a window to the window manager. diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 02e5b63d0503..ca932e958f0f 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -537,7 +537,7 @@ public interface WindowManager extends ViewManager { public static final int FLAG_DITHER = 0x00001000; /** Window flag: don't allow screen shots while this window is - * displayed. */ + * displayed. Maps to Surface.SECURE. */ public static final int FLAG_SECURE = 0x00002000; /** Window flag: a special mode where the layout parameters are used diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index e440eb90eef0..04062fe7cd39 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -45,6 +45,8 @@ import com.android.org.bouncycastle.crypto.digests.SHA1Digest; * are attached, as appropriate, to the request for revalidation of content. The * class also manages the cache size. * + * CacheManager may only be used if your activity contains a WebView. + * * @deprecated Access to the HTTP cache will be removed in a future release. */ @Deprecated diff --git a/core/jni/Android.mk b/core/jni/Android.mk index c635b39f32c3..d1e7e5cfbb49 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -124,6 +124,8 @@ LOCAL_SRC_FILES:= \ android_media_ToneGenerator.cpp \ android_hardware_Camera.cpp \ android_hardware_SensorManager.cpp \ + android_hardware_UsbDevice.cpp \ + android_hardware_UsbRequest.cpp \ android_debug_JNITest.cpp \ android_util_FileObserver.cpp \ android/opengl/poly_clip.cpp.arm \ @@ -202,6 +204,7 @@ LOCAL_SHARED_LIBRARIES := \ libwpa_client \ libjpeg \ libnfc_ndef \ + libusbhost \ ifeq ($(USE_OPENGL_RENDERER),true) LOCAL_SHARED_LIBRARIES += libhwui diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 342b8840ed51..c1c6c91e5adc 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -77,6 +77,8 @@ extern int register_android_opengl_jni_GLES20(JNIEnv* env); extern int register_android_hardware_Camera(JNIEnv *env); extern int register_android_hardware_SensorManager(JNIEnv *env); +extern int register_android_hardware_UsbDevice(JNIEnv *env); +extern int register_android_hardware_UsbRequest(JNIEnv *env); extern int register_android_media_AudioRecord(JNIEnv *env); extern int register_android_media_AudioSystem(JNIEnv *env); @@ -1275,6 +1277,8 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_com_android_internal_os_ZygoteInit), REG_JNI(register_android_hardware_Camera), REG_JNI(register_android_hardware_SensorManager), + REG_JNI(register_android_hardware_UsbDevice), + REG_JNI(register_android_hardware_UsbRequest), REG_JNI(register_android_media_AudioRecord), REG_JNI(register_android_media_AudioSystem), REG_JNI(register_android_media_AudioTrack), diff --git a/core/jni/android_hardware_UsbDevice.cpp b/core/jni/android_hardware_UsbDevice.cpp new file mode 100644 index 000000000000..90144509ffb9 --- /dev/null +++ b/core/jni/android_hardware_UsbDevice.cpp @@ -0,0 +1,268 @@ +/* + * 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. + */ + +#define LOG_TAG "UsbDeviceJNI" + +#include "utils/Log.h" + +#include "jni.h" +#include "JNIHelp.h" +#include "android_runtime/AndroidRuntime.h" + +#include <usbhost/usbhost.h> + +#include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + +using namespace android; + +static jfieldID field_context; + +struct usb_device* get_device_from_object(JNIEnv* env, jobject javaDevice) +{ + return (struct usb_device*)env->GetIntField(javaDevice, field_context); +} + +// in android_hardware_UsbEndpoint.cpp +extern struct usb_endpoint* get_endpoint_from_object(JNIEnv* env, jobject javaEndpoint); + +static jboolean +android_hardware_UsbDevice_open(JNIEnv *env, jobject thiz, jstring deviceName, + jobject fileDescriptor) +{ + int fd = getParcelFileDescriptorFD(env, fileDescriptor); + // duplicate the file descriptor, since ParcelFileDescriptor will eventually close its copy + fd = dup(fd); + if (fd < 0) + return false; + + const char *deviceNameStr = env->GetStringUTFChars(deviceName, NULL); + struct usb_device* device = usb_device_new(deviceNameStr, fd); + if (device) { + env->SetIntField(thiz, field_context, (int)device); + } else { + LOGE("usb_device_open failed for %s", deviceNameStr); + close(fd); + } + + env->ReleaseStringUTFChars(deviceName, deviceNameStr); + return (device != NULL); +} + +static void +android_hardware_UsbDevice_close(JNIEnv *env, jobject thiz) +{ + LOGD("close\n"); + struct usb_device* device = get_device_from_object(env, thiz); + if (device) { + usb_device_close(device); + env->SetIntField(thiz, field_context, 0); + } +} + +static jint +android_hardware_UsbDevice_get_fd(JNIEnv *env, jobject thiz) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_get_fd"); + return -1; + } + return usb_device_get_fd(device); +} + +static jboolean +android_hardware_UsbDevice_claim_interface(JNIEnv *env, jobject thiz, int interfaceID, jboolean force) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_claim_interface"); + return -1; + } + + int ret = usb_device_claim_interface(device, interfaceID); + if (ret && force && errno == EBUSY) { + // disconnect kernel driver and try again + usb_device_connect_kernel_driver(device, interfaceID, false); + ret = usb_device_claim_interface(device, interfaceID); + } + return ret == 0; +} + +static jint +android_hardware_UsbDevice_release_interface(JNIEnv *env, jobject thiz, int interfaceID) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_release_interface"); + return -1; + } + int ret = usb_device_release_interface(device, interfaceID); + if (ret == 0) { + // allow kernel to reconnect its driver + usb_device_connect_kernel_driver(device, interfaceID, true); + } + return ret; +} + +static jint +android_hardware_UsbDevice_control_request(JNIEnv *env, jobject thiz, + jint requestType, jint request, jint value, jint index, + jbyteArray buffer, jint length, jint timeout) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_control_request"); + return -1; + } + + jbyte* bufferBytes = NULL; + if (buffer) { + if (env->GetArrayLength(buffer) < length) { + env->ThrowNew(env->FindClass("java/lang/ArrayIndexOutOfBoundsException"), NULL); + return -1; + } + bufferBytes = env->GetByteArrayElements(buffer, 0); + } + + jint result = usb_device_control_transfer(device, requestType, request, + value, index, bufferBytes, length, timeout); + + if (bufferBytes) + env->ReleaseByteArrayElements(buffer, bufferBytes, 0); + + return result; +} + +static jint +android_hardware_UsbDevice_bulk_request(JNIEnv *env, jobject thiz, + jint endpoint, jbyteArray buffer, jint length, jint timeout) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_control_request"); + return -1; + } + + jbyte* bufferBytes = NULL; + if (buffer) { + if (env->GetArrayLength(buffer) < length) { + env->ThrowNew(env->FindClass("java/lang/ArrayIndexOutOfBoundsException"), NULL); + return -1; + } + bufferBytes = env->GetByteArrayElements(buffer, 0); + } + + jint result = usb_device_bulk_transfer(device, endpoint, bufferBytes, length, timeout); + + if (bufferBytes) + env->ReleaseByteArrayElements(buffer, bufferBytes, 0); + + return result; +} + +static jobject +android_hardware_UsbDevice_request_wait(JNIEnv *env, jobject thiz) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_request_wait"); + return NULL; + } + + struct usb_request* request = usb_request_wait(device); + if (request) + return (jobject)request->client_data; + else + return NULL; +} + +static jstring +android_hardware_UsbDevice_get_serial(JNIEnv *env, jobject thiz) +{ + struct usb_device* device = get_device_from_object(env, thiz); + if (!device) { + LOGE("device is closed in native_request_wait"); + return NULL; + } + char* serial = usb_device_get_serial(device); + if (!serial) + return NULL; + jstring result = env->NewStringUTF(serial); + free(serial); + return result; +} + +static jint +android_hardware_UsbDevice_get_device_id(JNIEnv *env, jobject clazz, jstring name) +{ + const char *nameStr = env->GetStringUTFChars(name, NULL); + int id = usb_device_get_unique_id_from_name(nameStr); + env->ReleaseStringUTFChars(name, nameStr); + return id; +} + +static jstring +android_hardware_UsbDevice_get_device_name(JNIEnv *env, jobject clazz, jint id) +{ + char* name = usb_device_get_name_from_unique_id(id); + jstring result = env->NewStringUTF(name); + free(name); + return result; +} + +static JNINativeMethod method_table[] = { + {"native_open", "(Ljava/lang/String;Ljava/io/FileDescriptor;)Z", + (void *)android_hardware_UsbDevice_open}, + {"native_close", "()V", (void *)android_hardware_UsbDevice_close}, + {"native_get_fd", "()I", (void *)android_hardware_UsbDevice_get_fd}, + {"native_claim_interface", "(IZ)Z",(void *)android_hardware_UsbDevice_claim_interface}, + {"native_release_interface","(I)Z", (void *)android_hardware_UsbDevice_release_interface}, + {"native_control_request", "(IIII[BII)I", + (void *)android_hardware_UsbDevice_control_request}, + {"native_bulk_request", "(I[BII)I", + (void *)android_hardware_UsbDevice_bulk_request}, + {"native_request_wait", "()Landroid/hardware/UsbRequest;", + (void *)android_hardware_UsbDevice_request_wait}, + { "native_get_serial", "()Ljava/lang/String;", + (void*)android_hardware_UsbDevice_get_serial }, + + // static methods + { "native_get_device_id", "(Ljava/lang/String;)I", + (void*)android_hardware_UsbDevice_get_device_id }, + { "native_get_device_name", "(I)Ljava/lang/String;", + (void*)android_hardware_UsbDevice_get_device_name }, +}; + +int register_android_hardware_UsbDevice(JNIEnv *env) +{ + jclass clazz = env->FindClass("android/hardware/UsbDevice"); + if (clazz == NULL) { + LOGE("Can't find android/hardware/UsbDevice"); + return -1; + } + field_context = env->GetFieldID(clazz, "mNativeContext", "I"); + if (field_context == NULL) { + LOGE("Can't find UsbDevice.mNativeContext"); + return -1; + } + + return AndroidRuntime::registerNativeMethods(env, "android/hardware/UsbDevice", + method_table, NELEM(method_table)); +} + diff --git a/core/jni/android_hardware_UsbEndpoint.cpp b/core/jni/android_hardware_UsbEndpoint.cpp new file mode 100644 index 000000000000..00c82351ac12 --- /dev/null +++ b/core/jni/android_hardware_UsbEndpoint.cpp @@ -0,0 +1,124 @@ +/* + * 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. + */ + +#define LOG_TAG "UsbEndpoint" + +#include "utils/Log.h" + +#include "jni.h" +#include "JNIHelp.h" +#include "android_runtime/AndroidRuntime.h" + +#include <usbhost/usbhost.h> + +#include <stdio.h> + +using namespace android; + +static jfieldID field_context; +static jfieldID field_address; +static jfieldID field_attributes; +static jfieldID field_max_packet_size; +static jfieldID field_interval; + +struct usb_endpoint* get_endpoint_from_object(JNIEnv* env, jobject javaEndpoint) +{ + return (struct usb_endpoint*)env->GetIntField(javaEndpoint, field_context); +} + +// in android_hardware_UsbDevice.cpp +extern struct usb_device* get_device_from_object(JNIEnv* env, jobject javaDevice); + +static jboolean +android_hardware_UsbEndpoint_init(JNIEnv *env, jobject thiz, jobject javaDevice) +{ + LOGD("open\n"); + + struct usb_device* device = get_device_from_object(env, javaDevice); + if (!device) { + LOGE("device null in native_init"); + return false; + } + + // construct an endpoint descriptor from the Java object fields + struct usb_endpoint_descriptor desc; + desc.bLength = USB_DT_ENDPOINT_SIZE; + desc.bDescriptorType = USB_DT_ENDPOINT; + desc.bEndpointAddress = env->GetIntField(thiz, field_address); + desc.bmAttributes = env->GetIntField(thiz, field_attributes); + desc.wMaxPacketSize = env->GetIntField(thiz, field_max_packet_size); + desc.bInterval = env->GetIntField(thiz, field_interval); + + struct usb_endpoint* endpoint = usb_endpoint_init(device, &desc); + if (endpoint) + env->SetIntField(thiz, field_context, (int)device); + return (endpoint != NULL); +} + +static void +android_hardware_UsbEndpoint_close(JNIEnv *env, jobject thiz) +{ + LOGD("close\n"); + struct usb_endpoint* endpoint = get_endpoint_from_object(env, thiz); + if (endpoint) { + usb_endpoint_close(endpoint); + env->SetIntField(thiz, field_context, 0); + } +} + +static JNINativeMethod method_table[] = { + {"native_init", "(Landroid/hardware/UsbDevice;)Z", + (void *)android_hardware_UsbEndpoint_init}, + {"native_close", "()V", (void *)android_hardware_UsbEndpoint_close}, +}; + +int register_android_hardware_UsbEndpoint(JNIEnv *env) +{ + jclass clazz = env->FindClass("android/hardware/UsbEndpoint"); + if (clazz == NULL) { + LOGE("Can't find android/hardware/UsbEndpoint"); + return -1; + } + field_context = env->GetFieldID(clazz, "mNativeContext", "I"); + if (field_context == NULL) { + LOGE("Can't find UsbEndpoint.mNativeContext"); + return -1; + } + field_address = env->GetFieldID(clazz, "mAddress", "I"); + if (field_address == NULL) { + LOGE("Can't find UsbEndpoint.mAddress"); + return -1; + } + field_attributes = env->GetFieldID(clazz, "mAttributes", "I"); + if (field_attributes == NULL) { + LOGE("Can't find UsbEndpoint.mAttributes"); + return -1; + } + field_max_packet_size = env->GetFieldID(clazz, "mMaxPacketSize", "I"); + if (field_max_packet_size == NULL) { + LOGE("Can't find UsbEndpoint.mMaxPacketSize"); + return -1; + } + field_interval = env->GetFieldID(clazz, "mInterval", "I"); + if (field_interval == NULL) { + LOGE("Can't find UsbEndpoint.mInterval"); + return -1; + } + + return AndroidRuntime::registerNativeMethods(env, "android/hardware/UsbEndpoint", + method_table, NELEM(method_table)); +} + diff --git a/core/jni/android_hardware_UsbRequest.cpp b/core/jni/android_hardware_UsbRequest.cpp new file mode 100644 index 000000000000..710afae64353 --- /dev/null +++ b/core/jni/android_hardware_UsbRequest.cpp @@ -0,0 +1,217 @@ +/* + * 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. + */ + +#define LOG_TAG "UsbRequestJNI" + +#include "utils/Log.h" + +#include "jni.h" +#include "JNIHelp.h" +#include "android_runtime/AndroidRuntime.h" + +#include <usbhost/usbhost.h> + +#include <stdio.h> + +using namespace android; + +static jfieldID field_context; + +struct usb_request* get_request_from_object(JNIEnv* env, jobject java_request) +{ + return (struct usb_request*)env->GetIntField(java_request, field_context); +} + +// in android_hardware_UsbDevice.cpp +extern struct usb_device* get_device_from_object(JNIEnv* env, jobject java_device); + +static jboolean +android_hardware_UsbRequest_init(JNIEnv *env, jobject thiz, jobject java_device, + jint ep_address, jint ep_attributes, jint ep_max_packet_size, jint ep_interval) +{ + LOGD("init\n"); + + struct usb_device* device = get_device_from_object(env, java_device); + if (!device) { + LOGE("device null in native_init"); + return false; + } + + // construct an endpoint descriptor from the Java object fields + struct usb_endpoint_descriptor desc; + desc.bLength = USB_DT_ENDPOINT_SIZE; + desc.bDescriptorType = USB_DT_ENDPOINT; + desc.bEndpointAddress = ep_address; + desc.bmAttributes = ep_attributes; + desc.wMaxPacketSize = ep_max_packet_size; + desc.bInterval = ep_interval; + + struct usb_request* request = usb_request_new(device, &desc); + if (request) + env->SetIntField(thiz, field_context, (int)request); + return (request != NULL); +} + +static void +android_hardware_UsbRequest_close(JNIEnv *env, jobject thiz) +{ + LOGD("close\n"); + struct usb_request* request = get_request_from_object(env, thiz); + if (request) { + usb_request_free(request); + env->SetIntField(thiz, field_context, 0); + } +} + +static jboolean +android_hardware_UsbRequest_queue_array(JNIEnv *env, jobject thiz, + jbyteArray buffer, jint length, jboolean out) +{ + struct usb_request* request = get_request_from_object(env, thiz); + if (!request) { + LOGE("request is closed in native_queue"); + return false; + } + + if (buffer && length) { + request->buffer = malloc(length); + if (!request->buffer) + return false; + if (out) { + // copy data from Java buffer to native buffer + env->GetByteArrayRegion(buffer, 0, length, (jbyte *)request->buffer); + } + } else { + request->buffer = NULL; + } + request->buffer_length = length; + + if (usb_request_queue(request)) { + if (request->buffer) { + // free our buffer if usb_request_queue fails + free(request->buffer); + request->buffer = NULL; + } + return false; + } else { + // save a reference to ourselves so UsbDevice.waitRequest() can find us + request->client_data = (void *)env->NewGlobalRef(thiz); + return true; + } +} + +static void +android_hardware_UsbRequest_dequeue_array(JNIEnv *env, jobject thiz, + jbyteArray buffer, jint length, jboolean out) +{ + struct usb_request* request = get_request_from_object(env, thiz); + if (!request) { + LOGE("request is closed in native_dequeue"); + return; + } + + if (buffer && length && request->buffer && !out) { + // copy data from native buffer to Java buffer + env->SetByteArrayRegion(buffer, 0, length, (jbyte *)request->buffer); + } + free(request->buffer); + env->DeleteGlobalRef((jobject)request->client_data); + +} + +static jboolean +android_hardware_UsbRequest_queue_direct(JNIEnv *env, jobject thiz, + jobject buffer, jint length, jboolean out) +{ + struct usb_request* request = get_request_from_object(env, thiz); + if (!request) { + LOGE("request is closed in native_queue"); + return false; + } + + if (buffer && length) { + request->buffer = env->GetDirectBufferAddress(buffer); + if (!request->buffer) + return false; + } else { + request->buffer = NULL; + } + request->buffer_length = length; + + if (usb_request_queue(request)) { + request->buffer = NULL; + return false; + } else { + // save a reference to ourselves so UsbDevice.waitRequest() can find us + // we also need this to make sure our native buffer is not deallocated + // while IO is active + request->client_data = (void *)env->NewGlobalRef(thiz); + return true; + } +} + +static void +android_hardware_UsbRequest_dequeue_direct(JNIEnv *env, jobject thiz) +{ + struct usb_request* request = get_request_from_object(env, thiz); + if (!request) { + LOGE("request is closed in native_dequeue"); + return; + } + // all we need to do is delete our global ref + env->DeleteGlobalRef((jobject)request->client_data); +} + +static jboolean +android_hardware_UsbRequest_cancel(JNIEnv *env, jobject thiz) +{ + struct usb_request* request = get_request_from_object(env, thiz); + if (!request) { + LOGE("request is closed in native_cancel"); + return false; + } + return (usb_request_cancel(request) == 0); +} + +static JNINativeMethod method_table[] = { + {"native_init", "(Landroid/hardware/UsbDevice;IIII)Z", + (void *)android_hardware_UsbRequest_init}, + {"native_close", "()V", (void *)android_hardware_UsbRequest_close}, + {"native_queue_array", "([BIZ)Z", (void *)android_hardware_UsbRequest_queue_array}, + {"native_dequeue_array", "([BIZ)V", (void *)android_hardware_UsbRequest_dequeue_array}, + {"native_queue_direct", "(Ljava/nio/ByteBuffer;IZ)Z", + (void *)android_hardware_UsbRequest_queue_direct}, + {"native_dequeue_direct", "()V", (void *)android_hardware_UsbRequest_dequeue_direct}, + {"native_cancel", "()Z", (void *)android_hardware_UsbRequest_cancel}, +}; + +int register_android_hardware_UsbRequest(JNIEnv *env) +{ + jclass clazz = env->FindClass("android/hardware/UsbRequest"); + if (clazz == NULL) { + LOGE("Can't find android/hardware/UsbRequest"); + return -1; + } + field_context = env->GetFieldID(clazz, "mNativeContext", "I"); + if (field_context == NULL) { + LOGE("Can't find UsbRequest.mNativeContext"); + return -1; + } + + return AndroidRuntime::registerNativeMethods(env, "android/hardware/UsbRequest", + method_table, NELEM(method_table)); +} + diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 351f264c1a6d..3adf7705cca9 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -21,6 +21,7 @@ #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> #include <arpa/inet.h> +#include <cutils/properties.h> extern "C" { int ifc_enable(const char *ifname); @@ -30,15 +31,14 @@ int ifc_remove_host_routes(const char *ifname); int ifc_get_default_route(const char *ifname); int ifc_remove_default_route(const char *ifname); int ifc_reset_connections(const char *ifname); -int ifc_configure(const char *ifname, in_addr_t ipaddr, in_addr_t netmask, in_addr_t gateway, in_addr_t dns1, in_addr_t dns2); int dhcp_do_request(const char *ifname, - in_addr_t *ipaddr, - in_addr_t *gateway, - in_addr_t *mask, - in_addr_t *dns1, - in_addr_t *dns2, - in_addr_t *server, + const char *ipaddr, + const char *gateway, + uint32_t *prefixLength, + const char *dns1, + const char *dns2, + const char *server, uint32_t *lease); int dhcp_stop(const char *ifname); int dhcp_release_lease(const char *ifname); @@ -55,16 +55,16 @@ namespace android { * to look them up every time. */ static struct fieldIds { - jclass dhcpInfoClass; + jclass dhcpInfoInternalClass; jmethodID constructorId; jfieldID ipaddress; jfieldID gateway; - jfieldID netmask; + jfieldID prefixLength; jfieldID dns1; jfieldID dns2; jfieldID serverAddress; jfieldID leaseDuration; -} dhcpInfoFieldIds; +} dhcpInfoInternalFieldIds; static jint android_net_utils_enableInterface(JNIEnv* env, jobject clazz, jstring ifname) { @@ -149,21 +149,29 @@ static jint android_net_utils_resetConnections(JNIEnv* env, jobject clazz, jstri static jboolean android_net_utils_runDhcp(JNIEnv* env, jobject clazz, jstring ifname, jobject info) { int result; - in_addr_t ipaddr, gateway, mask, dns1, dns2, server; + char ipaddr[PROPERTY_VALUE_MAX]; + uint32_t prefixLength; + char gateway[PROPERTY_VALUE_MAX]; + char dns1[PROPERTY_VALUE_MAX]; + char dns2[PROPERTY_VALUE_MAX]; + char server[PROPERTY_VALUE_MAX]; uint32_t lease; const char *nameStr = env->GetStringUTFChars(ifname, NULL); - result = ::dhcp_do_request(nameStr, &ipaddr, &gateway, &mask, - &dns1, &dns2, &server, &lease); + if (nameStr == NULL) return (jboolean)false; + + result = ::dhcp_do_request(nameStr, ipaddr, gateway, &prefixLength, + dns1, dns2, server, &lease); env->ReleaseStringUTFChars(ifname, nameStr); - if (result == 0 && dhcpInfoFieldIds.dhcpInfoClass != NULL) { - env->SetIntField(info, dhcpInfoFieldIds.ipaddress, ipaddr); - env->SetIntField(info, dhcpInfoFieldIds.gateway, gateway); - env->SetIntField(info, dhcpInfoFieldIds.netmask, mask); - env->SetIntField(info, dhcpInfoFieldIds.dns1, dns1); - env->SetIntField(info, dhcpInfoFieldIds.dns2, dns2); - env->SetIntField(info, dhcpInfoFieldIds.serverAddress, server); - env->SetIntField(info, dhcpInfoFieldIds.leaseDuration, lease); + if (result == 0 && dhcpInfoInternalFieldIds.dhcpInfoInternalClass != NULL) { + env->SetObjectField(info, dhcpInfoInternalFieldIds.ipaddress, env->NewStringUTF(ipaddr)); + env->SetObjectField(info, dhcpInfoInternalFieldIds.gateway, env->NewStringUTF(gateway)); + env->SetIntField(info, dhcpInfoInternalFieldIds.prefixLength, prefixLength); + env->SetObjectField(info, dhcpInfoInternalFieldIds.dns1, env->NewStringUTF(dns1)); + env->SetObjectField(info, dhcpInfoInternalFieldIds.dns2, env->NewStringUTF(dns2)); + env->SetObjectField(info, dhcpInfoInternalFieldIds.serverAddress, + env->NewStringUTF(server)); + env->SetIntField(info, dhcpInfoInternalFieldIds.leaseDuration, lease); } return (jboolean)(result == 0); } @@ -193,24 +201,6 @@ static jstring android_net_utils_getDhcpError(JNIEnv* env, jobject clazz) return env->NewStringUTF(::dhcp_get_errmsg()); } -static jboolean android_net_utils_configureInterface(JNIEnv* env, - jobject clazz, - jstring ifname, - jint ipaddr, - jint mask, - jint gateway, - jint dns1, - jint dns2) -{ - int result; - uint32_t lease; - - const char *nameStr = env->GetStringUTFChars(ifname, NULL); - result = ::ifc_configure(nameStr, ipaddr, mask, gateway, dns1, dns2); - env->ReleaseStringUTFChars(ifname, nameStr); - return (jboolean)(result == 0); -} - // ---------------------------------------------------------------------------- /* @@ -228,10 +218,9 @@ static JNINativeMethod gNetworkUtilMethods[] = { (void *)android_net_utils_getDefaultRoute }, { "removeDefaultRoute", "(Ljava/lang/String;)I", (void *)android_net_utils_removeDefaultRoute }, { "resetConnections", "(Ljava/lang/String;)I", (void *)android_net_utils_resetConnections }, - { "runDhcp", "(Ljava/lang/String;Landroid/net/DhcpInfo;)Z", (void *)android_net_utils_runDhcp }, + { "runDhcp", "(Ljava/lang/String;Landroid/net/DhcpInfoInternal;)Z", (void *)android_net_utils_runDhcp }, { "stopDhcp", "(Ljava/lang/String;)Z", (void *)android_net_utils_stopDhcp }, { "releaseDhcpLease", "(Ljava/lang/String;)Z", (void *)android_net_utils_releaseDhcpLease }, - { "configureNative", "(Ljava/lang/String;IIIII)Z", (void *)android_net_utils_configureInterface }, { "getDhcpError", "()Ljava/lang/String;", (void*) android_net_utils_getDhcpError }, }; @@ -240,16 +229,16 @@ int register_android_net_NetworkUtils(JNIEnv* env) jclass netutils = env->FindClass(NETUTILS_PKG_NAME); LOG_FATAL_IF(netutils == NULL, "Unable to find class " NETUTILS_PKG_NAME); - dhcpInfoFieldIds.dhcpInfoClass = env->FindClass("android/net/DhcpInfo"); - if (dhcpInfoFieldIds.dhcpInfoClass != NULL) { - dhcpInfoFieldIds.constructorId = env->GetMethodID(dhcpInfoFieldIds.dhcpInfoClass, "<init>", "()V"); - dhcpInfoFieldIds.ipaddress = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "ipAddress", "I"); - dhcpInfoFieldIds.gateway = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "gateway", "I"); - dhcpInfoFieldIds.netmask = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "netmask", "I"); - dhcpInfoFieldIds.dns1 = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "dns1", "I"); - dhcpInfoFieldIds.dns2 = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "dns2", "I"); - dhcpInfoFieldIds.serverAddress = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "serverAddress", "I"); - dhcpInfoFieldIds.leaseDuration = env->GetFieldID(dhcpInfoFieldIds.dhcpInfoClass, "leaseDuration", "I"); + dhcpInfoInternalFieldIds.dhcpInfoInternalClass = env->FindClass("android/net/DhcpInfoInternal"); + if (dhcpInfoInternalFieldIds.dhcpInfoInternalClass != NULL) { + dhcpInfoInternalFieldIds.constructorId = env->GetMethodID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "<init>", "()V"); + dhcpInfoInternalFieldIds.ipaddress = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "ipAddress", "Ljava/lang/String;"); + dhcpInfoInternalFieldIds.gateway = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "gateway", "Ljava/lang/String;"); + dhcpInfoInternalFieldIds.prefixLength = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "prefixLength", "I"); + dhcpInfoInternalFieldIds.dns1 = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "dns1", "Ljava/lang/String;"); + dhcpInfoInternalFieldIds.dns2 = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "dns2", "Ljava/lang/String;"); + dhcpInfoInternalFieldIds.serverAddress = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "serverAddress", "Ljava/lang/String;"); + dhcpInfoInternalFieldIds.leaseDuration = env->GetFieldID(dhcpInfoInternalFieldIds.dhcpInfoInternalClass, "leaseDuration", "I"); } return AndroidRuntime::registerNativeMethods(env, diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp index ff46bdd2ba39..dfa36cee8176 100644 --- a/core/jni/android_net_TrafficStats.cpp +++ b/core/jni/android_net_TrafficStats.cpp @@ -30,6 +30,17 @@ namespace android { +enum Tx_Rx { + TX, + RX +}; + +enum Tcp_Udp { + TCP, + UDP, + TCP_AND_UDP +}; + // Returns an ASCII decimal number read from the specified file, -1 on error. static jlong readNumber(char const* filename) { #ifdef HAVE_ANDROID_OS @@ -140,16 +151,136 @@ static jlong getTotalRxBytes(JNIEnv* env, jobject clazz) { // Per-UID stats require reading from a constructed filename. +static jlong getUidBytes(JNIEnv* env, jobject clazz, jint uid, + enum Tx_Rx tx_or_rx, enum Tcp_Udp tcp_or_udp) { + char tcp_filename[80], udp_filename[80]; + jlong tcp_bytes = -1, udp_bytes = -1, total_bytes = -1; + + switch (tx_or_rx) { + case TX: + sprintf(tcp_filename, "/proc/uid_stat/%d/tcp_snd", uid); + sprintf(udp_filename, "/proc/uid_stat/%d/udp_snd", uid); + break; + case RX: + sprintf(tcp_filename, "/proc/uid_stat/%d/tcp_rcv", uid); + sprintf(udp_filename, "/proc/uid_stat/%d/udp_rcv", uid); + break; + default: + return -1; + } + + switch (tcp_or_udp) { + case TCP: + tcp_bytes = readNumber(tcp_filename); + total_bytes = (tcp_bytes >= 0) ? tcp_bytes : -1; + break; + case UDP: + udp_bytes = readNumber(udp_filename); + total_bytes = (udp_bytes >= 0) ? udp_bytes : -1; + break; + case TCP_AND_UDP: + tcp_bytes = readNumber(tcp_filename); + total_bytes += (tcp_bytes >= 0 ? tcp_bytes : 0); + + udp_bytes = readNumber(udp_filename); + total_bytes += (udp_bytes >= 0 ? udp_bytes : 0); + break; + default: + return -1; + } + + return total_bytes; +} + +static jlong getUidPkts(JNIEnv* env, jobject clazz, jint uid, + enum Tx_Rx tx_or_rx, enum Tcp_Udp tcp_or_udp) { + char tcp_filename[80], udp_filename[80]; + jlong tcp_pkts = -1, udp_pkts = -1, total_pkts = -1; + + switch (tx_or_rx) { + case TX: + sprintf(tcp_filename, "/proc/uid_stat/%d/tcp_snd_pkt", uid); + sprintf(udp_filename, "/proc/uid_stat/%d/udp_snd_pkt", uid); + break; + case RX: + sprintf(tcp_filename, "/proc/uid_stat/%d/tcp_rcv_pkt", uid); + sprintf(udp_filename, "/proc/uid_stat/%d/udp_rcv_pkt", uid); + break; + default: + return -1; + } + + switch (tcp_or_udp) { + case TCP: + tcp_pkts = readNumber(tcp_filename); + total_pkts = (tcp_pkts >= 0) ? tcp_pkts : -1; + break; + case UDP: + udp_pkts = readNumber(udp_filename); + total_pkts = (udp_pkts >= 0) ? udp_pkts : -1; + break; + case TCP_AND_UDP: + tcp_pkts = readNumber(tcp_filename); + total_pkts += (tcp_pkts >= 0 ? tcp_pkts : 0); + + udp_pkts = readNumber(udp_filename); + total_pkts += (udp_pkts >= 0 ? udp_pkts : 0); + break; + default: + return -1; + } + + return total_pkts; +} + static jlong getUidRxBytes(JNIEnv* env, jobject clazz, jint uid) { - char filename[80]; - sprintf(filename, "/proc/uid_stat/%d/tcp_rcv", uid); - return readNumber(filename); + return getUidBytes(env, clazz, uid, RX, TCP_AND_UDP); } static jlong getUidTxBytes(JNIEnv* env, jobject clazz, jint uid) { - char filename[80]; - sprintf(filename, "/proc/uid_stat/%d/tcp_snd", uid); - return readNumber(filename); + return getUidBytes(env, clazz, uid, TX, TCP_AND_UDP); +} + +/* TCP Segments + UDP Packets */ +static jlong getUidTxPackets(JNIEnv* env, jobject clazz, jint uid) { + return getUidPkts(env, clazz, uid, TX, TCP_AND_UDP); +} + +/* TCP Segments + UDP Packets */ +static jlong getUidRxPackets(JNIEnv* env, jobject clazz, jint uid) { + return getUidPkts(env, clazz, uid, RX, TCP_AND_UDP); +} + +static jlong getUidTcpTxBytes(JNIEnv* env, jobject clazz, jint uid) { + return getUidBytes(env, clazz, uid, TX, TCP); +} + +static jlong getUidTcpRxBytes(JNIEnv* env, jobject clazz, jint uid) { + return getUidBytes(env, clazz, uid, RX, TCP); +} + +static jlong getUidUdpTxBytes(JNIEnv* env, jobject clazz, jint uid) { + return getUidBytes(env, clazz, uid, TX, UDP); +} + +static jlong getUidUdpRxBytes(JNIEnv* env, jobject clazz, jint uid) { + return getUidBytes(env, clazz, uid, RX, UDP); +} + +static jlong getUidTcpTxSegments(JNIEnv* env, jobject clazz, jint uid) { + return getUidPkts(env, clazz, uid, TX, TCP); +} + +static jlong getUidTcpRxSegments(JNIEnv* env, jobject clazz, jint uid) { + return getUidPkts(env, clazz, uid, RX, TCP); +} + +static jlong getUidUdpTxPackets(JNIEnv* env, jobject clazz, jint uid) { + return getUidPkts(env, clazz, uid, TX, UDP); +} + +static jlong getUidUdpRxPackets(JNIEnv* env, jobject clazz, jint uid) { + return getUidPkts(env, clazz, uid, RX, UDP); } static JNINativeMethod gMethods[] = { @@ -161,8 +292,22 @@ static JNINativeMethod gMethods[] = { {"getTotalRxPackets", "()J", (void*) getTotalRxPackets}, {"getTotalTxBytes", "()J", (void*) getTotalTxBytes}, {"getTotalRxBytes", "()J", (void*) getTotalRxBytes}, + + /* Per-UID Stats */ {"getUidTxBytes", "(I)J", (void*) getUidTxBytes}, {"getUidRxBytes", "(I)J", (void*) getUidRxBytes}, + {"getUidTxPackets", "(I)J", (void*) getUidTxPackets}, + {"getUidRxPackets", "(I)J", (void*) getUidRxPackets}, + + {"getUidTcpTxBytes", "(I)J", (void*) getUidTcpTxBytes}, + {"getUidTcpRxBytes", "(I)J", (void*) getUidTcpRxBytes}, + {"getUidUdpTxBytes", "(I)J", (void*) getUidUdpTxBytes}, + {"getUidUdpRxBytes", "(I)J", (void*) getUidUdpRxBytes}, + + {"getUidTcpTxSegments", "(I)J", (void*) getUidTcpTxSegments}, + {"getUidTcpRxSegments", "(I)J", (void*) getUidTcpRxSegments}, + {"getUidUdpTxPackets", "(I)J", (void*) getUidUdpTxPackets}, + {"getUidUdpRxPackets", "(I)J", (void*) getUidUdpRxPackets}, }; int register_android_net_TrafficStats(JNIEnv* env) { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a91829caeb59..2dc0d3142565 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -85,6 +85,8 @@ <protected-broadcast android:name="android.hardware.action.USB_CONNECTED" /> <protected-broadcast android:name="android.hardware.action.USB_DISCONNECTED" /> <protected-broadcast android:name="android.hardware.action.USB_STATE" /> + <protected-broadcast android:name="android.hardware.action.USB_DEVICE_ATTACHED" /> + <protected-broadcast android:name="android.hardware.action.USB_DEVICE_DETACHED" /> <protected-broadcast android:name="android.nfc.action.LLCP_LINK_STATE_CHANGED" /> <protected-broadcast android:name="android.nfc.action.TRANSACTION_DETECTED" /> @@ -462,11 +464,10 @@ android:label="@string/permlab_flashlight" android:description="@string/permdesc_flashlight" /> - <!-- Allows an application to access USB devices - @hide --> + <!-- Allows an application to access USB devices --> <permission android:name="android.permission.ACCESS_USB" android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" - android:protectionLevel="signatureOrSystem" + android:protectionLevel="normal" android:label="@string/permlab_accessUsb" android:description="@string/permdesc_accessUsb" /> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 7c20a064d2bc..080d66db7790 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"وضع الطائرة"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"وضع الطائرة قيد التشغيل"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"وضع الطائرة متوقف"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"+100"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"الوضع الآمن"</string> <string name="android_system_label" msgid="6577375335728551336">"نظام Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"الخدمات التي تكلفك المال"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"للسماح للمالك بالالتزام بواجهة المستوى العلوي لطريقة الإرسال. لا يجب استخدامه على الإطلاق للتطبيقات العادية."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"الالتزام بخلفية ما"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"للسماح للمالك بالالتزام بواجهة المستوى العلوي للخلفية. لا يجب استخدامه على الإطلاق للتطبيقات العادية."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"التفاعل مع مشرف الجهاز"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"للسماح للمالك بإرسال الأهداف إلى أحد مشرفي الجهاز. لا يجب استخدامه على الإطلاق للتطبيقات العادية."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"تغيير اتجاه الشاشة"</string> @@ -469,7 +466,7 @@ <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"للسماح لتطبيق ما بالكتابة على وحدة تخزين USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"للسماح لتطبيق ما بالكتابة إلى بطاقة SD."</string> <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"تعديل/حذف محتويات وحدة تخزين الوسائط الداخلية"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"للسماح لأحد التطبيقات بتعديل محتويات وحدة تخزين الوسائط الداخلية."</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"للسماح لتطبيق ما بتعديل محتويات وحدة تخزين الوسائط الداخلية."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"الدخول إلى نظام ملفات ذاكرة التخزين المؤقت"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"للسماح لتطبيق ما بقراءة نظام ملفات ذاكرة التخزين المؤقت والكتابة به."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"إجراء/تلقي مكالمات عبر الإنترنت"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"تعيين الخادم الوكيل العمومي للجهاز لكي يتم استخدامه أثناء تمكين السياسة. يعين مشرف الجهاز الأول فقط الخادم الوكيل العمومي الفعال."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"تعيين انتهاء صلاحية كلمة المرور"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"التحكم في الوقت المستغرق قبل الحاجة إلى تغيير كلمة مرور شاشة التوقف"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"الرئيسية"</item> <item msgid="869923650527136615">"الجوال"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"العمل"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"غير ذلك"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"أدخل رقم التعريف الشخصي"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"أدخل كلمة المرور لإلغاء التأمين"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"أدخل رقم التعريف الشخصي (PIN) لإلغاء القفل"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"كود PIN غير صحيح!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"كلمة المرور"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"تسجيل الدخول"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"اسم المستخدم غير صحيح أو كلمة المرور غير صحيحة."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"جارٍ التحقق..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"إلغاء تأمين"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"تشغيل الصوت"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"تم توصيل تصحيح أخطاء USB"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"اختيار تعطيل تصحيح أخطاء USB."</string> <string name="select_input_method" msgid="6865512749462072765">"تحديد طريقة الإرسال"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" أ ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789 أ ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"العناصر المرشحة"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"بحث الويب"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"طلب تحديد الموقع"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"نعم"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"لا"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"تم تجاوز حد الحذف"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"حذف هذه العناصر."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"التراجع عن عمليات الحذف."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"عدم القيام بأي شيء الآن."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 58becbb1028c..d1176b8e3c4a 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Самолетен режим"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Самолетният режим е ВКЛЮЧЕН"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Самолетният режим е ИЗКЛЮЧЕН"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безопасен режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Системно от Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Услуги, които ви струват пари"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Разрешава на притежателя да се обвърже с интерфейса от най-високото ниво на метод на въвеждане. Нормалните приложения би трябвало никога да не се нуждаят от това."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"обвързване с тапет"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Разрешава на притежателя да се обвърже с интерфейса от най-високото ниво на тапет. Нормалните приложения би трябвало никога да не се нуждаят от това."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"взаимодействие с администратор на устройството"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Разрешава на притежателя да изпраща намерения до администратор на устройството. Нормалните приложения би трябвало никога да не се нуждаят от това."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"промяна на ориентацията на екрана"</string> @@ -468,7 +465,7 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"промяна/изтриване на съдържанието на SD картата"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Разрешава на приложението да записва в USB хранилището."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Разрешава на приложението да записва върху SD картата."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"пром./изтр. на съдърж. на вътр. мултим. хранил."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"промяна/изтриване на съдържанието на вътрешното мултимедийно хранилище"</string> <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Разрешава на приложението да променя съдържанието на вътрешното мултимедийно хранилище."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"достъп до файловата система на кеша"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Разрешава на приложението да чете и записва във файловата система на кеша."</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Задаване на глобалния прокси сървър, който да се използва, когато правилото е активирано. Само първият администратор на устройството задава действителния глобален прокси сървър."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Срок на валидност на паролата"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Контролирайте след колко време трябва да се променя паролата при заключване на екрана"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Домашен"</item> <item msgid="869923650527136615">"Мобилен"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Служебен"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Друг"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Въведете PIN кода"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Въведете паролата, за да отключите"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Въведете PIN за отключване"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Неправилен PIN код!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Парола"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Вход"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Потребителското име или паролата са невалидни."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Проверява се…"</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Отключване"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Включване на звука"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Отстраняването на грешки през USB е свързано"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Изберете, за да деактивирате отстраняването на грешки през USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Избиране на метод на въвеждане"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"кандидати"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Уеб търсене"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Заявка за споделяне на местоположението"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Да"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Не"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Лимитът за изтриване бе надхвърлен"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Изтриване на елементите."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Отмяна на изтриванията."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Да не се прави нищо засега."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 5a5e5ed1ab16..e352fc0912ee 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Mode d\'avió"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Mode d\'avió activat"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Mode d\'avió desactivat"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"+100"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode segur"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Serveis de pagament"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permet al titular vincular amb la interfície de nivell superior d\'un mètode d\'entrada. No s\'hauria de necessitar mai per a les aplicacions normals."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"vincular a un empaperat"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permet al titular vincular amb la interfície de nivell superior d\'un empaperat. No s\'hauria de necessitar mai per a les aplicacions normals."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar amb un administrador del dispositiu"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permet al titular enviar intencions a un administrador del sistema. No s\'hauria de necessitar mai per a les aplicacions normals."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"canviar l\'orientació de la pantalla"</string> @@ -468,8 +465,8 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificar/suprimir el contingut de les targetes SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Permet que una aplicació gravii a l\'emmagatzematge USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Permet a una aplicació escriure a la targeta SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"mod./sup. cont. emm. mult. in."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permet que una aplicació modifiqui el contingut de l\'emmagatzematge multimèdia intern."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modifica/suprimeix el contingut d\'emmagatzematge de mitjans interns"</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permet que una aplicació modifiqui el contingut de l\'emmagatzematge de mitjans interns."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"accedir al sistema de fitxers de la memòria cau"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permet a una aplicació llegir el sistema de fitxers de la memòria cau i escriure-hi."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"fes/rep trucades per Internet"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Defineix el servidor intermediari global del dispositiu que cal utilitzar mentre la política estigui activada. Només el primer administrador del dispositiu pot definir el servidor intermediari global efectiu."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Defineix la caducitat de la contrasenya"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Controla quant de temps abans de la pantalla de bloqueig cal canviar la contrasenya"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Casa"</item> <item msgid="869923650527136615">"Mòbil"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Feina"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Altres"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Introduïu el codi PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Introduïu la contrasenya per desbloquejar-lo"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Introdueix el PIN per desbloquejar"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Codi PIN incorrecte."</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Contrasenya"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Inicia la sessió"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nom d\'usuari o contrasenya no vàlids."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"S\'està comprovant..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloqueja"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"So activat"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuració d\'USB connectada"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleccioneu-ho per desactivar la depuració d\'USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Selecció del mètode d\'entrada"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidats"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Cerca al web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Sol·licitud d\'ubicació"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Sí"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"S\'ha superat el límit de supressions"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Suprimeix els elements."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Desfés les supressions."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"No facis res de moment."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index de34732e8b86..441ad012a555 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Vypínání..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Tablet se vypne."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Váš telefon bude vypnut."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Chcete telefon vypnout?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Nejnovější"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Žádné nedávno použité aplikace."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Možnosti tabletu"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Režim V letadle"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Režim V letadle je ZAPNUTÝ"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Režim V letadle je VYPNUTÝ"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Nouzový režim"</string> <string name="android_system_label" msgid="6577375335728551336">"Systém Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Zpoplatněné služby"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Umožňuje držiteli vázat se na nejvyšší úroveň rozhraní pro zadávání dat. Běžné aplikace by toto nastavení nikdy neměly využívat."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"vazba na tapetu"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Umožňuje držiteli navázat se na nejvyšší úroveň rozhraní tapety. Běžné aplikace by toto oprávnění nikdy neměly potřebovat."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"komunikovat se správcem zařízení"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Umožňuje držiteli oprávnění odesílat informace správci zařízení. Běžné aplikace by toto oprávnění nikdy neměly požadovat."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"změna orientace obrazovky"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Umožňuje aplikaci číst libovolné prostředky ve skupině diag, např. soubory ve složce /dev, a zapisovat do nich. Může dojít k ovlivnění stability a bezpečnosti systému. Toto nastavení by měl používat pouze výrobce či operátor pro diagnostiku hardwaru."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"povolení či zakázání komponent aplikací"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Umožňuje aplikaci změnit, zda je komponenta jiné aplikace povolena nebo ne. Škodlivé aplikace mohou pomocí tohoto nastavení vypnout důležité funkce tabletu. Je třeba postupovat opatrně, protože je možné způsobit nepoužitelnost, nekonzistenci či nestabilitu komponent aplikací."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Umožňuje aplikaci změnit, zda je komponenta jiné aplikace povolena nebo ne. Škodlivé aplikace mohou pomocí tohoto vypnout důležité funkce tabletu. Je třeba postupovat opatrně, protože je možné způsobit nepoužitelnost, nekonzistenci či nestabilitu komponent aplikací."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Umožňuje aplikaci změnit, zda je komponenta jiné aplikace povolena nebo ne. Škodlivé aplikace mohou pomocí tohoto nastavení vypnout důležité funkce tabletu. Je třeba postupovat opatrně, protože je možné způsobit nepoužitelnost, nekonzistenci či nestabilitu komponent aplikací."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"nastavení upřednostňovaných aplikací"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Umožňuje aplikaci změnit vaše upřednostňované aplikace. Toto nastavení může škodlivým aplikacím umožnit nepozorovaně změnit spouštěné aplikace a oklamat vaše existující aplikace tak, aby shromažďovaly vaše soukromá data."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"změna globálních nastavení systému"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"změna/smazání obsahu karty SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Umožní zápis do úložiště USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Umožní aplikaci zápis na kartu SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"Upravit/smazat interní úlož."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Povoluje aplikaci upravovat obsah interního úložiště médií."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"přistupovat do souborového systému mezipaměti"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Umožňuje aplikaci číst a zapisovat do souborového systému mezipaměti."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"uskutečňovat a přijímat internetové hovory"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Vyberte globální proxy server, který se bude používat, když jsou zásady aktivní. Aktuální globální proxy server nastavuje pouze první správce zařízení."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Nastavit konec platnosti hesla"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Ovládání doby, po jejímž uplynutí je nutné změnit heslo pro odemknutí obrazovky"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Domů"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Práce"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Jiné"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Zadejte kód PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Zadejte heslo pro odblokování"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Zadejte kód PIN pro odblokování"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Nesprávný kód PIN"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Heslo"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Přihlásit se"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Neplatné uživatelské jméno nebo heslo."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Probíhá kontrola..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Odemknout"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Zapnout zvuk"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Aut.vyp."</string> <string name="setup_autofill" msgid="8154593408885654044">"Nast. aut. vypl."</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"čtení historie a záložek Prohlížeče"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Umožňuje aplikaci číst všechny navštívené adresy URL a záložky Prohlížeče."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"zápis do historie a záložek Prohlížeče"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Ladění přes rozhraní USB připojeno"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Vyberte, chcete-li zakázat ladění USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Výběr metody zadávání dat"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AÁBCČDĎEÉĚFGHCHIÍJKLMNŇOÓPQRŘSŠTŤUÚVWXYÝZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789AÁBCČDĎEÉĚFGHCHIÍJKLMNŇOÓPQRŘSŠTŤUÚVWXYÝZŽ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidáti"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 shoda"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> z <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Hotovo"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Odpojování úložiště USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Odpojování karty SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Mazání úložiště USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Vyhledat na webu"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Požadavek informací o poloze"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ano"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Ne"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Byl překročen limit mazání."</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Smazat položky."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Vrátit mazání zpět."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Neprovádět akci."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index d14de3413a86..0242ee91e113 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Lukker ned ..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Din tabletcomputer slukkes nu."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Din telefon slukkes nu."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Vil du slukke?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Seneste"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Der er ingen nye programmer."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Valgmuligheder for tabletcomputeren"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Flytilstand"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flytilstand er TIL"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flytilstand er slået FRA"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Sikker tilstand"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Tjenester, der koster dig penge"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Tillader, at brugeren forpligter sig til en inputmetodes grænseflade på øverste niveau. Bør aldrig være nødvendig til normale programmer."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"forpligt til et tapet"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Tillader, at brugeren forpligter sig til et tapets grænseflade på øverste niveau. Bør aldrig være nødvendig til normale programmer."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"kommunikere med en enhedsadministrator"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Tillader brugeren at sende hensigter til en enhedsadministrator. Bør aldrig være nødvendigt for almindelige programmer."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"skift skærmretning"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Tillader, at et program læser og skriver til alle ressourcer, der ejes af diag-gruppen, som f.eks. flier i /dev. Dette kan muligvis påvirke systemets stabilitet og sikkerhed. Dette bør KUN bruges til hardwarespecifikke diagnosticeringer foretaget af producent eller udbyder."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"aktiver eller deaktiver programkomponenter"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Tillader, at et program ændrer, om en komponent fra et andet program er aktiveret eller ej. Ondsindede programmer kan bruge dette til at deaktivere vigtige funktioner på tabletcomputeren. Denne tilladelse skal anvendes med forsigtighed, da det kan forårsage ubrugelige, inkonsekvente eller ustabile programkomponenter."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Tillader, at et program ændrer, om en komponent fra et andet program er aktiveret eller ej. Ondsindede programmer kan bruge dette til at deaktivere vigtige funktioner på tabletcomputeren. Denne tilladelse skal anvendes med forsigtighed, da det kan forårsage ubrugelige, inkonsekvente eller ustabile programkomponenter."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Tillader, at et program ændrer, om en komponent fra et andet program er aktiveret eller ej. Ondsindede programmer kan bruge dette til at deaktivere vigtige funktioner på tabletcomputeren. Denne tilladelse skal anvendes med forsigtighed, da det kan forårsage ubrugelige, inkonsekvente eller ustabile programkomponenter."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"angiv foretrukne programmer"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Tillader, at et program ændrer dine foretrukne programmer. Dette kan medføre, at ondsindede programmer ændrer kørende programmer i det skjulte og narrer dine eksisterende programmer til at indsamle personlige oplysninger fra dig."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"rediger globale systemindstillinger"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"ret/slet indholdet på SD-kortet"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Tillad skriv til USB-lager."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Tillader, at et program skriver til SD-kortet."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"Rediger/slet internt medielagringsindhold"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Tillader, at applikationen ændrer indholdet af det interne medielagringsindhold."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"få adgang til cache-filsystemet"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Tillader, at et program læser og skriver til cache-filsystemet."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"foretage/modtage internetopkald"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Angiv enhedens globale proxy, der skal bruges, mens politikken er aktiveret. Kun den første enhedsadministrator angiver den effektive globale proxy."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Indstil udløb for adgangskode"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Kontroller, hvor lang tid der skal gå, før adgangskoden til skærmlåsen skal ændres."</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Hjem"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Arbejde"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Andre"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Indtast PIN-kode"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Indtast adgangskode for at låse op"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Indtast pinkode for at låse op"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Forkert PIN-kode!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Adgangskode"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Log ind"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ugyldigt brugernavn eller ugyldig adgangskode."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrollerer ..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Lås op"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Lyd slået til"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"AutoFyld"</string> <string name="setup_autofill" msgid="8154593408885654044">"Opsætning af AutoFyld"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"læs browserens oversigt og bogmærker"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Tillader, at programmet læser alle de webadresser, browseren har besøgt, og alle browserens bogmærker."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"skriv browserens oversigt og bogmærker"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-fejlretning er tilsluttet"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Vælg for at deaktivere USB-fejlretning."</string> <string name="select_input_method" msgid="6865512749462072765">"Vælg indtastningsmetode"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidater"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 match"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> af <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Udført"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Demonterer USB-lager..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Demonterer SD-kort..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Sletter USB-lager..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Websøgning"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Placeringsanmodning"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ja"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nej"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Grænsen for sletning er overskredet"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Slet elementerne."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Fortryd sletningerne."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Gør ikke noget lige nu."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index db8c75155b3e..87f14c51a091 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Wird heruntergefahren..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Ihr Tablet wird heruntergefahren."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Ihr Telefon wird heruntergefahren."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Soll das Gerät abgeschaltet werden?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Zuletzt verwendet"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Keine zuletzt verwendeten Anwendungen"</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Tablet-Optionen"</string> @@ -146,12 +147,13 @@ <string name="global_action_lock" msgid="2844945191792119712">"Display-Sperre"</string> <string name="global_action_power_off" msgid="4471879440839879722">"Ausschalten"</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Lautlos"</string> - <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Ton ist AUS."</string> - <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Ton ist AN."</string> + <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Ton ist aus"</string> + <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Ton ist AN"</string> <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Flugmodus"</string> - <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flugmodus ist AN."</string> - <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flugmodus ist AUS."</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> + <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flugmodus ist AN"</string> + <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flugmodus ist aus"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Abgesicherter Modus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Kostenpflichtige Dienste"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Ermöglicht dem Halter, sich an die Oberfläche einer Eingabemethode auf oberster Ebene zu binden. Sollte nie für normale Anwendungen benötigt werden."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"An einen Hintergrund binden"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Ermöglicht dem Halter, sich an die Oberfläche einer Eingabemethode auf oberster Ebene zu binden. Sollte nie für normale Anwendungen benötigt werden."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"Interaktion mit einem Geräteadministrator"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Ermöglicht dem Halter, Intents an einen Geräteadministrator zu senden. Sollte nie für normale Anwendungen benötigt werden."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"Bildschirmausrichtung ändern"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Ermöglicht einer Anwendung, alle Elemente in der Diagnosegruppe zu lesen und zu bearbeiten, etwa Dateien in \"/dev\". Dies könnte eine potenzielle Gefährdung für die Stabilität und Sicherheit des Systems darstellen und sollte NUR für Hardware-spezifische Diagnosen des Herstellers oder Netzbetreibers verwendet werden."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"Anwendungskomponenten aktivieren oder deaktivieren"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Ermöglicht einer Anwendung, die Komponente einer anderen Anwendung nach Belieben zu aktivieren oder zu deaktivieren. Schädliche Anwendungen können so wichtige Funktionen des Tablets deaktivieren. Bei der Erteilung dieser Berechtigung ist Vorsicht geboten, da die Anwendungskomponenten unbrauchbar, inkonsistent und instabil werden können."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Ermöglicht einer Anwendung, die Komponente einer anderen Anwendung nach Belieben zu aktivieren oder zu deaktivieren. Schädliche Anwendungen können so wichtige Funktionen des Tablets deaktivieren. Bei der Erteilung dieser Berechtigung ist Vorsicht geboten, da die Anwendungskomponenten unbrauchbar, inkonsistent und instabil werden können."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Ermöglicht einer Anwendung, die Komponente einer anderen Anwendung nach Belieben zu aktivieren oder zu deaktivieren. Schädliche Anwendungen können so wichtige Funktionen des Tablets deaktivieren. Bei der Erteilung dieser Berechtigung ist Vorsicht geboten, da die Anwendungskomponenten unbrauchbar, inkonsistent und instabil werden können."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"bevorzugte Einstellungen festlegen"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Ermöglicht einer Anwendung, Ihre bevorzugten Einstellungen zu ändern. Schädliche Anwendungen können so laufende Anwendungen ohne Ihr Wissen ändern, damit die vorhandenen Anwendungen private Daten von Ihnen sammeln."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"allgemeine Systemeinstellungen ändern"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"SD-Karten-Inhalt ändern/löschen"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Ermöglicht der Anwendung Schreiben in USB-Speicher"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Ermöglicht einer Anwendung, auf die SD-Karte zu schreiben"</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"Intern. Mediensp. änd./löschen"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Ermöglicht es einer Anwendung, den Inhalt des internen Medienspeichers zu ändern"</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"Zugriff auf das Cache-Dateisystem"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Gewährt einer Anwendung Lese- und Schreibzugriff auf das Cache-Dateisystem."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"Internetanrufe tätigen/annehmen"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Den globalen Proxy des Geräts zur Verwendung während der Aktivierung der Richtlinie festlegen. Nur der erste Geräteadministrator kann den gültigen globalen Proxy festlegen."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Ablauf des Passworts festlegen"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Zeitraum bis zur Änderung des Passworts für die Bildschirmsperre festlegen"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Privat"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Geschäftlich"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Sonstige"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN-Code eingeben"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Passwort zum Entsperren eingeben"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"PIN zum Entsperren eingeben"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Falscher PIN-Code!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Passwort"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Anmelden"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ungültiger Nutzername oder ungültiges Passwort."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Überprüfung..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Entsperren"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ton ein"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"AutoFill"</string> <string name="setup_autofill" msgid="8154593408885654044">"AutoFill-Setup"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"Browserverlauf und Lesezeichen lesen"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Ermöglicht der Anwendung, alle URLs, die mit dem Browser besucht wurden, sowie alle Lesezeichen des Browsers zu lesen."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"Browserverlauf und Lesezeichen schreiben"</string> @@ -878,14 +872,14 @@ <string name="sms_control_no" msgid="1715320703137199869">"Abbrechen"</string> <string name="time_picker_dialog_title" msgid="8349362623068819295">"Uhrzeit festlegen"</string> <string name="date_picker_dialog_title" msgid="5879450659453782278">"Datum festlegen"</string> - <string name="date_time_set" msgid="5777075614321087758">"Speichern"</string> + <string name="date_time_set" msgid="5777075614321087758">"Einstellen"</string> <string name="default_permission_group" msgid="2690160991405646128">"Standard"</string> <string name="no_permissions" msgid="7283357728219338112">"Keine Berechtigungen erforderlich"</string> <string name="perms_hide" msgid="7283915391320676226"><b>"Ausblenden"</b></string> <string name="perms_show_all" msgid="2671791163933091180"><b>"Alle anzeigen"</b></string> <string name="usb_storage_activity_title" msgid="2399289999608900443">"USB-Massenspeicher"</string> <string name="usb_storage_title" msgid="5901459041398751495">"USB-Verbindung"</string> - <string name="usb_storage_message" product="nosdcard" msgid="6631094834151575841">"Sie haben eine USB-Verbindung mit Ihrem Computer hergestellt. Berühren Sie die Schaltfläche unten, wenn Sie Dateien von Ihrem Computer in den USB-Speicher Ihres Android-Geräts und umgekehrt kopieren möchten."</string> + <string name="usb_storage_message" product="nosdcard" msgid="6631094834151575841">"Sie haben Ihr Telefon über USB mit Ihrem Computer verbunden. Berühren Sie die Schaltfläche unten, wenn Sie Dateien von Ihrem Computer in den USB-Speicher Ihres Android-Geräts und umgekehrt kopieren möchten."</string> <string name="usb_storage_message" product="default" msgid="4510858346516069238">"Sie haben Ihr Telefon über USB mit Ihrem Computer verbunden. Berühren Sie die Schaltfläche unten, wenn Sie Dateien von Ihrem Computer auf die SD-Karte Ihres Android-Geräts und umgekehrt kopieren möchten."</string> <string name="usb_storage_button_mount" msgid="1052259930369508235">"USB-Speicher aktivieren"</string> <string name="usb_storage_error_message" product="nosdcard" msgid="3276413764430468454">"Bei der Verwendung Ihres USB-Speichers als USB-Massenspeicher ist ein Problem aufgetreten."</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-Debugging verbunden"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Auswählen, um USB-Debugging zu deaktivieren."</string> <string name="select_input_method" msgid="6865512749462072765">"Eingabemethode auswählen"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"Kandidaten"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 Treffer"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> von <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Fertig"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"USB-Speicher wird getrennt..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"SD-Karte wird getrennt..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"USB-Speicher wird gelöscht..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Websuche"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Standortanfrage"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ja"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nein"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Löschbegrenzung überschritten"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Elemente löschen"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Löschen rückgängig machen"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Im Moment nichts unternehmen"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 456135186e7d..6b8db1e3108f 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Απενεργοποίηση..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Το tablet σας θα απενεργοποιηθεί."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Το τηλέφωνό σας θα απενεργοποιηθεί."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Θα θέλατε να τερματίσετε τη λειτουργία;"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Πρόσφατα"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Δεν υπάρχουν πρόσφατες εφαρμογές."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Επιλογές tablet"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Λειτουργία πτήσης"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Η λειτουργία πτήσης είναι ενεργοποιημένη."</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Η λειτουργία πτήσης είναι απενεργοποιημένη"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Ασφαλής λειτουργία"</string> <string name="android_system_label" msgid="6577375335728551336">"Σύστημα Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Υπηρεσίες επί πληρωμή"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Επιτρέπει στον κάτοχο τη δέσμευση στη διεπαφή ανωτάτου επιπέδου μιας μεθόδου εισόδου. Δεν είναι απαραίτητο για συνήθεις εφαρμογές."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"δέσμευση σε ταπετσαρία"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Επιτρέπει στον κάτοχο τη δέσμευση στη διεπαφή ανωτάτου επιπέδου μιας ταπετσαρίας. Δεν είναι απαραίτητο για συνήθεις εφαρμογές."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"επικοινωνία με έναν διαχειριστή συσκευής"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Επιτρέπει στον κάτοχο την αποστολή στόχων σε έναν διαχειριστή συσκευής. Δεν θα χρειαστεί ποτέ για κανονικές εφαρμογές."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"αλλαγή προσανατολισμού οθόνης"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Επιτρέπει σε μια εφαρμογή την ανάγνωση και την εγγραφή σε πόρο που ανήκει στην ομάδα διαγνωστικού (π.χ. αρχεία στον κατάλογο /dev). Αυτό ενδέχεται να επηρεάσει την σταθερότητα και την ασφάλεια του συστήματος. Θα πρέπει να χρησιμοποιείται ΜΟΝΟ για διαγνωστικά υλικού του κατασκευαστή ή του χειριστή."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"ενεργοποίηση ή απενεργοποίηση στοιχείων εφαρμογής"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Επιτρέπει σε μια εφαρμογή την επιλογή ενεργοποίησης ή μη ενός στοιχείου μιας άλλης εφαρμογής. Κακόβουλες εφαρμογές μπορούν να το χρησιμοποιήσουν για να απενεργοποιήσουν σημαντικές δυνατότητες του tablet. Η χορήγηση άδειας πρέπει να γίνεται με προσοχή, καθώς είναι πιθανό τα στοιχεία μιας εφαρμογής να καταστούν ασυνεχή, ασταθή ή να είναι αδύνατον να χρησιμοποιηθούν."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Επιτρέπει σε μια εφαρμογή την επιλογή ενεργοποίησης ή μη ενός στοιχείου μιας άλλης εφαρμογής. Κακόβουλες εφαρμογές μπορούν να το χρησιμοποιήσουν για να απενεργοποιήσουν σημαντικές δυνατότητες του tablet. Η χορήγηση άδειας πρέπει να γίνεται με προσοχή, καθώς είναι πιθανό τα στοιχεία μιας εφαρμογής να καταστούν ασυνεχή, ασταθή ή να είναι αδύνατον να χρησιμοποιηθούν."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Επιτρέπει σε μια εφαρμογή την επιλογή ενεργοποίησης ή μη ενός στοιχείου μιας άλλης εφαρμογής. Κακόβουλες εφαρμογές μπορούν να το χρησιμοποιήσουν για να απενεργοποιήσουν σημαντικές δυνατότητες του tablet. Η χορήγηση άδειας πρέπει να γίνεται με προσοχή, καθώς είναι πιθανό τα στοιχεία μιας εφαρμογής να καταστούν ασυνεχή, ασταθή ή να είναι αδύνατον να χρησιμοποιηθούν."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"ορισμός προτιμώμενων εφαρμογών"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Επιτρέπει σε μια εφαρμογή να τροποποιεί τις εφαρμογές που προτιμάτε. Αυτό ενδέχεται να δώσει τη δυνατότητα σε κακόβουλες εφαρμογές να αλλάξουν χωρίς ειδοποίηση τις εφαρμογές που εκτελούνται, \"ξεγελώντας\" τις υπάρχουσες εφαρμογές ώστε να συλλέξουν ιδιωτικά δεδομένα."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"τροποποίηση καθολικών ρυθμίσεων συστήματος"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"τροποποίηση/διαγραφή περιεχομένων κάρτας SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Επ. εγγρ. εφ. σε απ. χώρο USB"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Επιτρέπει στην εφαρμογή την εγγραφή στην κάρτα SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"τροπ./διαγ. περ. απ. εσ. μνήμ."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Επιτρέπει σε μια εφαρμογή την τροποποίηση περιεχομένων της αποθήκευσης εσωτερικής μνήμης."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"πρόσβαση στο σύστημα αρχείων προσωρινής μνήμης"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Επιτρέπει σε μια εφαρμογή την ανάγνωση και την εγγραφή του συστήματος αρχείων προσωρινής μνήμης."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"πραγματοποίηση/λήψη κλήσεων μέσω Διαδικτύου"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Ορίστε τη χρήση του γενικού διακομιστή μεσολάβησης της συσκευής όταν είναι ενεργοποιημένη η πολιτική. Μόνο ο διαχειριστής της πρώτης συσκευής ορίζει τον ισχύοντα γενικό διακομιστή μεσολάβησης."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Ορισμός λήξης κωδ. πρόσβασης"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Ελέγξτε πόσος χρόνος απομένει προτού πρέπει να αλλάξετε τον κωδικό πρόσβασης κλειδώματος της οθόνης"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Οικία"</item> <item msgid="869923650527136615">"Κινητό"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Εργασία"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Άλλο"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Πληκτρολογήστε τον κωδικό αριθμό PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Εισαγάγετε τον κωδικό πρόσβασης για ξεκλείδωμα"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Εισαγάγετε το PIN για ξεκλείδωμα"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Εσφαλμένος κωδικός αριθμός PIN!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Κωδικός πρόσβασης"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Σύνδεση"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Έλεγχος..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Ξεκλείδωμα"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ενεργοποίηση ήχου"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Αυτ.συμπ"</string> <string name="setup_autofill" msgid="8154593408885654044">"Ρύθμ. Αυτ. συμπ."</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ανάγνωση ιστορικού και σελιδοδεικτών προγράμματος περιήγησης"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Επιτρέπει στην εφαρμογή την ανάγνωση όλων των διευθύνσεων URL που το πρόγραμμα περιήγησης έχει επισκεφθεί και όλων των σελιδοδεικτών του προγράμματος περιήγησης."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"εγγραφή ιστορικού και σελιδοδεικτών προγράμματος περιήγησης"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Συνδέθηκε ο εντοπισμός σφαλμάτων USB"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Επιλογή για απενεργοποίηση του εντοπισμού σφαλμάτων USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Επιλογή μεθόδου εισόδου"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"υποψήφιοι"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 αποτέλεσμα"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> από <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Ολοκληρώθηκε"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Αποπροσάρτηση αποθηκευτικού χώρου USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Αποπροσάρτηση κάρτας SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Διαγραφή αποθηκευτικού χώρου USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Αναζήτηση ιστού"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Αίτημα τοποθεσίας"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ναι"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">" Όχι"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Έγινε υπέρβαση του ορίου διαγραφής."</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Διαγραφή αντικειμένων."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Αναίρεση των διαγραφών."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Να μην γίνει καμία ενέργεια τώρα."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 988bf963b041..a981ed644506 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Airplane mode"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Aiplane mode is ON"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Airplane mode is OFF"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Services that cost you money"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Allows the holder to bind to the top-level interface of an input method. Should never be needed for normal applications."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"bind to wallpaper"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Allows the holder to bind to the top-level interface of wallpaper. Should never be needed for normal applications."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interact with device admin"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Allows the holder to send intents to a device administrator. Should never be needed for normal applications."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"change screen orientation"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Set the device\'s global proxy to be used while policy is enabled. Only the first device admin sets the effective global proxy."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Set password expiry"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Control how long before lock-screen password needs to be changed"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Home"</item> <item msgid="869923650527136615">"Mobile"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Work"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Other"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Enter PIN code"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Enter password to unlock"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Enter PIN to unlock"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Incorrect PIN code!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Password"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Sign in"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Invalid username or password."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Checking..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Unlock"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sound on"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Select to disable USB debugging."</string> <string name="select_input_method" msgid="6865512749462072765">"Select input method"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidates"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Web Search"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Location request"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Yes"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Deletion limit exceeded"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Delete the items."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Undo the deletions."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Do nothing for now."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-es-rUS-xlarge/strings.xml b/core/res/res/values-es-rUS-xlarge/strings.xml new file mode 100644 index 000000000000..b1409baaf16c --- /dev/null +++ b/core/res/res/values-es-rUS-xlarge/strings.xml @@ -0,0 +1,337 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- XL --> + <string name="fileSizeSuffix" msgid="3468563433835560758">"Segmento <xliff:g id="NUMBER">%1$s</xliff:g><xliff:g id="UNIT">%2$s</xliff:g>"</string> + <!-- XL --> + <string name="unknownName" msgid="3202822008051920747">"(Desconocido)"</string> + <!-- XL --> + <string name="defaultVoiceMailAlphaTag" msgid="3668436100965334106">"Buzón de voz"</string> + <!-- XL --> + <string name="serviceClassVoice" msgid="7086876533404179039">"Google Voice"</string> + <!-- XL --> + <string name="cfTemplateNotForwarded" msgid="8534356655497306518">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: no se ha reenviado"</string> + <!-- XL --> + <string name="cfTemplateRegistered" msgid="1255841210142514510">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: no se ha reenviado"</string> + <!-- XL --> + <string name="cfTemplateRegisteredTime" msgid="7798907169190952367">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: no se ha reenviado"</string> + <!-- XL --> + <string name="notification_title" msgid="5210128823045542445">"Error al acceder a <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> + <!-- XL --> + <string name="low_memory" product="tablet" msgid="4855646606241379548">"¡El espacio de almacenamiento de la tableta está completo! Elimina algunos archivos para liberar espacio."</string> + <string name="low_memory" product="default" msgid="9195238880281578473">"¡El espacio de almacenamiento está completo! Elimina algunos archivos para liberar espacio."</string> + <!-- XL --> + <string name="power_dialog" product="tablet" msgid="6884163545695410971">"Opciones de tableta"</string> + <string name="power_dialog" product="default" msgid="8882103237148972564">"Opciones de teléfono"</string> + <!-- XL --> + <string name="silent_mode" msgid="5687977677409351252">"Modo silencio"</string> + <!-- XL --> + <string name="shutdown_confirm" product="tablet" msgid="5776903973889956395">"Tu tableta se apagará."</string> + <string name="shutdown_confirm" product="default" msgid="3040950969577046278">"Tu teléfono se apagará."</string> + <!-- XL --> + <string name="global_actions" product="tablet" msgid="110297659383505180">"Opciones de tableta"</string> + <string name="global_actions" product="default" msgid="2108237350837066773">"Opciones de teléfono"</string> + <!-- XL --> + <string name="global_action_toggle_silent_mode" msgid="4538951049191334644">"Modo silencio"</string> + <!-- XL --> + <string name="global_action_silent_mode_off_status" msgid="9045822172493147761">"El sonido está ENCENDIDO"</string> + <!-- XL --> + <string name="global_actions_airplane_mode_on_status" msgid="7272433204482202219">"El modo avión está ENCENDIDO"</string> + <!-- XL --> + <string name="android_system_label" msgid="844561213652704593">"Sistema Androide"</string> + <!-- XL --> + <string name="permgroupdesc_costMoney" msgid="4836624191696189469">"Admitir que las aplicaciones realicen actividades que se cobran."</string> + <!-- XL --> + <string name="permgroupdesc_developmentTools" msgid="5514251182135739578">"Las funciones sólo son necesarias para los programadores de aplicaciones."</string> + <!-- XL --> + <string name="permgrouplab_storage" msgid="746210798053836644">"Almacenamiento"</string> + <!-- XL --> + <string name="permdesc_readSms" product="tablet" msgid="3026416194429353337">"Permite que la aplicación lea los mensajes SMS almacenados en tu tableta o tarjeta SIM. Las aplicaciones maliciosas pueden leer tus mensajes confidenciales."</string> + <string name="permdesc_readSms" product="default" msgid="191875931331016383">"Admite que la aplicación lea los mensajes SMS almacenados en tu teléfono o tarjeta SIM. Las aplicaciones maliciosas pueden leer tus mensajes confidenciales."</string> + <!-- XL --> + <string name="permdesc_writeSms" product="tablet" msgid="692041754996169941">"Permite que la aplicación escriba a los mensajes SMS almacenados en tu tableta o tarjeta SIM. Las aplicaciones maliciosas pueden borrar tus mensajes."</string> + <string name="permdesc_writeSms" product="default" msgid="1659315878254882599">"Admite que la aplicación escriba a los mensajes SMS almacenados en tu teléfono o tarjeta SIM. Las aplicaciones maliciosas pueden borrar tus mensajes."</string> + <!-- XL --> + <string name="permlab_forceStopPackages" msgid="1277034765943155677">"provocar la detención de otras aplicaciones"</string> + <!-- XL --> + <string name="permlab_forceBack" msgid="4272218642115232597">"cerrar la aplicación a la fuerza"</string> + <!-- XL --> + <string name="permdesc_injectEvents" product="tablet" msgid="6096352450860864899">"Permite que una aplicación ofrezca sus propios eventos de entrada (presionar teclas, etc.) a otras aplicaciones. Las aplicaciones maliciosas pueden utilizarlo para tomar el control de la tableta."</string> + <string name="permdesc_injectEvents" product="default" msgid="2842435693076075109">"Admite una aplicación que ofrece sus propios eventos de entrada (presionar teclas, etc.) a otras aplicaciones. Las aplicaciones maliciosas pueden utilizarlo para tomar el control del teléfono."</string> + <!-- XL --> + <string name="permdesc_clearAppCache" product="tablet" msgid="1147333973960547529">"Permite que una aplicación libere espacio de almacenamiento en la tableta eliminando archivos del directorio de memoria caché de la aplicación. En general, el acceso es muy restringido para el proceso del sistema."</string> + <string name="permdesc_clearAppCache" product="default" msgid="5790679870501740958">"Admite una aplicación que libera espacio de almacenamiento en el teléfono al eliminar archivos del directorio de memoria caché de la aplicación. En general, el acceso es muy restringido para el proceso del sistema."</string> + <!-- XL --> + <string name="permdesc_readLogs" product="tablet" msgid="3701009088710926065">"Permite que una aplicación lea diversos archivos de registro del sistema. Esto le permite descubrir información general acerca de lo que haces con la tableta, y puede potencialmente incluir información personal o privada."</string> + <string name="permdesc_readLogs" product="default" msgid="8520101632251038537">"Admite una aplicación que lee diversos archivos de registro del sistema. Esto te permite descubrir información general acerca de lo que haces con el teléfono, y puede potencialmente incluir información personal o privada."</string> + <!-- XL --> + <string name="permdesc_changeComponentState" product="tablet" msgid="1791075936446230356">"Permite que una aplicación cambie si se debe activar o no un componente de otra aplicación. Las aplicaciones maliciosas pueden utilizarlo para desactivar funciones importantes de la tableta. Se debe tener cuidado con el permiso, ya que es posible que los componentes de la aplicación alcancen un estado inservible, imperfecto e inestable."</string> + <string name="permdesc_changeComponentState" product="default" msgid="587130297076242796">"Permite que una aplicación cambie si se debe activar o no un componente de otra aplicación. Las aplicaciones maliciosas pueden utilizarlo para desactivar funciones importantes del teléfono. Se debe tener cuidado con el permiso, ya que es posible que los componentes de la aplicación alcancen un estado inservible, imperfecto e inestable."</string> + <!-- XL --> + <string name="permdesc_receiveBootCompleted" product="tablet" msgid="8660405432665162821">"Permite que una aplicación se inicie en cuanto el sistema haya finalizado la inicialización. Esto puede ocasionar que la tableta demore más en inicializar y que la aplicación retarde el funcionamiento total de la tableta al estar en ejecución constante."</string> + <string name="permdesc_receiveBootCompleted" product="default" msgid="1827765096700833418">"Admite una aplicación que se inicia cuando el sistema haya finalizado la inicialización. Esto puede ocasionar que se demore más tiempo en inicializar el teléfono y que la aplicación retarde el funcionamiento total del teléfono al estar en ejecución constante."</string> + <!-- XL --> + <string name="permdesc_readContacts" product="tablet" msgid="1611730857475623952">"Permite que una aplicación lea todos los datos de de contacto (direcciones) almacenados en tu tableta. Las aplicaciones maliciosas pueden utilizarlo para enviar tus datos a otras personas."</string> + <string name="permdesc_readContacts" product="default" msgid="6610535719925788049">"Admite una aplicación que lee todos los datos de (direcciones) de contactos almacenados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para enviar tus eventos de calendario a otras personas."</string> + <!-- XL --> + <string name="permdesc_writeContacts" product="tablet" msgid="4572703488642353934">"Permite que una aplicación modifique los datos de (dirección) guardados en tu tableta. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos de contacto."</string> + <string name="permdesc_writeContacts" product="default" msgid="714397557711969040">"Admite una aplicación que modifica los datos de (dirección de) contacto guardados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos de contacto."</string> + <!-- XL --> + <string name="permdesc_readCalendar" product="tablet" msgid="2991522150157238929">"Permite que una aplicación lea todos los eventos de calendario almacenados en tu tableta. Las aplicaciones maliciosas pueden utilizarlo para enviar tus eventos de calendario a otras personas."</string> + <string name="permdesc_readCalendar" product="default" msgid="2618681024074734985">"Admite que una aplicación lea todos los eventos de calendario almacenados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para enviar tus eventos de calendario a otras personas."</string> + <!-- XL --> + <string name="permdesc_accessFineLocation" product="tablet" msgid="9186984659787705379">"Accede a las fuentes de ubicación precisa, como el Sistema de posicionamiento global en la tableta, si está disponible. Las aplicaciones maliciosas pueden utilizarlo para determinar donde te encuentras y puede consumir energía adicional de la batería."</string> + <string name="permdesc_accessFineLocation" product="default" msgid="7130852247133907221">"Accede a las fuentes de ubicación precisa, como el Sistema de posicionamiento global en el teléfono, si está disponible. Las aplicaciones maliciosas pueden utilizarlo para determinar donde te encuentras y puede consumir energía adicional de la batería."</string> + <!-- XL --> + <string name="permdesc_accessCoarseLocation" product="tablet" msgid="2943949975553225591">"Accede a las fuentes de ubicación aproximada, como la base de datos de la red de celulares, para determinar la ubicación aproximada de un tableta, si está disponible. Las aplicaciones maliciosas pueden utilizarlo para determinar aproximadamente dónde te encuentras."</string> + <string name="permdesc_accessCoarseLocation" product="default" msgid="7474972764638621839">"Accede a las fuentes de ubicación aproximada, como la base de datos de la red de celulares, para determinar una ubicación telefónica aproximada, si está disponible. Las aplicaciones maliciosas pueden utilizarlo para determinar aproximadamente donde te encuentras."</string> + <!-- XL --> + <string name="permlab_brick" product="tablet" msgid="6967130388106614085">"inhabilitar tableta de forma permanente"</string> + <string name="permlab_brick" product="default" msgid="3120283238813720510">"desactivar teléfono de manera permanente"</string> + <!-- XL --> + <string name="permdesc_brick" product="tablet" msgid="8506097851567246888">"Permite que la aplicación desactive todo la tableta de manera permanente. Esto es muy peligroso."</string> + <string name="permdesc_brick" product="default" msgid="6696459767254028146">"Admite que la aplicación desactive todo el teléfono de manera permanente. Esto es muy peligroso."</string> + <!-- XL --> + <string name="permlab_reboot" product="tablet" msgid="8299304590708874992">"forzar reinicio de la tableta"</string> + <string name="permlab_reboot" product="default" msgid="7761230490609718232">"provocar el reinicio del teléfono"</string> + <!-- XL --> + <string name="permdesc_reboot" product="tablet" msgid="8289402537687518137">"Permite que la aplicación provoque el reinicio de la tableta."</string> + <string name="permdesc_reboot" product="default" msgid="2425170170087532554">"Admite que la aplicación provoque que el teléfono se reinicie."</string> + <!-- XL --> + <string name="permlab_performCdmaProvisioning" product="tablet" msgid="1602175938040327630">"iniciar directamente la configuración CDMA de la tableta"</string> + <string name="permlab_performCdmaProvisioning" product="default" msgid="2364447039211144234">"comienza directamente la configuración CDMA del teléfono"</string> + <!-- XL --> + <string name="permlab_checkinProperties" msgid="8770356116386811264">"acceder a las propiedades de registro"</string> + <!-- XL --> + <string name="permlab_bindGadget" msgid="2772444448613501375">"elegir controles"</string> + <!-- XL --> + <string name="permdesc_bindGadget" msgid="5172327215211875807">"Admite que la aplicación indique al sistema cuáles controles puede utilizar cada aplicación. Con este permiso, las aplicaciones pueden brindar acceso a los datos personales a otras aplicaciones. Las aplicaciones normales no deben utilizarlo."</string> + <!-- XL --> + <string name="permlab_wakeLock" product="tablet" msgid="8548785337425173690">"evitar que la tableta entre en estado de inactividad"</string> + <string name="permlab_wakeLock" product="default" msgid="7590534090355174805">"evitar que el teléfono entre en estado de inactividad"</string> + <!-- XL --> + <string name="permdesc_wakeLock" product="tablet" msgid="6871828582124115814">"Permite que una aplicación evite que la tableta entre en estado de inactividad."</string> + <string name="permdesc_wakeLock" product="default" msgid="1200311528451468554">"Admite una aplicación que evita que el teléfono entre en estado de inactividad."</string> + <!-- XL --> + <string name="permlab_devicePower" product="tablet" msgid="4737873025369971061">"apagar o encender la tableta"</string> + <string name="permlab_devicePower" product="default" msgid="6879460773734563850">"apagar o encender el teléfono"</string> + <!-- XL --> + <string name="permdesc_devicePower" product="tablet" msgid="5930342678996327905">"Permite que una aplicación encienda o apague la tableta."</string> + <string name="permdesc_devicePower" product="default" msgid="6653901512148320818">"Admite que la aplicación encienda o apague el teléfono."</string> + <!-- XL --> + <string name="permdesc_factoryTest" product="tablet" msgid="396653994609190055">"Se ejecuta como una prueba de fábrica de bajo nivel que permite un acceso completo al hardware de la tableta. Sólo disponible cuando la tableta se ejecuta en el modo de prueba de fábrica."</string> + <string name="permdesc_factoryTest" product="default" msgid="4581239666568781766">"Se ejecuta como una prueba de fábrica de bajo nivel que permite un acceso completo al hardware del teléfono. Sólo disponible cuando un teléfono se ejecuta en el modo de prueba de fábrica."</string> + <!-- XL --> + <string name="permlab_setWallpaper" msgid="845032615203772571">"establecer fondo de pantalla"</string> + <!-- XL --> + <string name="permdesc_setWallpaper" msgid="3378501759667797259">"Admite que la aplicación establezca el fondo de pantalla del sistema."</string> + <!-- XL --> + <string name="permlab_setWallpaperHints" msgid="4995885499848128983">"establecer sugerencias de tamaño del fondo de pantalla"</string> + <!-- XL --> + <string name="permdesc_setWallpaperHints" msgid="8857901708691279048">"Admite que la aplicación establezca las sugerencias de tamaño del fondo de pantalla del sistema."</string> + <!-- XL --> + <string name="permdesc_setTime" product="tablet" msgid="7329574196603775554">"Permite que una aplicación cambie la hora de la tableta."</string> + <string name="permdesc_setTime" product="default" msgid="7787175369529849526">"Permite a una aplicación cambiar la hora del teléfono."</string> + <!-- XL --> + <string name="permdesc_setTimeZone" product="tablet" msgid="3851480395450283316">"Permite que una aplicación cambie la zona horaria de la tableta."</string> + <string name="permdesc_setTimeZone" product="default" msgid="3231143515254577541">"Admite una aplicación que cambia la zona horaria del teléfono."</string> + <!-- XL --> + <string name="permdesc_getAccounts" product="tablet" msgid="374861616407073729">"Permite que una aplicación obtenga una la lista de cuentas conocidas por la tableta."</string> + <string name="permdesc_getAccounts" product="default" msgid="6356501268884684429">"Admite una aplicación que obtiene la lista de cuentas conocidas del teléfono."</string> + <!-- XL --> + <string name="permdesc_bluetoothAdmin" product="tablet" msgid="8034248164659819866">"Permite que una aplicación configure el Bluetooth local de la tableta, y descubra y se vincule con dispositivos remotos."</string> + <string name="permdesc_bluetoothAdmin" product="default" msgid="2555370145147752776">"Admite una aplicación que configura el teléfono Bluetooth local y descubre y se vincula con dispositivos remotos."</string> + <!-- XL --> + <string name="permdesc_bluetooth" product="tablet" msgid="4631562404621086816">"Permite que una aplicación vea la configuración de la tableta Bluetooth local, y que realice y acepte conexiones con dispositivos vinculados."</string> + <string name="permdesc_bluetooth" product="default" msgid="1202135959389935958">"Admite una aplicación que ve la configuración del teléfono Bluetooth local, y realiza y acepta conexiones con dispositivos vinculados."</string> + <!-- XL --> + <string name="policydesc_watchLogin" product="tablet" msgid="7927990389488709968">"Supervisar el número de contraseñas incorrectas ingresadas al desbloquear la pantalla, y bloquear la tableta o eliminar todos los datos del teléfono si se ingresan demasiadas contraseñas incorrectas."</string> + <string name="policydesc_watchLogin" product="default" msgid="4998594853332798741">"Supervisa el número de contraseñas incorrectas ingresadas al desbloquear la pantalla, y bloquee el teléfono o elimine todos los datos del teléfono si se ingresan demasiadas contraseñas incorrectas."</string> + <!-- XL --> + <string name="policydesc_wipeData" product="tablet" msgid="7871059407132175855">"Borrar los datos de la tableta sin advertencias, restableciendo la configuración de fábrica"</string> + <string name="policydesc_wipeData" product="default" msgid="6003127471292136411">"Borrar los datos del teléfono sin advertencias al restablecer la configuración original"</string> + <!-- XL --> + <string-array name="phoneTypes"> + <item msgid="7066790683658405096">"Pantalla principal"</item> + <item msgid="5813675571320075289">"Teléfono móvil"</item> + <item msgid="1236863745322977021">"Trabajo"</item> + <item msgid="7018038125868933566">"Fax laboral"</item> + <item msgid="4280105707643078852">"Fax personal"</item> + <item msgid="6527083287534782580">"Localizador"</item> + <item msgid="706618935041239888">"Otro"</item> + <item msgid="8099625332540070724">"Personalizado"</item> + </string-array> + <!-- XL --> + <string-array name="emailAddressTypes"> + <item msgid="8080673853442355385">"Pantalla principal"</item> + <item msgid="924798042157989715">"Trabajo"</item> + <item msgid="1959796935508361158">"Otro"</item> + <item msgid="756534161520555926">"Personalizado"</item> + </string-array> + <!-- XL --> + <string-array name="postalAddressTypes"> + <item msgid="1166454994471190496">"Pantalla principal"</item> + <item msgid="3602955376664951787">"Trabajo"</item> + <item msgid="4646105398231575508">"Otro"</item> + <item msgid="8191179302220976184">"Personalizado"</item> + </string-array> + <!-- XL --> + <string-array name="imAddressTypes"> + <item msgid="2528436635522549040">"Pantalla principal"</item> + <item msgid="5834207144511084508">"Trabajo"</item> + <item msgid="3796683891024584813">"Otro"</item> + <item msgid="6644316676098098833">"Personalizado"</item> + </string-array> + <!-- XL --> + <string-array name="organizationTypes"> + <item msgid="6571823895277482483">"Trabajo"</item> + <item msgid="4013674940836786104">"Otro"</item> + <item msgid="8549998141814637453">"Personalizado"</item> + </string-array> + <!-- XL --> + <string name="phoneTypeHome" msgid="2087652870939635038">"Pantalla principal"</string> + <!-- XL --> + <string name="phoneTypeMobile" msgid="7084573626440935140">"Teléfono móvil"</string> + <!-- XL --> + <string name="emailTypeHome" msgid="1298773522695936612">"Pantalla principal"</string> + <!-- XL --> + <string name="emailTypeMobile" msgid="5515624509217674980">"Teléfono móvil"</string> + <!-- XL --> + <string name="postalTypeHome" msgid="7553888805834710738">"Pantalla principal"</string> + <!-- XL --> + <string name="imTypeHome" msgid="3732426015472142690">"Pantalla principal"</string> + <!-- XL --> + <string name="sipAddressTypeHome" msgid="8212230577724692911">"Pantalla principal"</string> + <!-- XL --> + <string name="lockscreen_pattern_instructions" msgid="9171665895877154059">"Extraer el patrón para desbloquear"</string> + <!-- XL --> + <string name="lockscreen_battery_short" msgid="891372653127247039">"Segmento <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> + <!-- XL --> + <string name="lockscreen_missing_sim_message" product="tablet" msgid="3961770350078423154">"No hay tarjeta SIM en la tableta."</string> + <string name="lockscreen_missing_sim_message" product="default" msgid="5997031739677800758">"No hay tarjeta SIM en el teléfono."</string> + <!-- XL --> + <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="2429599468920598896">"Has establecido incorrectamente tu gráfico de desbloqueo <xliff:g id="NUMBER_0">%d</xliff:g> veces. "\n\n"Vuelve a intentarlo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> + <!-- XL --> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="3211267232692817092">"Has establecido incorrectamente tu gráfico de desbloqueo <xliff:g id="NUMBER_0">%d</xliff:g> veces. Luego de <xliff:g id="NUMBER_1">%d</xliff:g> intentos incorrectos más, se te solicitará que desbloquees tu tableta al acceder a Google."\n\n" Vuelve a intentarlo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="7097890594752816076">"Has establecido incorrectamente tu gráfico de desbloqueo <xliff:g id="NUMBER_0">%d</xliff:g> veces. Luego de <xliff:g id="NUMBER_1">%d</xliff:g> intentos incorrectos, se te solicitará que desbloquees tu teléfono al acceder a Google. "\n\n" Vuelve a intentarlo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> + <!-- XL --> + <string name="lockscreen_glogin_submit_button" msgid="4760302858316749698">"Acceder"</string> + <!-- XL --> + <string name="lockscreen_glogin_invalid_input" msgid="7265806099449246244">"Nombre de usuario o contraseña no válidos."</string> + <!-- XL --> + <string name="hour_ampm" msgid="6161399724998500216">"Segmento <xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%P</xliff:g>"</string> + <!-- XL --> + <string name="hour_cap_ampm" msgid="724197720606114012">"Segmento <xliff:g id="HOUR">%-l</xliff:g><xliff:g id="AMPM">%p</xliff:g>"</string> + <!-- XL --> + <string name="double_tap_toast" msgid="2893001600485832537">"Sugerencia: presiona dos veces para acercar y alejar"</string> + <!-- XL --> + <string name="autofill_address_name_separator" msgid="5171727678145785075">" Segmento "</string> + <!-- XL --> + <string name="permlab_readHistoryBookmarks" msgid="6148149152792104516">"leer historial y favoritos del navegador"</string> + <!-- XL --> + <string name="permdesc_readHistoryBookmarks" msgid="7371336472744100059">"Permite a la aplicación leer todas las URL que ha visitado el navegador y todos los favoritos del navegador."</string> + <!-- XL --> + <string name="permlab_writeHistoryBookmarks" msgid="1369319390968848231">"escribir historial y favoritos del navegador"</string> + <!-- XL --> + <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="3870229397949634482">"Permite que una aplicación modifique el historial de navegación y los favoritos del navegador almacenados en tu tableta. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos en tu navegador."</string> + <string name="permdesc_writeHistoryBookmarks" product="default" msgid="6845659334691579933">"Permite a una aplicación modificar el historial y los favoritos del navegador almacenados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar tus datos."</string> + <!-- XL --> + <string name="permlab_setAlarm" msgid="8112208516527103653">"fija la alarma en el reloj de alarma"</string> + <!-- XL --> + <string name="permdesc_setAlarm" msgid="5454386032150297784">"Permite a la aplicación fijar una alarma en una aplicación de alarma. Es posible que algunas aplicaciones de alarma no implementen esta función."</string> + <!-- XL --> + <string name="menu_delete_shortcut_label" msgid="8482704027019632634">"eliminar"</string> + <!-- XL --> + <plurals name="num_minutes_ago"> + <item quantity="one" msgid="468685153446407901">"hace 1 minuto"</item> + <item quantity="other" msgid="211907662145171054">"Hace <xliff:g id="COUNT">%d</xliff:g> minutos"</item> + </plurals> + <!-- XL --> + <plurals name="num_hours_ago"> + <item quantity="one" msgid="2172827344495633666">"hace 1 hora"</item> + <item quantity="other" msgid="6094391999921908511">"Hace <xliff:g id="COUNT">%d</xliff:g> horas"</item> + </plurals> + <!-- XL --> + <plurals name="num_days_ago"> + <item quantity="one" msgid="3766494702684657165">"ayer"</item> + <item quantity="other" msgid="5030316952487658828">"Hace <xliff:g id="COUNT">%d</xliff:g> días"</item> + </plurals> + <!-- XL --> + <plurals name="abbrev_num_seconds_ago"> + <item quantity="one" msgid="1441918190525197797">"hace 1 s"</item> + <item quantity="other" msgid="3958332340802316933">"hace <xliff:g id="COUNT">%d</xliff:g> segundos"</item> + </plurals> + <!-- XL --> + <plurals name="abbrev_num_minutes_ago"> + <item quantity="one" msgid="3404245071272952255">"hace 1 min"</item> + <item quantity="other" msgid="6004808520903389765">"hace <xliff:g id="COUNT">%d</xliff:g> min"</item> + </plurals> + <!-- XL --> + <plurals name="abbrev_num_hours_ago"> + <item quantity="one" msgid="806010152744475654">"hace 1 hora"</item> + <item quantity="other" msgid="7553525762196895290">"Hace <xliff:g id="COUNT">%d</xliff:g> horas"</item> + </plurals> + <!-- XL --> + <plurals name="abbrev_num_days_ago"> + <item quantity="one" msgid="5819444260187611238">"ayer"</item> + <item quantity="other" msgid="1069986768190052012">"Hace <xliff:g id="COUNT">%d</xliff:g> días"</item> + </plurals> + <!-- XL --> + <string name="preposition_for_time" msgid="3606608741888559522">"a la/s <xliff:g id="TIME">%s</xliff:g>"</string> + <!-- XL --> + <string name="minutes" msgid="1486240209627391507">"min"</string> + <!-- XL --> + <string name="selectAll" msgid="847570914566450966">"Seleccionar todos"</string> + <!-- XL --> + <string name="low_internal_storage_view_text" product="tablet" msgid="6497548813789342134">"Está quedando poco espacio de almacenamiento en la tableta."</string> + <string name="low_internal_storage_view_text" product="default" msgid="2901569701336868928">"Hay poco espacio de almacenamiento en el teléfono."</string> + <!-- XL --> + <string name="capital_on" msgid="5705918046896729554">"ENCENDIDO"</string> + <!-- XL --> + <string name="wait" msgid="8036803866051401072">"Espera"</string> + <!-- XL --> + <string name="heavy_weight_notification" msgid="5762367358298413602">"<xliff:g id="APP">%1$s</xliff:g> se está ejecutando"</string> + <!-- XL --> + <string name="ext_media_checking_notification_title" product="nosdcard" msgid="103298639852047758">"Preparando almacenamiento USB"</string> + <string name="ext_media_checking_notification_title" product="default" msgid="2111086053471573248">"Preparando la tarjeta SD"</string> + <!-- XL --> + <string name="ime_action_done" msgid="7200237418945571897">"Listo"</string> + <!-- XL --> + <string name="wallpaper_binding_label" msgid="6966627494441714436">"Fondo de pantalla"</string> + <!-- XL --> + <string name="websearch" msgid="904596193450917688">"Búsqueda web"</string> + <!-- XL --> + <string name="status_bar_notification_info_overflow" msgid="1081154808901480710">"100+"</string> + <!-- XL --> + <string name="permlab_accessMtp" msgid="2385215229145694622">"implementar protocolo MTP"</string> + <!-- XL --> + <string name="permdesc_accessMtp" msgid="4707854877711083465">"Permite acceso al driver kernel MTP para implementar el protocolo MTP USB."</string> + <!-- XL --> + <string name="permlab_mediaStorageWrite" product="default" msgid="5585262071354704256">"modificar/eliminar los contenidos del almacenamientos de medios internos"</string> + <!-- XL --> + <string name="permdesc_mediaStorageWrite" product="default" msgid="2372999661142345443">"Permite que una aplicación modifique los contenidos del almacenamiento interno de medios."</string> + <!-- XL --> + <string name="autofill_address_summary_name_format" msgid="7531610259426153850">"$1$2$3"</string> + <!-- XL --> + <string name="autofill_address_summary_format" msgid="8398158823767723887">"$1$2$3"</string> + <!-- XL --> + <string name="gpsNotifTicker" msgid="6612390321359669319">"Solicitud de ubicación de <xliff:g id="NAME">%s</xliff:g>"</string> + <!-- XL --> + <string name="gpsNotifTitle" msgid="7533028619350196545">"Solicitud de ubicación"</string> + <!-- XL --> + <string name="gpsNotifMessage" msgid="5592972401593755530">"Solicitado por <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)"</string> + <!-- XL --> + <string name="gpsVerifYes" msgid="1511016393202739483">"Sí"</string> + <!-- XL --> + <string name="gpsVerifNo" msgid="661731239940896232">"No"</string> + <!-- XL --> + <string name="sync_too_many_deletes" msgid="6088394702274114202">"Eliminar el límite excedido"</string> + <!-- XL --> + <string name="sync_too_many_deletes_desc" msgid="4794082462774743277">"Existen <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> artículos eliminados para <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, cuenta <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. ¿Qué te gustaría hacer?"</string> + <!-- XL --> + <string name="sync_really_delete" msgid="7782215155483034729">"Eliminar artículos."</string> + <!-- XL --> + <string name="sync_undo_deletes" msgid="6501390120900825477">"Deshacer eliminaciones."</string> + <!-- XL --> + <string name="sync_do_nothing" msgid="612038572646360281">"No hagas nada por el momento."</string> +</resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 00af9c6ea823..5e6645d69a0b 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modo avión"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"El modo avión está Encendido"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"El modo avión está Apagado"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Servicios que te cuestan dinero"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permite al propietario vincularse a la interfaz de nivel superior de un método de entrada. Se debe evitar utilizarlo en aplicaciones normales."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"vincular a un fondo de pantalla"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite al propietario vincularse a la interfaz de nivel superior de un fondo de pantalla. Se debe evitar utilizarlo en aplicaciones normales."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar con un administrador de dispositivo"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite que el propietario envíe sus intentos a un administrador de dispositivos. No se necesita para las aplicaciones normales."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"cambiar la orientación de la pantalla"</string> @@ -289,7 +286,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Admite una aplicación que lee y escribe a cualquier recurso dentro del grupo de diagnóstico; por ejemplo, archivos con /dev. Esto puede afectar potencialmente la estabilidad y la seguridad del sistema. Debe utilizarlo SÓLO el fabricante o el operador en los diagnósticos específicos del hardware."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"activar o desactivar componentes de la aplicación"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Permite que una aplicación cambie si se debe activar o no un componente de otra aplicación. Las aplicaciones maliciosas pueden utilizarlo para desactivar funciones importantes del tablet. Se debe tener cuidado con el permiso, ya que es posible que los componentes de la aplicación alcancen un estado inservible, imperfecto e inestable."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que una aplicación cambie si se debe activar o no un componente de otra aplicación. Las aplicaciones maliciosas pueden utilizarlo para desactivar funciones importantes de la tableta. Se debe tener cuidado con el permiso, ya que es posible que los componentes de la aplicación alcancen un estado inservible, imperfecto e inestable."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que una aplicación cambie si se debe activar o no un componente de otra aplicación. Las aplicaciones maliciosas pueden utilizarlo para desactivar funciones importantes del tablet. Se debe tener cuidado con el permiso, ya que es posible que los componentes de la aplicación alcancen un estado inservible, imperfecto e inestable."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"establecer aplicaciones preferidas"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Admite una aplicación que modifica tus aplicaciones preferidas. Puede admitir aplicaciones maliciosas que cambien silenciosamente las aplicaciones que se ejecutan e imiten tus aplicaciones existentes para recopilar tus datos privados."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar la configuración global del sistema"</string> @@ -365,8 +362,10 @@ <string name="permdesc_flashlight" msgid="6433045942283802309">"Admite que la aplicación controle la linterna."</string> <string name="permlab_accessUsb" msgid="7362327818655760496">"acceder a dispositivos USB"</string> <string name="permdesc_accessUsb" msgid="2414271762914049292">"Permite que la aplicación acceda a dispositivos USB."</string> - <!-- outdated translation 2385215229145694622 --> <string name="permlab_accessMtp" msgid="4953468676795917042">"implementar protocolo MTP"</string> - <!-- outdated translation 4707854877711083465 --> <string name="permdesc_accessMtp" msgid="6532961200486791570">"Permite acceso al driver kernel MTP para implementar el protocolo MTP USB."</string> + <!-- no translation found for permlab_accessMtp (4953468676795917042) --> + <skip /> + <!-- no translation found for permdesc_accessMtp (6532961200486791570) --> + <skip /> <string name="permlab_hardware_test" msgid="4148290860400659146">"probar el hardware"</string> <string name="permdesc_hardware_test" msgid="3668894686500081699">"Admite que la aplicación controle diversos periféricos con el fin de probar el hardware."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"llamar directamente a números de teléfono"</string> @@ -466,8 +465,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificar/suprimir el contenido de la tarjeta SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Permite que una aplicación escriba en el almacenamiento USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Admite que una aplicación escriba en la tarjeta SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modificar/eliminar los contenidos del almacenamientos de medios internos"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permite que una aplicación modifique los contenidos del almacenamiento interno de medios."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"Acceder al sistema de archivos caché"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permite que una aplicación lea y escriba el sistema de archivos caché."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"realizar o recibir llamadas por Internet"</string> @@ -488,8 +489,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Configuración del proxy global de dispositivo que se utilizará mientras se habilita la política. Sólo la primera administración de dispositivo configura el proxy global efectivo."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Establecer la caducidad de la contraseña"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Verifica cuánto tiempo antes debes cambiar la contraseña de la pantalla de bloqueo"</string> - <!-- outdated translation 488196329176602372 --> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Establecer la encriptación del almacenamiento"</string> - <!-- outdated translation 6111889605506443825 --> <string name="policydesc_encryptedStorage" msgid="2504984732631479399">"Requiere que los datos almacenados de la aplicación estén encriptados"</string> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Casa"</item> <item msgid="869923650527136615">"Celular"</item> @@ -604,8 +603,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Trabajo"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Otro"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Ingresar el código de PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Ingresar la contraseña para desbloquear"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Ingresa el PIN para desbloquear"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"¡Código de PIN incorrecto!"</string> @@ -649,8 +646,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Contraseña"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Inicia sesión"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nombre de usuario o contraseña incorrecta."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Comprobando..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sonido encendido"</string> @@ -672,9 +667,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Autocompl."</string> <string name="setup_autofill" msgid="8154593408885654044">"Conf func Autocompl"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"leer historial y marcadores del navegador"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite a la aplicación leer todas las URL que ha visitado el navegador y todos los marcadores del navegador."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"escribir historial y marcadores del navegador"</string> @@ -812,8 +809,8 @@ <string name="no" msgid="5141531044935541497">"Cancelar"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"Atención"</string> <string name="loading" msgid="1760724998928255250">"Cargando..."</string> - <string name="capital_on" msgid="1544682755514494298">"Sí"</string> - <string name="capital_off" msgid="6815870386972805832">"No"</string> + <string name="capital_on" msgid="1544682755514494298">"Encendido"</string> + <string name="capital_off" msgid="6815870386972805832">"APAGADO"</string> <string name="whichApplication" msgid="4533185947064773386">"Completar la acción mediante"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de manera predeterminada en esta acción."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Borrar la predeterminación en Configuración de la página principal > Aplicaciones > Administrar aplicaciones."</string> @@ -907,7 +904,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuración de USB conectada"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleccionar para desactivar la depuración de USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Seleccionar método de entrada"</string> - <!-- outdated translation 8093308517599282222 --> <string name="configure_input_methods" msgid="6324843080254191535">"Configurar métodos de entrada"</string> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -1008,27 +1004,22 @@ <string name="websearch" msgid="4337157977400211589">"Buscar en la Web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Solicitud de ubicación"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Sí"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Eliminar el límite excedido"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Eliminar artículos."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Deshacer eliminaciones."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"No hagas nada por el momento."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 16fbaa2f485b..4f02c4b35f01 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Apagando..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"La tableta se apagará."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"El teléfono se apagará."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"¿Deseas apagar el teléfono?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Reciente"</string> <string name="no_recent_tasks" msgid="279702952298056674">"No hay aplicaciones recientes"</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Opciones de tableta"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modo avión"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Modo avión activado. Desactivar."</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Modo avión desactivado. Activar."</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"+100"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Servicios por los que tienes que pagar"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permite enlazar con la interfaz de nivel superior de un método de introducción de texto. No debe ser necesario para las aplicaciones normales."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"enlazar con un fondo de pantalla"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite enlazar con la interfaz de nivel superior de un fondo de pantalla. No debe ser necesario para las aplicaciones normales."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar con el administrador de un dispositivo"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite enviar intentos a un administrador de dispositivos. Este permiso nunca debería ser necesario para las aplicaciones normales."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"cambiar orientación de la pantalla"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Permite que una aplicación lea y escriba en cualquier recurso propiedad del grupo de diagnóstico como, por ejemplo, archivos in/dev. Este permiso podría afectar a la seguridad y estabilidad del sistema. SÓLO se debe utilizar para diagnósticos específicos de hardware realizados por el fabricante o el operador."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"habilitar o inhabilitar componentes de la aplicación"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Permite que una aplicación cambie si un componente de otra aplicación está habilitado o inhabilitado. Las aplicaciones malintencionadas pueden utilizar este permiso para inhabilitar funciones importantes de la tableta. Este permiso se debe utilizar con precaución, ya que es posible que los componentes se vuelvan inservibles, inconsistentes o inestables."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que una aplicación cambie si un componente de otra aplicación está habilitado o inhabilitado. Las aplicaciones malintencionadas pueden utilizar este permiso para inhabilitar funciones importantes de la tableta. Este permiso se debe utilizar con precaución, ya que es posible que los componentes se vuelvan inservibles, inconsistentes o inestables."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que una aplicación cambie si un componente de otra aplicación está habilitado o inhabilitado. Las aplicaciones malintencionadas pueden utilizar este permiso para inhabilitar funciones importantes de la tableta. Este permiso se debe utilizar con precaución, ya que es posible que los componentes se vuelvan inservibles, inconsistentes o inestables."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"establecer aplicaciones preferidas"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Permite que una aplicación modifique las aplicaciones preferidas del usuario. De esta forma, las aplicaciones malintencionadas pueden cambiar de forma silenciosa las aplicaciones que se están ejecutando, falsificando las aplicaciones existentes para recopilar datos privados del usuario."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar la configuración global del sistema"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificar/eliminar contenido de la tarjeta SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Permite escribir en USB"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Permite que una aplicación escriba en la tarjeta SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"Cambiar/borrar almac interno"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permite que una aplicación modifique el contenido del almacenamiento interno de medios."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"acceder al sistema de archivos almacenado en caché"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permite que una aplicación lea y escriba el sistema de archivos almacenado en caché."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"realizar/recibir llamadas por Internet"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Define el servidor proxy global que se debe utilizar mientras la política esté habilitada. Solo el primer administrador de dispositivos define el servidor proxy global efectivo."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Definir caducidad contraseña"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Permite controlar cuándo se debe cambiar la contraseña de bloqueo de la pantalla."</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Casa"</item> <item msgid="869923650527136615">"Móvil"</item> @@ -505,7 +501,7 @@ <item msgid="9192514806975898961">"Personalizar"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"Casa"</item> + <item msgid="8073994352956129127">"Personal"</item> <item msgid="7084237356602625604">"Trabajo"</item> <item msgid="1112044410659011023">"Otra"</item> <item msgid="2374913952870110618">"Personalizar"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Trabajo"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Otro"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Introduce el código PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Introducir contraseña para desbloquear"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Introducir PIN para desbloquear"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"El código PIN es incorrecto."</string> @@ -632,7 +626,7 @@ <string name="lockscreen_missing_sim_message_short" msgid="7381499217732227295">"Falta la tarjeta SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No se ha insertado ninguna tarjeta SIM en la tableta."</string> <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"No se ha insertado ninguna tarjeta SIM en el teléfono."</string> - <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserta una tarjeta SIM"</string> + <string name="lockscreen_missing_sim_instructions" msgid="8874620818937719067">"Inserta una tarjeta SIM."</string> <string name="emergency_calls_only" msgid="6733978304386365407">"Solo llamadas de emergencia"</string> <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Bloqueada para la red"</string> <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"La tarjeta SIM está bloqueada con el código PUK."</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Contraseña"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Acceder"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nombre de usuario o contraseña no válido"</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Comprobando..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Activar sonido"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Autocompletar"</string> <string name="setup_autofill" msgid="8154593408885654044">"Config autocomp"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"leer información de marcadores y del historial del navegador"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite que la aplicación lea todas las URL que ha visitado el navegador y todos sus marcadores."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"escribir en marcadores y en el historial del navegador"</string> @@ -816,8 +810,8 @@ <string name="no" msgid="5141531044935541497">"Cancelar"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"Atención"</string> <string name="loading" msgid="1760724998928255250">"Cargando…"</string> - <string name="capital_on" msgid="1544682755514494298">"SÍ"</string> - <string name="capital_off" msgid="6815870386972805832">"NO"</string> + <string name="capital_on" msgid="1544682755514494298">"Activado"</string> + <string name="capital_off" msgid="6815870386972805832">"Desconectado"</string> <string name="whichApplication" msgid="4533185947064773386">"Completar acción utilizando"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de forma predeterminada para esta acción"</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Borrar valores predeterminados en la página de configuración de la pantalla de inicio del teléfono > Aplicaciones > Administrar aplicaciones\"."</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Dispositivo de depuración USB conectado"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleccionar para inhabilitar la depuración USB"</string> <string name="select_input_method" msgid="6865512749462072765">"Seleccionar método de introducción de texto"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"Una coincidencia"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> de <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Listo"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Desactivando almacenamiento USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Desactivando tarjeta SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Borrando almacenamiento USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Búsqueda web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Solicitud de ubicación"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Sí"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Límite de eliminaciones superado"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Eliminar los elementos"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Deshacer las eliminaciones"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"No hacer nada por ahora"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index c4347fbb7086..95871a4eef21 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"حالت هواپیما"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"حالت هواپیما روشن است"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"حالت هواپیما خاموش است"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"حالت ایمن"</string> <string name="android_system_label" msgid="6577375335728551336">"سیستم Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"سرویس های غیر رایگان"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"به نگهدارنده اجازه می دهد به رابط سطح بالای یک روش ورودی متصل شود. هرگز برای برنامه های معمولی مورد نیاز نیست."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"پیوند شده به تصویر زمینه"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"به نگهدارنده اجازه می دهد که به رابط سطح بالای تصویر زمینه متصل شود. هرگز برای برنامه های معمولی مورد نیاز نیست."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"تعامل با یک سرپرست دستگاه"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"به نگهدارنده اجازه می دهد مفاد را به یک سرپرست دستگاه ارسال کند. هرگز برای برنامه های معمولی مورد نیاز نیست."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"تغییر جهت صفحه"</string> @@ -468,8 +465,8 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"اصلاح کردن/حذف محتویات کارت SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"به یک برنامه کاربردی اجازه می دهد تا دستگاه USB را بنویسید."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"به یک برنامه کاربردی اجازه می دهد در کارت SD رایت کند."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"تغییر/حذف محتواهای حافظه رسانه داخلی"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"به یک برنامه کاربردی برای تغییر محتواهای حافظه رسانه داخلی اجازه می دهد."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"اصلاح/حذف محتواهای ذخیره سازی رسانه داخلی"</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"به یک برنامه کاربردی برای اصلاح محتواهای حافظه رسانه داخلی اجازه می دهد."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"دسترسی به سیستم فایل حافظه پنهان"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"به یک برنامه کاربردی امکان می دهد سیستم فایل حافظه پنهان را بخواند و بنویسد."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"علامتگذاری/دریافت تماس های اینترنتی"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"پروکسی جهانی دستگاه مورد نظر را جهت استفاده هنگام فعال بودن خط مشی تنظیم کنید. فقط اولین سرپرست دستگاه پروکسی جهانی مفید را تنظیم می کند."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"تنظیم زمان انقضای رمز ورود"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"کنترل مدت زمانی که رمز ورود صفحه قفل قبل از تغییر یافتن لازم دارد"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"خانه"</item> <item msgid="869923650527136615">"تلفن همراه"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"محل کار"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"سایر موارد"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"کد پین را وارد کنید"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"رمز ورود را برای بازگشایی قفل وارد کنید"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"کد پین را برای بازگشایی قفل وارد کنید"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"پین کد اشتباه است!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"رمز ورود"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ورود به سیستم"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"نام کاربر یا رمز ورود نامعتبر است."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"در حال بررسی..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"بازگشایی قفل"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"صدا روشن"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"رفع عیب USB متصل شد"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"انتخاب کنید تا رفع عیب USB غیرفعال شود."</string> <string name="select_input_method" msgid="6865512749462072765">"انتخاب روش ورودی"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"داوطلبین"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"جستجوی وب"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"درخواست مکان"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"بله"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"خیر"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"از محدودیت حذف فراتر رفت"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"موارد را حذف کنید."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"واگرد موارد حذف شده."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"اکنون هیچ کاری انجام نشود."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index c27984dd9ce5..1392ebbc9ee2 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Lentokonetila"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Lentokonetila on KÄYTÖSSÄ"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Lentokonetila on POIS KÄYTÖSTÄ"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Suojattu tila"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-järjestelmä"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Maksulliset palvelut"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Antaa sovelluksen sitoutua syöttötavan ylemmän tason käyttöliittymään. Ei tavallisten sovelluksien käyttöön."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"sido taustakuvaan"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Antaa sovelluksen sitoutua taustakuvan ylemmän tason käyttöliittymään. Ei tavallisten sovelluksien käyttöön."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"kommunikoi laitteen järjestelmänvalvojan kanssa"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Antaa sovelluksen lähettää kyselyitä laitteen järjestelmänvalvojalle. Ei tavallisten sovelluksien käyttöön."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"muuta näytön suuntaa"</string> @@ -468,7 +465,7 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"muokkaa/poista SD-kortin sisältöä"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Antaa sovelluksen kirjoittaa USB-tallennustilaan."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Antaa sovelluksen kirjoittaa SD-kortille."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"muokkaa/poista sisäisen säilytystilan sisältöä"</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"muokkaa/poista säilytystilan sisältöä"</string> <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Antaa sovelluksen muokata sisäisen tallennustilan sisältöä."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"käytä välimuistin tiedostojärjestelmää"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Antaa sovelluksen lukea välimuistin tiedostojärjestelmää ja kirjoittaa sinne."</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Aseta laitteen yleinen välityspalvelin käyttöön, kun käytäntö on käytössä. Vain ensimmäinen laitteen järjestelmänhallitsija voi asettaa käytettävän yleisen välityspalvelimen."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Aseta salasanan umpeutuminen"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Valitse, kuinka pian ruudunlukituksen poiston salasana tulee vaihtaa"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Puhelinnumero (koti)"</item> <item msgid="869923650527136615">"Mobiili"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Työ"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Muu"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Anna PIN-koodi"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Poista lukitus antamalla salasana"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Poista lukitus antamalla PIN-koodi"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Virheellinen PIN-koodi!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Salasana"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Kirjaudu sisään"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Virheellinen käyttäjänimi tai salasana."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Tarkistetaan..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Poista lukitus"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ääni käytössä"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-vianetsintä yhdistetty"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Poista USB-vianetsintä käytöstä valitsemalla tämä."</string> <string name="select_input_method" msgid="6865512749462072765">"Valitse syöttötapa"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZÅÄÖ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidaatit"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Verkkohaku"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Sijaintipyyntö"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Kyllä"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Ei"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Poistoraja ylittynyt"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Poista kohteet."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Kumoa poistot."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Älä tee mitään."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d7c4a13aedbb..361d19385c61 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Arrêt en cours..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Votre tablette va s\'éteindre."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Votre téléphone va s\'éteindre."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Souhaitez-vous éteindre votre téléphone ?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Récentes"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Aucune application récente"</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Options de la tablette"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Mode Avion"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Le mode Avion est activé."</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Le mode Avion est désactivé."</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode sécurisé"</string> <string name="android_system_label" msgid="6577375335728551336">"Système Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Services payants"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permet au support de se connecter à l\'interface de plus haut niveau d\'un mode de saisie. Les applications normales ne devraient jamais avoir recours à cette fonctionnalité."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"Se fixer sur un fond d\'écran"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permet au support de se fixer sur l\'interface de plus haut niveau d\'un fond d\'écran. Les applications normales ne devraient jamais avoir recours à cette fonctionnalité."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interagir avec l\'administrateur du périphérique"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permet à l\'application d\'envoyer des intentions à l\'administrateur du périphérique. Les applications standard ne devraient jamais avoir recours à cette fonctionnalité."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"Changement d\'orientation de l\'écran"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Permet à une application de lire et d\'éditer toute ressource appartenant au groupe de diagnostics (par exemple, les fichiers in/dev). Ceci peut affecter la stabilité et la sécurité du système. Cette fonctionnalité est UNIQUEMENT réservée aux diagnostics matériels effectués par le fabricant ou l\'opérateur."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"Activer ou désactiver des éléments de l\'application"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Permet à une application d\'activer ou de désactiver un composant dépendant d\'une autre application. Des applications malveillantes peuvent exploiter cette fonctionnalité pour désactiver des options importantes de votre tablette. Cette autorisation doit être utilisée avec prudence : elle est susceptible de rendre les composants d\'une application inutilisables, incohérents ou instables."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permet à une application d\'activer ou de désactiver un composant dépendant d\'une autre application. Des applications malveillantes peuvent exploiter cette fonctionnalité pour désactiver des options importantes de votre tablette. Cette autorisation doit être utilisée avec prudence : elle est susceptible de rendre les composants d\'une application inutilisables, incohérents ou instables."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permet à une application d\'activer ou de désactiver un composant dépendant d\'une autre application. Des applications malveillantes peuvent exploiter cette fonctionnalité pour désactiver des options importantes de votre tablette. Cette autorisation doit être utilisée avec prudence : elle est susceptible de rendre les composants d\'une application inutilisables, incohérents ou instables."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"Définition des applications préférées"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Permet à une application de modifier vos applications préférées. Des applications malveillantes peuvent utiliser cette fonctionnalité pour modifier discrètement les applications en cours d\'exécution, en imitant vos applications existantes afin de récupérer des données personnelles vous concernant."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"Modification des paramètres généraux du système"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"Modifier/supprimer le contenu de la carte SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Autorise une application à écrire sur la mémoire USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Autorise une application à écrire sur la carte SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modif./suppr. contenu mémoire interne support"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permet à une application de modifier le contenu de la mémoire de stockage interne du support."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"accéder au système de fichiers en cache"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permet à une application de lire et d\'écrire dans le système de fichiers en cache."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"effectuer/recevoir des appels Internet"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Indiquez le proxy global à utiliser pour ce mobile lorsque les règles sont activées. Seul l\'administrateur principal du mobile peut définir le proxy global utilisé."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Définir date exp. mot de passe"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Définir la fréquence de changement du mot de passe de verrouillage d\'écran"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Domicile"</item> <item msgid="869923650527136615">"Mobile"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Professionnelle"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Autre"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Saisissez le code PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Saisissez le mot de passe pour procéder au déverrouillage."</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Saisissez le code PIN pour procéder au déverrouillage."</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Le code PIN est incorrect !"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Mot de passe"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Se connecter"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nom d\'utilisateur ou mot de passe incorrect."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Vérification..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Débloquer"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Son activé"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Saisie auto"</string> <string name="setup_autofill" msgid="8154593408885654044">"Config. saisie auto"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lire l\'historique et les favoris du navigateur"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Autorise l\'application à lire toutes les URL auxquelles le navigateur a accédé et tous ses favoris."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"écrire dans l\'historique et les favoris du navigateur"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Débogage USB connecté"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Sélectionnez cette option pour désactiver le débogage USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Sélectionner un mode de saisie"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidats"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 correspondance"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> sur <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"OK"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Désinstallation de la mémoire de stockage USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Désinstallation de la carte SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Effacement de la mémoire de stockage USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Recherche Web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Demande de position"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Oui"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Non"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Le nombre maximal de suppressions a été atteint."</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Supprimer les éléments"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Annuler les suppressions"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Ne rien faire pour l\'instant"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index b8f1e75acc24..befb52658688 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Način rada u zrakoplovu"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Uključen je način rada u zrakoplovu"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Isključen je način rada u zrakoplovu"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Siguran način rada"</string> <string name="android_system_label" msgid="6577375335728551336">"Sustav Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Usluge koje se plaćaju"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Nositelju omogućuje da se veže uz sučelje najviše razine za metodu unosa. Nikad ne bi trebalo koristiti za uobičajene aplikacije."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"povezano s pozadinskom slikom"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Nositelju omogućuje da se veže uz sučelje najviše razine za pozadinsku sliku. Nikad ne bi trebalo koristiti za uobičajene aplikacije."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interakcija s administratorom uređaja"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Nositelju omogućuje slanje namjera administratoru uređaja. Nikad ne bi trebalo koristiti za uobičajene aplikacije."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"promjena orijentacije zaslona"</string> @@ -468,8 +465,8 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"izmjena/brisanje sadržaja SD kartice"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Omog. pisanje na USB memoriju."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Aplikaciji omogućuje pisanje na SD karticu."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"izmijeni/izbriši sadržaj pohranjen na internim medijima"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Aplikaciji omogućuje izmjenu sadržaja pohranjenog na internim medijima."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"izmijeni/briši sadržaje unutarnjih medija pohrane"</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Omogućuje aplikaciji izmjenu sadržaja pohrane unutarnjih medija."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"pristup sustavu datoteka predmemorije"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Aplikaciji omogućuje čitanje i pisanje u sustav datoteka predmemorije."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"zovi/primaj internetske pozive"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Postavi globalni proxy uređaja za upotrebu dok su pravila omogućena. Samo prvi administrator uređaja postavlja djelotvoran globalni proxy."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Postavi istek zaporke"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Nadzirite za koliko vremena zaporka za zaključani zaslon treba biti promijenjena"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Početna"</item> <item msgid="869923650527136615">"Mobilni"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Posao"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Drugo"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Unesite PIN kôd"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Unesite zaporku za otključavanje"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Unesite PIN za otključavanje"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Netočan PIN kôd!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Zaporka"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Prijava"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nevažeće korisničko ime ili zaporka."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Provjera..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Otključaj"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Zvuk je uključen"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Priključen je alat za uklanjanje programske pogreške USB-a"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Odaberite da biste onemogućili rješavanje programske pogreške na USB-u."</string> <string name="select_input_method" msgid="6865512749462072765">"Odaberite način unosa"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidati"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Pretraž. weba"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Zahtjev za lokaciju"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Da"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Ne"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Prekoračeno je ograničenje za brisanje"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Izbriši ove stavke"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Poništi brisanja."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Za sad nemoj ništa učiniti."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 541945b92493..0ee1bbc74079 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Repülőgép üzemmód"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Repülőgép üzemmód bekapcsolva"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Repülőgép üzemmód kikapcsolva"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Biztonsági üzemmód"</string> <string name="android_system_label" msgid="6577375335728551336">"Android rendszer"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Fizetős szolgáltatások"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Lehetővé teszi a használó számára a beviteli módszer legfelső szintű kezelőfelületéhez való csatlakozást. A normál alkalmazások soha nem használják ezt."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"összekapcsolás háttérképpel"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Lehetővé teszi a használó számára, hogy csatlakozzon egy háttérkép legfelső szintű kezelőfelületéhez. A normál alkalmazásoknak erre soha nincs szüksége."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"az eszközkezelő használata"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Lehetővé teszi a használó számára, hogy célokat küldjön egy eszközkezelőnek. A normál alkalmazásoknak erre soha nincs szüksége."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"képernyő irányának módosítása"</string> @@ -468,7 +465,7 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"az SD-kártya tartalmának módosítása és törlése"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Lehetővé teszi az alkalmazások számára, hogy írjanak az USB-tárra."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Lehetővé teszi egy alkalmazás számára, hogy írjon az SD-kártyára."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"belső tár tartalmának módosítása/törlése"</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"a belső médiatároló tartalmának módosítása és törlése"</string> <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Lehetővé teszi az alkalmazások számára, hogy módosítsák a belső tárhely tartalmát."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"hozzáférés a gyorsítótár fájlrendszeréhez"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Lehetővé teszi egy alkalmazás számára a gyorsítótár fájlrendszerének olvasását és írását."</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Az eszköz globális proxyja lesz használatban, amíg az irányelv engedélyezve van. Csak az eszköz első rendszergazdája állíthatja be a tényleges globális proxyt."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Jelszó lejáratának beállítása"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Azt vezérli, mennyi időnként kell módosítani a képernyőt zároló jelszót"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Otthoni"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Munkahely"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Egyéb"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Adja meg a PIN-kódot"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"A feloldáshoz írja be a jelszót"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Feloldáshoz írja be a PIN kódot"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Helytelen PIN-kód."</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Jelszó"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Bejelentkezés"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Érvénytelen felhasználónév vagy jelszó."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Ellenőrzés..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Feloldás"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Hang bekapcsolása"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB hibakereső csatlakoztatva"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Válassza ezt az USB hibakeresés kikapcsolásához."</string> <string name="select_input_method" msgid="6865512749462072765">"Válassza ki a beviteli módszert"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"jelöltek"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Webes keresés"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Hely lekérése"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Igen"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nem"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"A szinkronizálás elérte a törlésre vonatkozó korlátot"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Az elemek törlése."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Törlés visszavonása."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Most nem."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 97fa660dd95d..304ef90b5095 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Mode pesawat"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Mode pesawat HIDUP"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Mode pesawat MATI"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mode aman"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Layanan berbayar"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Mengizinkan pemegang mengikat antarmuka tingkat tinggi pada suatu metode masukan. Tidak diperlukan untuk aplikasi normal."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"mengikat ke wallpaper"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Mengizinkan pemegang mengikat antarmuka tingkat tinggi dari suatu wallpaper. Tidak diperlukan untuk aplikasi normal."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"berinteraksi dengan admin perangkat"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Mengizinkan pemegang mengirimkan tujuan kepada administrator perangkat. Tidak diperlukan untuk aplikasi normal."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"ubah orientasi layar"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Setel proxy global perangkat yang akandigunakan ketika kebijakan diaktifkan. Hanya admin perangkat pertama yang menyetel procy global yang berlaku."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Setel kedaluwarsa sandi"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Kontrol berapa lama sebelum sandi penguncian layar perlu diubah"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Rumah"</item> <item msgid="869923650527136615">"Seluler"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Kerjaan"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Lainnya"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Masukkan kode PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Masukkan sandi untuk membuka"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Masukkan PIN untuk membuka kunci"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Kode PIN salah!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Sandi"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Masuk"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nama pengguna atau sandi tidak valid."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Memeriksa..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Buka kunci"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Suara hidup"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Debugging USB terhubung"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Pilih untuk menonaktifkan debugging USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Pilih metode masukan"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"calon"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Penelusuran Web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Permintaan lokasi"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ya"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Tidak"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Penghapusan melebihi batas"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Hapus item tersebut."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Urung penghapusan."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Jangan lakukan apa pun untuk saat ini."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 12caad4276d1..282d3754413a 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Spegnimento..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Il tablet verrà spento."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Il telefono verrà spento."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Spegnere?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Recenti"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Nessuna applicazione recente."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Opzioni tablet"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modalità aereo"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Modalità aereo attiva"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Modalità aereo non attiva"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modalità provvisoria"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Servizi che prevedono un costo"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Consente l\'associazione all\'interfaccia principale di un metodo di inserimento. Non dovrebbe essere mai necessario per le normali applicazioni."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"associazione a sfondo"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Consente l\'associazione di uno sfondo all\'interfaccia principale. Non dovrebbe mai essere necessario per le normali applicazioni."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interazione con un amministratore dispositivo"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Consente l\'invio di intent a un amministratore del dispositivo. L\'autorizzazione non deve mai essere necessaria per le normali applicazioni."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"modifica orientamento dello schermo"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Consente a un\'applicazione di leggere le risorse del gruppo diag e scrivere a esse, per esempio i file in /dev. Questa capacità potrebbe influire sulla stabilità e sicurezza del sistema. Dovrebbe essere utilizzata SOLTANTO per diagnostiche specifiche dell\'hardware effettuate dal produttore o dall\'operatore."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"attivazione/disattivazione componenti applicazioni"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Consente a un\'applicazione di attivare o disattivare un componente di un\'altra applicazione. Le applicazioni dannose possono sfruttare questa possibilità per disattivare importanti funzionalità del tablet. Prestare attenzione con questa autorizzazione perché è possibile rendere inutilizzabili, incoerenti o instabili i componenti delle applicazioni."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Consente a un\'applicazione di attivare o disattivare un componente di un\'altra applicazione. Le applicazioni dannose possono sfruttare questa possibilità per disattivare importanti funzionalità del tablet. Prestare attenzione con questa autorizzazione perché è possibile rendere inutilizzabili, incoerenti o instabili i componenti delle applicazioni."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Consente a un\'applicazione di attivare o disattivare un componente di un\'altra applicazione. Le applicazioni dannose possono sfruttare questa possibilità per disattivare importanti funzionalità del tablet. Prestare attenzione con questa autorizzazione perché è possibile rendere inutilizzabili, incoerenti o instabili i componenti delle applicazioni."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"impostazione applicazioni preferite"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Consente la modifica da parte di un\'applicazione delle applicazioni preferite. Le applicazioni dannose potrebbero essere in grado di modificare automaticamente le applicazioni in esecuzione, effettuando lo spoofing delle applicazioni esistenti per raccogliere dati riservati."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modifica impostazioni di sistema globali"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificare/eliminare i contenuti della scheda SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Consente di scrivere nell\'archivio USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Consente a un\'applicazione di scrivere sulla scheda SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modifica/eliminaz. contenuti archivio media int."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Consente a un\'applicazione di modificare i contenuti dell\'archivio media interno."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"accesso al filesystem nella cache"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Consente a un\'applicazione di leggere e scrivere il filesystem nella cache."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"effettuazione/ricezione chiamate Internet"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Imposta il proxy globale del dispositivo in modo da utilizzarlo mentre la norma è attiva. Il proxy globale effettivo è impostabile solo dal primo amministratore del dispositivo."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Imposta scadenza password"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Stabilisci la scadenza della password di blocco dello schermo"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Casa"</item> <item msgid="869923650527136615">"Cellulare"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Lavoro"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Altro"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Inserisci il PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Inserisci password per sbloccare"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Inserisci PIN per sbloccare"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Codice PIN errato."</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Password"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Accedi"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Password o nome utente non valido."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Controllo in corso..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Sblocca"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Audio attivato"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Compl. auto"</string> <string name="setup_autofill" msgid="8154593408885654044">"Compil. automatica"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lettura cronologia e segnalibri del browser"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Consente all\'applicazione di leggere tutti gli URL visitati e tutti i segnalibri del browser."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"creazione cronologia e segnalibri del browser"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Debug USB collegato"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleziona per disattivare il debug USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Seleziona metodo di inserimento"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidati"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 corrispondenza"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> di <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Fine"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Smontaggio dell\'archivio USB in corso..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Smontaggio scheda SD in corso..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Cancellazione dell\'archivio USB in corso..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Ricerca Web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Richiesta di posizione"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Sì"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Limite di eliminazioni superato"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Elimina gli elementi."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Annulla le eliminazioni."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Non fare nulla per ora."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 14f8ba33a0db..ea480027c2fb 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"מצב טיסה"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"מצב טיסה מופעל"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"מצב טיסה כבוי"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"מצב בטוח"</string> <string name="android_system_label" msgid="6577375335728551336">"מערכת Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"שירותים שעולים לך כסף"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"מאפשר למחזיק להכפיף לממשק ברמה עליונה של שיטת קלט. לא אמור להידרש לעולם ביישומים רגילים."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"קשור לטפט"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"מאפשר למחזיק לקשור לממשק ברמה עליונה של טפט. לא אמור להידרש לעולם ביישומים רגילים."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"קיים אינטראקציה עם מנהל מכשיר"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"מאפשר למשתמש לשלוח כוונות למנהל התקן. לא אמור להידרש לעולם ביישומים רגילים."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"שנה את כיוון המסך"</string> @@ -468,8 +465,8 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"שנה/מחק את התוכן של כרטיס SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"מאפשר ליישום לכתוב לאמצעי אחסון מסוג USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"מאפשר ליישום לכתובת לכרטיס ה-SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"שנה/מחק תוכן של מדיית אחסון פנימית"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"מאפשר ליישום לשנות את התוכן של מדיית האחסון הפנימית."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"שנה/מחק תכנים של מדיית אחסון פנימית"</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"מאפשר ליישום לשנות את התכנים של אחסון המדיה הפנימי."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"גישה למערכת הקבצים של הקובץ השמור"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"מאפשר ליישום לקרוא ולכתוב במערכת הקבצים של הקובץ השמור."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"בצע/קבל שיחות אינטרנט"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"הגדר את שרת proxy הגלובלי של ההתקן לשימוש כאשר המדיניות מופעלת. רק מנהל ההתקן הראשון מגדיר את שרת ה-proxy הגלובלי הפעיל."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"הגדר תפוגת תוקף של סיסמה"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"שלוט בפרק הזמן הדרוש לשינוי הסיסמה של נעילת המסך"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"דף הבית"</item> <item msgid="869923650527136615">"נייד"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"עבודה"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"אחר"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"הזן קוד PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"הזן סיסמה לביטול הנעילה"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"הזן PIN לביטול נעילה"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"קוד PIN שגוי!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"סיסמה"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"כניסה"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"שם משתמש או סיסמה לא חוקיים."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"בודק..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"בטל נעילה"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"קול פועל"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"ניקוי באגים של USB מחובר"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"בחר כדי להשבית ניקוי באגים ב-USB."</string> <string name="select_input_method" msgid="6865512749462072765">"בחר שיטת קלט"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZאבגדהוזחטיכלמנסעפצקרשת"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789אבגדהוזחטיכלמנסעפצקרשת"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"מועמדים"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"חיפוש Google"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"בקשת מיקום"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"כן"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"לא"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"חרגת ממגבלת המחיקה"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"מחק את הפריטים."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"בטל את המחיקות."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"אל תעשה דבר בינתיים."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 8cf168d4a6f8..6df5f3d045f0 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"シャットダウン中..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"タブレットの電源をOFFにします。"</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"携帯電話の電源を切ります。"</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"シャットダウンしてもよろしいですか？"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"新着"</string> <string name="no_recent_tasks" msgid="279702952298056674">"最近使ったアプリケーションはありません。"</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"タブレットオプション"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"機内モード"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"機内モードON"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"機内モードOFF"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100超"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"セーフモード"</string> <string name="android_system_label" msgid="6577375335728551336">"Androidシステム"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"料金の発生するサービス"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"入力方法のトップレベルインターフェースに関連付けることを所有者に許可します。通常のアプリケーションにはまったく必要ありません。"</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"壁紙にバインド"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"壁紙のトップレベルインターフェースへのバインドを所有者に許可します。通常のアプリケーションでは不要です。"</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"デバイス管理者との通信"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"デバイス管理者へのintentの送信を所有者に許可します。通常のアプリケーションでは不要です。"</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"画面の向きの変更"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"diagグループが所有するリソース（例:/dev内のファイル）への読み書きをアプリケーションに許可します。システムの安定性とセキュリティに影響する恐れがあります。メーカー/オペレーターによるハードウェア固有の診断以外には使用しないでください。"</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"アプリケーションのコンポーネントを有効/無効にする"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"別アプリケーションのコンポーネントの有効/無効を変更することをアプリケーションに許可します。この許可を悪意のあるアプリケーションに利用されると、タブレットの重要な機能が無効にされる恐れがあります。アプリケーションコンポーネントが利用できなくなる、整合性が取れなくなる、または不安定な状態になる恐れがあるので許可には注意が必要です。"</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"別アプリケーションのコンポーネントの有効/無効を変更することをアプリケーションに許可します。悪意のあるアプリケーションがタブレットの重要な機能を無効にする恐れがあります。アプリケーションコンポーネントが利用できなくなる、整合性が取れなくなる、または不安定な状態になる恐れがあるので許可には注意が必要です。"</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"別アプリケーションのコンポーネントの有効/無効を変更することをアプリケーションに許可します。この許可を悪意のあるアプリケーションに利用されると、タブレットの重要な機能が無効にされる恐れがあります。アプリケーションコンポーネントが利用できなくなる、整合性が取れなくなる、または不安定な状態になる恐れがあるので許可には注意が必要です。"</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"優先アプリケーションの設定"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"優先アプリケーションを変更することをアプリケーションに許可します。悪意のあるアプリケーションが実行中のアプリケーションを密かに変更し、既存のアプリケーションになりすまして非公開データを収集する恐れがあります。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"システムの全般設定の変更"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"SDカードのコンテンツを修正/削除する"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"USBストレージへの書き込みをアプリケーションに許可します。"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"SDカードへの書き込みをアプリケーションに許可します。"</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"USBストレージの内容の変更/削除"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"内部メディアストレージの内容の変更をアプリケーションに許可します。"</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"キャッシュファイルシステムにアクセス"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"キャッシュファイルシステムへの読み書きをアプリケーションに許可します。"</string> <string name="permlab_use_sip" msgid="5986952362795870502">"インターネット通話の発着信"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"ポリシーが有効になっている場合は端末のグローバルプロキシが使用されるように設定します。有効なグローバルプロキシを設定できるのは最初のデバイス管理者だけです。"</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"パスワードの有効期限の設定"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"画面ロックパスワードの変更が必要になるまでの期間を指定します"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"自宅"</item> <item msgid="869923650527136615">"携帯"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"勤務先"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"その他"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PINコードを入力"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"ロックを解除するにはパスワードを入力"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"ロックを解除するにはPINを入力"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PINコードが正しくありません。"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"パスワード"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ログイン"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"ユーザー名またはパスワードが正しくありません。"</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"確認中..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"ロック解除"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"サウンドON"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"自動入力"</string> <string name="setup_autofill" msgid="8154593408885654044">"自動入力設定"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$3$2$1"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">"、 "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ブラウザの履歴とブックマークを読み取る"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"ブラウザでアクセスしたすべてのURLおよびブラウザのすべてのブックマークの読み取りをアプリケーションに許可します。"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"ブラウザの履歴とブックマークを書き込む"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USBデバッグが接続されました"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"USBデバッグを無効にする場合に選択します。"</string> <string name="select_input_method" msgid="6865512749462072765">"入力方法の選択"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"候補"</u></string> @@ -977,7 +969,7 @@ <string name="no_file_chosen" msgid="6363648562170759465">"ファイルが選択されていません"</string> <string name="reset" msgid="2448168080964209908">"リセット"</string> <string name="submit" msgid="1602335572089911941">"送信"</string> - <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"運転モードになっています"</string> + <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"運転モードを有効にする"</string> <string name="car_mode_disable_notification_message" msgid="668663626721675614">"運転モードを終了するには選択してください。"</string> <string name="tethered_notification_title" msgid="3146694234398202601">"テザリングまたはアクセスポイントが有効です"</string> <string name="tethered_notification_message" msgid="3067108323903048927">"タップして設定する"</string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1件一致"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g>/<xliff:g id="TOTAL">%d</xliff:g>件"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"完了"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"USBストレージのマウント解除中..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"SDカードのマウント解除中..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"USBストレージ内のデータを消去中..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"ウェブ検索"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"現在地情報へのアクセス許可"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"はい"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"いいえ"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"削除の制限を超えました"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"項目を削除します。"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"削除を元に戻します。"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"今は何もしません。"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 5926677ab1fe..10eba5937c17 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"종료 중..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"태블릿이 종료됩니다."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"휴대전화가 종료됩니다."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"종료하시겠습니까?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"최근 사용한 앱"</string> <string name="no_recent_tasks" msgid="279702952298056674">"최근에 사용한 앱이 없습니다."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"태블릿 옵션"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"비행기 모드"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"비행기 모드 사용"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"비행기 모드 사용 안함"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"안전 모드"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 시스템"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"요금이 부과되는 서비스"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"권한을 가진 프로그램이 입력 방법에 대한 최상위 인터페이스를 사용하도록 합니다. 일반 애플리케이션에는 절대로 필요하지 않습니다."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"배경화면 연결"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"권한을 가진 프로그램이 배경화면에 대한 최상위 인터페이스를 사용하도록 합니다. 일반 애플리케이션에는 절대로 필요하지 않습니다."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"기기 관리자와 상호 작용"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"보유자가 기기 관리자에게 인텐트를 보낼 수 있도록 합니다. 일반 애플리케이션에는 절대로 필요하지 않습니다."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"화면 방향 변경"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"애플리케이션이 진단 그룹 소유의 리소스(예: /dev에 있는 파일)를 읽고 쓸 수 있도록 합니다. 이 기능은 시스템 안정성 및 보안에 영향을 미칠 수 있으므로 제조업체 또는 사업자가 하드웨어 관련 진단을 수행하는 경우에만 사용해야 합니다."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"애플리케이션 구성 요소 사용 또는 사용 안함"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"애플리케이션이 다른 애플리케이션 구성 요소 사용 여부를 변경할 수 있도록 합니다. 악성 애플리케이션이 이를 악용하여 중요한 태블릿 기능을 중지시킬 수 있습니다. 이 권한을 허용할 경우 애플리케이션 구성 요소가 사용 불가능하게 되거나 일관성이 맞지 않거나 불안정해질 수 있으므로 주의해야 합니다."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"애플리케이션이 다른 애플리케이션 구성 요소 사용 여부를 변경할 수 있도록 합니다. 악성 애플리케이션이 이를 악용하여 중요한 태블릿 기능을 중지시킬 수 있습니다. 이 권한을 허용할 경우 애플리케이션 구성 요소가 사용 불가능하게 되거나 일관성이 맞지 않거나 불안정해질 수 있으므로 주의해야 합니다."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"애플리케이션이 다른 애플리케이션 구성 요소 사용 여부를 변경할 수 있도록 합니다. 악성 애플리케이션이 이를 악용하여 중요한 태블릿 기능을 중지시킬 수 있습니다. 이 권한을 허용할 경우 애플리케이션 구성 요소가 사용 불가능하게 되거나 일관성이 맞지 않거나 불안정해질 수 있으므로 주의해야 합니다."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"기본 애플리케이션 설정"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"애플리케이션이 기본 애플리케이션을 수정할 수 있도록 합니다. 이 경우 악성 애플리케이션이 사용자의 개인 정보를 수집하기 위해 기존 애플리케이션으로 위장하도록 실행되는 애플리케이션을 몰래 변경할 수 있습니다."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"전체 시스템 설정 수정"</string> @@ -403,7 +401,7 @@ <string name="permdesc_setWallpaper" msgid="6417041752170585837">"애플리케이션이 시스템 배경화면을 설정할 수 있도록 합니다."</string> <string name="permlab_setWallpaperHints" msgid="3600721069353106851">"배경화면 크기 힌트 설정"</string> <string name="permdesc_setWallpaperHints" msgid="6019479164008079626">"애플리케이션이 시스템 배경화면 크기 힌트를 설정할 수 있도록 합니다."</string> - <string name="permlab_masterClear" msgid="2315750423139697397">"시스템 초기화"</string> + <string name="permlab_masterClear" msgid="2315750423139697397">"시스템을 기본값으로 재설정"</string> <string name="permdesc_masterClear" msgid="5033465107545174514">"애플리케이션이 모든 데이터, 구성 및 설치된 애플리케이션을 지워서 시스템을 완전히 초기화할 수 있도록 합니다."</string> <string name="permlab_setTime" msgid="2021614829591775646">"시간 설정"</string> <string name="permdesc_setTime" product="tablet" msgid="209693136361006073">"애플리케이션이 태블릿 시계의 시간을 변경할 수 있도록 합니다."</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"SD 카드 콘텐츠 수정/삭제"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"애플리케이션에서 USB 저장소의 정보를 변경할 수 있습니다."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"애플리케이션이 SD 카드에 쓸 수 있도록 합니다."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"내부 미디어 저장소 콘텐츠 수정/삭제"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"애플리케이션이 내부 미디어 저장소의 콘텐츠를 수정할 수 있도록 합니다."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"캐시 파일시스템 액세스"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"애플리케이션이 캐시 파일시스템을 읽고 쓸 수 있도록 합니다."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"인터넷 전화 걸기/받기"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"정책이 사용 설정되어 있는 동안 사용될 기기 전체 프록시를 설정합니다. 첫 번째 기기 관리자가 설정한 전체 프록시만 유효합니다."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"비밀번호 만료 설정"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"화면 잠금 비밀번호를 변경해야 하는 기간 변경"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"집"</item> <item msgid="869923650527136615">"모바일"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"직장"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"기타"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN 코드 입력"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"잠금을 해제하려면 비밀번호 입력"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"잠금을 해제하려면 PIN 입력"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN 코드가 잘못되었습니다."</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"비밀번호"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"로그인"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"확인 중..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"잠금해제"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"사운드 켜기"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"자동완성"</string> <string name="setup_autofill" msgid="8154593408885654044">"자동완성 설정"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"브라우저의 기록 및 북마크 읽기"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"애플리케이션이 브라우저로 방문한 모든 URL과 브라우저의 모든 북마크를 읽도록 허용합니다."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"브라우저의 기록 및 북마크 쓰기"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB 디버깅 연결됨"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"USB 디버깅을 사용하지 않으려면 선택합니다."</string> <string name="select_input_method" msgid="6865512749462072765">"입력 방법 선택"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"가능한 원인"</u></string> @@ -975,7 +967,7 @@ <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"인증서 기반 L2TP/IPSec VPN"</string> <string name="upload_file" msgid="2897957172366730416">"파일 선택"</string> <string name="no_file_chosen" msgid="6363648562170759465">"파일을 선택하지 않았습니다."</string> - <string name="reset" msgid="2448168080964209908">"초기화"</string> + <string name="reset" msgid="2448168080964209908">"재설정"</string> <string name="submit" msgid="1602335572089911941">"제출"</string> <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"운전모드 사용"</string> <string name="car_mode_disable_notification_message" msgid="668663626721675614">"운전모드를 종료하려면 선택하세요."</string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"검색결과 1개"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g>/<xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"완료"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"USB 저장소 마운트 해제 중..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"SD 카드 마운트 해제 중..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"USB 저장소 지우는 중..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"웹 검색"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"위치 요청"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"예"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"아니요"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"삭제 한도를 초과했습니다."</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"항목 삭제"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"삭제 실행취소"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"지금은 아무 작업도 안함"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 20593009305f..bbb629ddbb8b 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Lėktuvo režimas"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"ĮJUNGTAS lėktuvo režimas"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"lėktuvo režimas IŠJUNGTAS"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Saugos režimas"</string> <string name="android_system_label" msgid="6577375335728551336">"„Android“ sistema"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Paslaugos, už kurias mokėjote"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Leidžia savininkui susisaistyti su įvesties būdo aukščiausio lygio sąsaja. Neturėtų reikėti įprastoms programoms."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"susaistyti su darbalaukio fonu"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Leidžia savininkui susisaistyti su aukščiausio lygio darbalaukio fono sąsaja. Neturėtų reikėti įprastose programose."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"sąveikauti su įrenginio administratoriumi"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Leidžia savininkui siųsti tikslus įrenginio administratoriui. Neturėtų reikėti įprastose programose."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"keisti ekrano padėtį"</string> @@ -468,7 +465,7 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"keisti / ištrinti SD kortelės turinį"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Leidžiama programai įrašyti į USB atmintinę."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Leidžia programai rašyti į SD kortelę."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"keisti / ištr. vid. med. atm. tur."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"keisti / ištrinti vidinės medijos atmintinės turinį"</string> <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Leidžiama programai keisti vidinės medijos atmintinės turinį."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"pasiekti talpyklos failų sistemą"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Leidžia programai skaityti ir rašyti į talpyklos failų sistemą."</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Nustatyti įrenginio bendrąjį tarpinį serverį, kad būtų naudojamas, kol įgalinta politika. Tik pirmasis įrenginio administratorius nustato efektyvų bendrąjį tarpinį serverį."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Nust. slaptaž. galiojimo pab."</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Valdyti, per kiek laiko iki ekrano užrakinimo turi būti pakeistas slaptažodis"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Pagrindinis"</item> <item msgid="869923650527136615">"Mobilusis"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Darbas"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Kita"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Įveskite PIN kodą"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Įveskite slaptažodį, kad atrakintumėte"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Jei norite atrakinti, įveskite PIN kodą"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Neteisingas PIN kodas!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Slaptažodis"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Prisijungti"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Neteisingas naudotojo vardas ar slaptažodis."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Tikrinama..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Atblokuoti"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Garsas įjungtas"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB derinimas prijungtas"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Pasirinkite, kas išjungtumėte USB derinimą."</string> <string name="select_input_method" msgid="6865512749462072765">"Pasirinkti įvesties būdą"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĄBCČDEĘĖFGHIĮYJKLMNOPRSŠTUŲŪVZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789AĄBCČDEĘĖFGHIĮYJKLMNOPRSŠTUŲŪVZŽ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidatai"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Žiniat. paieška"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Vietovės užklausa"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Taip"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Ne"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Viršyta ištrynimo riba"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Ištrinti elementus."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Anuliuoti ištrynimus."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Kol kas nieko nedaryti."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 4f5af054ee3d..7ef1e0a2202d 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Lidojuma režīms"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Lidojuma režīms ir IESLĒGTS."</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Lidojuma režīms ir IZSLĒGTS."</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Drošais režīms"</string> <string name="android_system_label" msgid="6577375335728551336">"Android sistēma"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Maksas pakalpojumi"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Ļauj īpašniekam saistīt ar ievades metodes augšējā līmeņa saskarni. Parastajām lietojumprogrammām nekad nav nepieciešama."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"saistīt ar tapeti"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Ļauj īpašniekam saistīties ar tapetes augšējā līmeņa saskarni. Parastajās lietojumprogrammās nekad nav nepieciešama."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"mijiedarboties ar ierīces administratoru"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Ļauj īpašniekam sūtīt nolūkus ierīces administratoram. Nekad nav nepieciešams parastajām lietojumprogrammām."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"mainīt ekrāna orientāciju"</string> @@ -468,8 +465,8 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"pārveidot/dzēst SD kartes saturu"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Ļauj lietoj. rakstīt USB kr."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Ļauj lietojumprogrammai rakstīt SD kartē."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"pārv./dz.datu n.iekš.atm.sat."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Ļauj lietojumprogrammai pārveidot datu nesēja iekšējas atmiņas saturu."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"pārveidot/dzēst datu nesēja iekšējās krātuves saturu"</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Ļauj lietojumprogrammai pārveidot iekšējas datu nesēja krātuves saturu."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"piekļūt kešatmiņas failu sistēmai"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Ļauj lietojumprogrammai lasīt kešatmiņas failu sistēmu un rakstīt tajā."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"veikt/saņemt interneta zvanus"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Iestatiet izmantojamo ierīces globālo starpniekserveri, kad ir iespējota politika. Spēkā esošo globālo starpniekserveri iestata tikai pirmās ierīces administrators."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Paroles termiņa izb. iest."</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Kontrolē ekrāna bloķēšanas paroles maiņas intervālu"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Mājas"</item> <item msgid="869923650527136615">"Mobilais"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Darbs"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Cits"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Ievadiet PIN kodu"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Lai atbloķētu, ievadiet paroli."</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Lai atbloķētu, ievadiet PIN"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN kods nav pareizs."</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Parole"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Pierakstīties"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Lietotājvārds vai parole nav derīga."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Notiek pārbaude..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Atbloķēt"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Skaņa ir ieslēgta"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB atkļūdošana ir pievienota."</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Atlasiet, lai atspējotu USB atkļūdošanu."</string> <string name="select_input_method" msgid="6865512749462072765">"Atlasiet ievades metodi"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĀBCČDEĒFGĢHIĪJKĶLĻMNŅOPRSŠTUŪVZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789AĀBCČDEĒFGĢHIĪJKĶLĻMNŅOPRSŠTUŪVZŽ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidāti"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Meklēt tīmeklī"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Atrašanās vietas pieprasījums"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Jā"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nē"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Pārsniegts dzēšanas ierobežojums"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Dzēsiet šos vienumus."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Atsauciet dzēšanu."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Pagaidām neveiciet nekādas darbības."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index b68014abeaa9..83fd2d3c2ab9 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Avslutter…"</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Nettbrettet slås av."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Telefonen vil bli slått av."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Vil du slå av?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Nylig"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Ingen nylig brukte applikasjoner."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Innstillinger for nettbrett"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Flymodus"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flymodus er på"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flymodus er av"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"Over 100"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Sikkermodus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Betaltjenester"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Lar applikasjonen binde til toppnivågrensesnittet for en inndatametode. Vanlige applikasjoner bør aldri trenge dette."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"bind til bakgrunnsbilde"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Lar innehaveren binde det øverste nivået av grensesnittet til en bakgrunnsbilder. Skal ikke være nødvendig for vanlige programmer."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"kommuniser med enhetsadministrator"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Tillater innehaveren å sende hensikter til enhetsadministrator. Bør aldri være nødvendig for normale programmer."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"snu skjermen"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Lar applikasjonen lese og skrive enhver ressurs eid av gruppen diag; for eksempel, filer i /dev. Dette kan potensielt påvirke systemets sikkerhet og stabilitet. Dette bør KUN brukes for maskinvarespesifikke diagnoseverktøy laget av operatøren eller produsenten."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"aktivere eller deaktigere applikasjonskomponenter"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Lar programmet endre på hvorvidt en komponent i et annet program er aktivert eller ikke. Skadelige programmer kan bruke dette til å deaktivere viktige nettbrettfunksjoner. Denne rettigheten må brukes med forsiktighet, ettersom det er mulig å få programkomponenter inn i en ubrukelig, inkonsistent eller ustabil tilstand."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Lar programmet endre på hvorvidt en komponent i et annet program er aktivert eller ikke. Skadelige programmer kan bruke dette til å deaktivere viktige nettbrettfunksjoner. Denne rettigheten må brukes med forsiktighet, ettersom det er mulig å få programkomponenter inn i en ubrukelig, inkonsistent eller ustabil tilstand."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Lar programmet endre på hvorvidt en komponent i et annet program er aktivert eller ikke. Skadelige programmer kan bruke dette til å deaktivere viktige nettbrettfunksjoner. Denne rettigheten må brukes med forsiktighet, ettersom det er mulig å få programkomponenter inn i en ubrukelig, inkonsistent eller ustabil tilstand."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"velge foretrukne applikasjoner"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Lar applikasjonen endre valgene for foretrukne applikasjoner. Dette kan gi ondsinnede applikasjoner tilgang til i det stille å endre hvilke applikasjoner som kjøres, og slik gi seg ut til å være en eksisterende applikasjon og samle private data."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"endre globale systeminnstillinger"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"redigere/slette innhold på minnekort"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Prog. skriver til USB-lagr."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Lar applikasjonen skrive til minnekortet."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"endre eller slette innhold på interne medier"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Tillater et program til å endre innholdet i interne medier."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"tilgang til bufrede filer"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Tillater et program å lese og skrive til bufrede filer."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"foreta/motta Internett-anrop"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Angir den globale mellomtjeneren på enheten som skal brukes når regelen er aktivert. Kun den opprinnelige administratoren av enheten kan angi den globale mellomtjeneren."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Angi utløpsdato for passordet"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Velg hvor lenge det skal gå før passordet til låseskjermen må byttes"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Hjemmenummer"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Arbeid"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Annen"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Skriv inn PIN-kode:"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Skriv inn passord for å låse opp"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Skriv inn personlig kode for å låse opp"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Gal PIN-kode!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Passord"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Logg på"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ugyldig brukernavn eller passord."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrollerer ..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Lås opp"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Lyd på"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Autofyll"</string> <string name="setup_autofill" msgid="8154593408885654044">"Konfig. autofyll"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"lese nettleserens logg og bokmerker"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Lar applikasjonen lese alle adresser nettleseren har besøkt, og alle nettleserens bokmerker."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"skrive til nettleserens logg og bokmerker"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-debugging tilkoblet"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Velg for å deaktivere USB-debugging."</string> <string name="select_input_method" msgid="6865512749462072765">"Velg inndatametode"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ"</string> <string name="candidates_style" msgid="4333913089637062257">"TAG_FONT"<u>"kandidater"</u>"CLOSE_FONT"</string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 treff"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> av <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Ferdig"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Kobler fra USB-lagring ..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Kobler fra SD-kort ..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Sletter USB-lagring ..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Nettsøk"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Posisjonsforespørsel"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ja"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nei"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Grense for sletting overskredet"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Slett elementene."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Angre slettinger."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Ikke gjør noe akkurat nå."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 4bf059ca5ef2..3c03980aa544 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Uitschakelen..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Uw tablet wordt uitgeschakeld."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Uw telefoon wordt uitgeschakeld."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Wilt u afsluiten?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Geen recente toepassingen."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Tabletopties"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Vliegmodus"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Vliegmodus is AAN"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Vliegmodus is UIT"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Veilige modus"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-systeem"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Services waarvoor u moet betalen"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Hiermee staat u de houder toe zich te verbinden met de hoofdinterface van een invoermethode. Nooit vereist voor normale toepassingen."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"verbinden met een achtergrond"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Hiermee staat u de houder toe zich te verbinden met de hoofdinterface van een achtergrond. Nooit vereist voor normale toepassingen."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactie met apparaatbeheer"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Staat de houder toe intenties te verzenden naar een apparaatbeheerder. Nooit vereist voor normale toepassingen."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"schermstand wijzigen"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Hiermee kan een toepassing lezen en schrijven naar elke bron die hoort bij de diagnostische groep, zoals bestanden in /dev. Hierdoor kan de systeemstabiliteit en -veiligheid worden beïnvloed. Dit mag ALLEEN worden gebruikt voor hardwarespecifieke diagnostiek door de fabrikant of operator."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"toepassingscomponenten in- of uitschakelen"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Hiermee kan een toepassing bepalen of een component van een andere toepassing is ingeschakeld. Schadelijke toepassingen kunnen hiervan gebruik maken om belangrijke tabletfuncties uit te schakelen. Een machtiging moet zorgvuldig worden overwogen, aangezien toepassingscomponenten onbruikbaar, inconsistent of instabiel kunnen worden."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Hiermee kan een toepassing bepalen of een component van een andere toepassing is ingeschakeld. Schadelijke toepassingen kunnen dit gebruiken om belangrijke tabletfuncties uit te schakelen. Een machtiging moet zorgvuldig worden overwogen, aangezien toepassingscomponenten onbruikbaar, inconsistent of instabiel kunnen worden."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Hiermee kan een toepassing bepalen of een component van een andere toepassing is ingeschakeld. Schadelijke toepassingen kunnen hiervan gebruik maken om belangrijke tabletfuncties uit te schakelen. Een machtiging moet zorgvuldig worden overwogen, aangezien toepassingscomponenten onbruikbaar, inconsistent of instabiel kunnen worden."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"voorkeurstoepassingen instellen"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Hiermee kan een toepassing uw voorkeurstoepassingen wijzigen. Schadelijke toepassingen kunnen op deze manier de actieve toepassingen zonder uw medeweten wijzigen en uw bestaande toepassingen doorzoeken om privégegevens van u te verzamelen."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"algemene systeeminstellingen wijzigen"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"inhoud op de SD-kaart aanpassen/verwijderen"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Hiermee kan een toepassing schrijven naar de USB-opslag."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Hiermee kan een toepassing schrijven naar de SD-kaart."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"inh. mediaopsl. wijz./verw."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Hiermee kan een toepassing de inhoud van interne mediaopslag aanpassen."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"het cachebestandssysteem openen"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Staat een toepassing toe het cachebestandssysteem te lezen en te schrijven."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"internetoproepen starten/ontvangen"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Stel de algemene proxy voor het apparaat in die moet worden gebruikt terwijl het beleid is geactiveerd. Alleen de eerste apparaatbeheerder stelt de algemene proxy in."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Verval wachtwoord instellen"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Beheren hoe lang het duurt voordat het wachtwoord voor schermvergrendeling moet worden gewijzigd"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Thuis"</item> <item msgid="869923650527136615">"Mobiel"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Werk"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Overig"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN-code invoeren"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Voer het wachtwoord in om te ontgrendelen"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Voer de PIN-code in om te ontgrendelen"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Onjuiste PIN-code!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Wachtwoord"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Aanmelden"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Gebruikersnaam of wachtwoord ongeldig."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Controleren..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Ontgrendelen"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Geluid aan"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"AutoFill"</string> <string name="setup_autofill" msgid="8154593408885654044">"Aut. aanv. inst."</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"browsergeschiedenis en bladwijzers lezen"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Hiermee kan een toepassing de URL\'s lezen die u via de browser heeft bezocht, evenals alle bladwijzers van de browser."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"browsergeschiedenis en bladwijzers schrijven"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-foutopsporing verbonden"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Selecteer deze optie om USB-foutopsporing uit te schakelen."</string> <string name="select_input_method" msgid="6865512749462072765">"Invoermethode selecteren"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidaten"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 overeenkomst"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> van <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Gereed"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"USB-opslag ontkoppelen..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"SD-kaart ontkoppelen..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"USB-opslag wissen..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Online zoeken"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Locatieverzoek"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ja"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nee"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Verwijderingslimiet overschreden"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"De items verwijderen."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Verwijderingen ongedaan maken."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Nu niets doen."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 8a1541de0db0..e82dbca06f37 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Wyłączanie..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Tablet zostanie wyłączony."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Telefon zostanie wyłączony"</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Czy chcesz wyłączyć?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Najnowsze"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Brak ostatnio używanych aplikacji."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Opcje tabletu"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Tryb samolotowy"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Tryb samolotowy jest włączony"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Tryb samolotowy jest wyłączony"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Tryb awaryjny"</string> <string name="android_system_label" msgid="6577375335728551336">"System Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Usługi płatne"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Pozwala na tworzenie powiązania z interfejsem najwyższego poziomu metody wejściowej. To uprawnienie nie powinno być nigdy wymagane przez zwykłe aplikacje."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"powiązanie z tapetą"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Umożliwia posiadaczowi powiązać interfejs najwyższego poziomu dla tapety. Nie powinno być nigdy potrzebne w przypadku zwykłych aplikacji."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interakcja z administratorem urządzenia"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Zezwala posiadaczowi na wysyłanie informacji o zamiarach do administratora urządzenia. Opcja nie powinna być nigdy potrzebna w przypadku zwykłych aplikacji."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"zmienianie orientacji ekranu"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Pozwala aplikacji na czytanie i zapisywanie we wszystkich zasobach posiadanych przez diagnozowaną grupę, jak na przykład pliki w katalogu /dev. Może to potencjalnie wpłynąć na stabilność i bezpieczeństwo systemu. Powinno być wykorzystywane TYLKO w celach diagnozowania sprzętu przez producenta lub operatora."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"włączanie lub wyłączanie składników aplikacji"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Zezwala aplikacji na zmianę ustawienia określającego, czy składnik innej aplikacji ma być włączony. Złośliwe aplikacje mogą wykorzystać tę możliwość w celu wyłączenia ważnych funkcji tabletu. W przypadku tego uprawnienia należy zachować ostrożność, ponieważ składniki aplikacji mogą znaleźć się w stanie, w którym będą one bezużyteczne, niezgodne lub niestabilne."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Zezwala aplikacji na zmianę ustawienia określającego, czy składnik innej aplikacji ma być włączony. Złośliwe aplikacje mogą wykorzystać tę możliwość w celu wyłączenia ważnych funkcji tabletu. W przypadku tego uprawnienia należy zachować ostrożność, ponieważ składniki aplikacji mogą znaleźć się w stanie, w którym będą one bezużyteczne, niezgodne lub niestabilne."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Zezwala aplikacji na zmianę ustawienia określającego, czy składnik innej aplikacji ma być włączony. Złośliwe aplikacje mogą wykorzystać tę możliwość w celu wyłączenia ważnych funkcji tabletu. W przypadku tego uprawnienia należy zachować ostrożność, ponieważ składniki aplikacji mogą znaleźć się w stanie, w którym będą one bezużyteczne, niezgodne lub niestabilne."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"ustawianie preferowanych aplikacji"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Umożliwia aplikacji zmianę preferowanych programów użytkownika. Może to pozwolić szkodliwym aplikacjom na niezauważalną podmianę uruchamianych programów, aby zbierać prywatne dane użytkownika."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modyfikowanie ogólnych ustawień systemu"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modyfikowanie/usuwanie zawartości karty SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Umożliwia zapis na nośnik USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Umożliwia aplikacji zapis na karcie SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modyf./usuw. zawartości pam. wewn."</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Zezwala aplikacji na modyfikowanie zawartości pamięci wewnętrznej."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"dostęp do systemu plików pamięci podręcznej"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Zezwala aplikacji na odczyt i zapis w systemie plików pamięci podręcznej."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"nawiązywanie/odbieranie połączeń przez internet"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Ustaw globalny serwer proxy urządzenia do wykorzystywania przy włączonych zasadach. Tylko pierwszy administrator urządzenia ustawia obowiązujący globalny serwer proxy."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Ustaw wygasanie hasła"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Kontrola czasu, po którym należy zmienić hasło blokowania ekranu"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Dom"</item> <item msgid="869923650527136615">"Komórka"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Służbowy"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Inny"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Wprowadź kod PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Wprowadź hasło, aby odblokować"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Wprowadź kod PIN, aby odblokować"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Błędny kod PIN!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Hasło"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Zaloguj się"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Błędna nazwa użytkownika lub hasło."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Trwa sprawdzanie..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Odblokuj"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Włącz dźwięk"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Autouzupełnianie"</string> <string name="setup_autofill" msgid="8154593408885654044">"Konfiguruj autouzupełnianie"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"odczyt historii i zakładek przeglądarki"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Umożliwia aplikacji odczyt wszystkich adresów URL odwiedzonych przez przeglądarkę, a także wszystkich zakładek przeglądarki."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"zapis historii i zakładek przeglądarki"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Podłączono moduł debugowania USB"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Wybierz, aby wyłączyć debugowanie USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Wybierz metodę wprowadzania"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AĄBCĆDEĘFGHIJKLŁMNŃOÓPQRSŚTUVWXYZŹŻ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandydaci"</u></string> @@ -979,7 +971,7 @@ <string name="submit" msgid="1602335572089911941">"Prześlij"</string> <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"Tryb samochodowy włączony"</string> <string name="car_mode_disable_notification_message" msgid="668663626721675614">"Wybierz, aby zakończyć tryb samochodowy."</string> - <string name="tethered_notification_title" msgid="3146694234398202601">"Aktywny tethering lub punkt dostępu"</string> + <string name="tethered_notification_title" msgid="3146694234398202601">"Jest aktywne powiązanie lub punkt dostępu"</string> <string name="tethered_notification_message" msgid="3067108323903048927">"Dotknij, aby skonfigurować"</string> <string name="back_button_label" msgid="2300470004503343439">"Wróć"</string> <string name="next_button_label" msgid="1080555104677992408">"Dalej"</string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 wynik"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> z <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Gotowe"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Odłączanie nośnika USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Odłączanie karty SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Czyszczenie nośnika USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Wyszukiwarka"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Prośba o lokalizację"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Tak"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nie"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Przekroczono limit usuwania"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Usuń elementy."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Cofnij usunięcie."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Nie wykonuj teraz żadnych czynności."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 509c8b1b8488..41634f8a0893 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"A encerrar..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"O seu tablet irá encerrar."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"O seu telefone irá encerrar."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Pretende encerrar?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Nenhuma aplicação recente."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Opções do tablet"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modo de avião"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"O modo de voo está activado"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"O modo de voo está desactivado"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo seguro"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Serviços que implicam pagamento"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permite ao titular vincular a interface de nível superior a um método de entrada de som. Nunca deve ser necessário para aplicações normais."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"vincular a uma imagem de fundo"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite ao titular vincular a interface de nível superior de uma imagem de fundo. Nunca deverá ser necessário para aplicações normais."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interagir com um administrador do dispositivo"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite ao titular enviar intenções para um administrador do dispositivo. Nunca deverá ser necessário para aplicações normais."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"mudar orientação do ecrã"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Permite a uma aplicação ler e escrever em qualquer recurso que seja propriedade do grupo diag. Por exemplo, ficheiros em /dev. Isto pode afectar potencialmente a estabilidade e a segurança do sistema e deve ser utilizado APENAS para diagnósticos específicos do hardware pelo fabricante ou pelo operador."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"activar ou desactivar componentes da aplicação"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Permite a uma aplicação mudar a opção de activar ou não um componente de outra aplicação. Algumas aplicações maliciosas podem utilizar este item para desactivar funcionalidades importantes do tablet. É necessário ter cuidado com a autorização, uma vez que é possível tornar alguns componentes de aplicações num estado inutilizável, inconsistente ou instável."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que uma aplicação mude opção de activar ou não um componente de outra aplicação. As aplicações maliciosas podem utilizar este item para desactivar funcionalidades importantes do tablet. É necessário ter cuidado com a autorização, uma vez que é possível tornar alguns componentes de aplicações num estado inutilizável, inconsistente ou instável."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite a uma aplicação mudar a opção de activar ou não um componente de outra aplicação. Algumas aplicações maliciosas podem utilizar este item para desactivar funcionalidades importantes do tablet. É necessário ter cuidado com a autorização, uma vez que é possível tornar alguns componentes de aplicações num estado inutilizável, inconsistente ou instável."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"definir aplicações preferidas"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Permite a uma aplicação modificar as suas aplicações preferidas. Isto pode permitir que algumas aplicações maliciosas mudem, de forma silenciosa, as aplicações executadas, falsificando as aplicações existentes para recolher os seus dados privados."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar definições globais do sistema"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificar/eliminar conteúdo do cartão SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Permite que uma aplicação escreva no armaz. USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Permite que uma aplicação escreva no cartão SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modificar/eliminar conteúdo de suportes de armazenamento interno"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permite à aplicação modificar o conteúdo dos suportes de armazenamento interno."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"aceder ao sistema de ficheiros da cache"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permite a uma aplicação ler e escrever no sistema de ficheiros da cache."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"fazer/receber chamadas pela internet"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Definir o proxy global do aparelho a ser utilizado quando a política estiver activada. Só o primeiro administrador do aparelho define o proxy global efectivo."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Def. valid. da palavra-passe"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Controle com que antecedência é necessário alterar a palavra-passe de bloqueio do ecrã"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Residência"</item> <item msgid="869923650527136615">"Móvel"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Emprego"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Outro"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Introduzir código PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Introduza a palavra-passe para desbloquear"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Introduza o PIN para desbloquear"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Código PIN incorrecto!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Palavra-passe"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Iniciar sessão"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nome de utilizador ou palavra-passe inválidos."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"A verificar..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Som activado"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Pr. aut."</string> <string name="setup_autofill" msgid="8154593408885654044">"Conf preench aut"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ler histórico e marcadores do browser"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite que a aplicação leia todos os URLs visitados pelo browser e todos os marcadores do browser."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"gravar histórico e marcadores do browser"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB ligada"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Seleccione para desactivar depuração USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Seleccionar método de entrada"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 correspondência"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> de <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Concluído"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"A desmontar armazenamento USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"A desmontar cartão SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"A apagar armazenamento USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Pesquisar na Web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Pedido de localização"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Sim"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Não"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Limite de eliminações excedido"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Eliminar os itens."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Anular as eliminações."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Não fazer nada por agora."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 0a2581ead4b3..572cbcea29d0 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Encerrando…"</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Seu tablet será desligado."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"O seu telefone será desligado."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"O que você deseja encerrar?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Nenhum aplicativo recente."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Opções do tablet"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Modo de avião"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Modo de avião ATIVADO"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Modo de avião DESATIVADO"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Modo de segurança"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistema Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Serviços que geram gastos"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permite que o detentor se sujeite à interface de nível superior de um método de entrada. Aplicativos normais não devem precisar disso em momento algum."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"sujeitar-se a um plano de fundo"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite que o detentor se sujeite à interface de nível superior de um plano de fundo. Aplicativos normais não devem precisar disso em momento algum."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interagir com o administrador de um dispositivo"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite que o detentor envie tentativas ao administrador de um dispositivo. Não é necessário para aplicativos normais."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"alterar orientação da tela"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Permite que um aplicativo leia e grave em qualquer recurso que pertença ao grupo de diagnósticos; por exemplo, arquivos em /dev. Isso possivelmente pode afetar a estabilidade e a segurança do sistema. Isso deve ser usado APENAS para diagnósticos específicos do hardware realizados pelo fabricante ou pelo operador."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"ativar ou desativar os componentes do aplicativo"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Permite que um aplicativo altere se um componente de outro aplicativo está ativado ou não. Aplicativos maliciosos podem usar isso para desativar recursos importantes do tablet. É preciso ter cuidado com essa permissão, pois é possível deixar os componentes do aplicativo em um estado inutilizável, inconsistente ou instável."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que um aplicativo altere se um componente de outro aplicativo está ativado ou não. Aplicativos maliciosos podem usar isso para desativar recursos importantes do tablet. É preciso ter cuidado com essa permissão, pois é possível deixar os componentes do aplicativo em um estado inutilizável, inconsistente ou instável."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Permite que um aplicativo altere se um componente de outro aplicativo está ativado ou não. Aplicativos maliciosos podem usar isso para desativar recursos importantes do tablet. É preciso ter cuidado com essa permissão, pois é possível deixar os componentes do aplicativo em um estado inutilizável, inconsistente ou instável."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"definir os aplicativos preferidos"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Permite que um aplicativo modifique os seus aplicativos preferidos. Isso pode permitir que aplicativos maliciosos alterem silenciosamente os aplicativos em execução, falsificando os seus aplicativos existentes para coletar os seus dados particulares."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"modificar configurações globais do sistema"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificar/excluir conteúdo do cartão SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Perm. aplic. grave arm. USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Permite que um aplicativo grave no cartão SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modificar/excluir conteúdos de armazenamento de mídia internos"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permite que um aplicativo modifique os conteúdos de armazenamento de mídia internos."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"acessar o sistema de arquivos de cache"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permite que um aplicativo leia e grave no sistema de arquivos de cache."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"fazer/receber chamadas pela internet"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Configura o proxy global do dispositivo para ser usado enquanto a política estiver ativada. Somente o primeiro administrador do dispositivo pode configurar um verdadeiro proxy global."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Definir validade da senha"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Controle quanto tempo uma senha de bloqueio de tela deve ficar ativa antes de ser alterada"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Residencial"</item> <item msgid="869923650527136615">"Celular"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Comercial"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Outros"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Digite o código PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Digite a senha para desbloquear"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Digite o PIN para desbloquear"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Código PIN incorreto!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Senha"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Fazer login"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nome de usuário ou senha inválidos."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Verificando..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Desbloquear"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Som ativado"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Preenchimento automático"</string> <string name="setup_autofill" msgid="8154593408885654044">"Conf preen autom"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"ler histórico e favoritos do Navegador"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Permite que o aplicativo leia todos os URLs visitados pelo Navegador e todos os favoritos do Navegador."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"gravar histórico e favoritos do Navegador"</string> @@ -819,7 +813,7 @@ <string name="capital_on" msgid="1544682755514494298">"ATIVADO"</string> <string name="capital_off" msgid="6815870386972805832">"DESATIVADO"</string> <string name="whichApplication" msgid="4533185947064773386">"Complete a ação usando"</string> - <string name="alwaysUse" msgid="4583018368000610438">"Usar como padrão para esta ação."</string> + <string name="alwaysUse" msgid="4583018368000610438">"Use o como padrão para esta ação."</string> <string name="clearDefaultHintMsg" msgid="4815455344600932173">"Limpar o padrão em Configurações da página inicial > Aplicativos > Gerenciar aplicativos."</string> <string name="chooseActivity" msgid="1009246475582238425">"Selecionar uma ação"</string> <string name="noApplications" msgid="1691104391758345586">"Nenhum aplicativo pode realizar esta ação."</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB conectada"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Selecione para desativar a depuração USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Selecionar método de entrada"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidatos"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"Uma correspondência"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> de <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Concluído"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Desconectando armazenamento USB..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Desconectando cartão SD..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Apagando o armazenamento USB..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Pesquisa na web do Google"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Solicitação de localização"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Sim"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Não"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Limite de exclusão excedido"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Excluir os itens."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Desfazer as exclusões."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Não fazer nada por enquanto."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index e28b30473e4f..9a879c7a01db 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -259,10 +259,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permetta da sa fixar al nivel d\'interfatscha pli aut dad ina metoda d\'endataziun. Betg previs per applicaziuns normalas."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"sa fixar vid in fund davos"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permetta da sa fixar al nivel d\'interfatscha pli aut dad ina metoda d\'endataziun. Betg previs per applicaziuns normalas."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interacziun cun in administratur dad apparats"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permetta al possessur da trametter intenziuns a l\'administratur dal apparat periferic. Betg previs per applicaziuns normalas."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"midar l\'orientaziun dal visur"</string> @@ -502,10 +498,6 @@ <skip /> <!-- no translation found for policydesc_expirePassword (7276906351852798814) --> <skip /> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Privat"</item> <item msgid="869923650527136615">"Telefonin"</item> @@ -640,8 +632,6 @@ <!-- no translation found for sipAddressTypeOther (4408436162950119849) --> <skip /> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Endatar il code PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Endatai il pled-clav per debloccar."</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Endatar il PIN per debloccar"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Code PIN nuncorrect!"</string> @@ -687,8 +677,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Pled-clav"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"S\'annunziar"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Num d\'utilisader u pled-clav nunvalid."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Verifitgar..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Debloccar"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Tun activà"</string> @@ -959,8 +947,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Debugging USB connectà"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Tscherner per deactivar il debugging USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Tscherner ina metoda d\'endataziun"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidats"</u></string> @@ -1097,16 +1083,4 @@ <skip /> <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> - <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> - <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> - <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> - <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> - <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> - <skip /> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index f1dc60d5868e..d0e1dc6dc038 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Mod Avion"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Modul Avion este ACTIVAT"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Modul avion este DEZACTIVAT"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Mod sigur"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistemul Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Servicii cu plată"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Permite deţinătorului să se conecteze la interfaţa de nivel superior a unei metode de intrare. Nu ar trebui să fie niciodată necesară pentru aplicaţiile obişnuite."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"conectare la o imagine de fundal"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite proprietarului să se conecteze la interfaţa de nivel superior a unei imagini de fundal. Nu ar trebui să fie niciodată necesară pentru aplicaţiile obişnuite."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interacţionare cu administratorul unui dispozitiv"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite proprietarului să trimită intenţii către un administrator al dispozitivului. Nu ar trebui să fie niciodată necesară pentru aplicaţiile obişnuite."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"modificare orientare ecran"</string> @@ -468,7 +465,7 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"modificare/ştergere conţinut card SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Permite unei apl. să scrie în stoc. USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Permite unei aplicaţii să scrie pe cardul SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"mod./şt. con. stoc. media int."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"modificare/ştergere a conţinutului din stocarea media internă"</string> <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Permite unei aplicaţii să modifice conţinutul stocării media interne."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"accesare sistem de fişiere cache"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Permite unei aplicaţii să scrie şi să citească sistemul de fişiere cache."</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Setaţi serverul proxy global pentru dispozitiv care să fie utilizat cât timp politica este activă. Numai primul administrator al dispozitivului poate seta serverul proxy global activ."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Setaţi expirarea parolei"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Controlarea duratei până când parola de blocare a ecranului trebuie modificată"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Domiciliu"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Serviciu"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Altul"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Introduceţi codul PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Introduceţi parola pentru a debloca"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Introduceţi PIN pentru deblocare"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Cod PIN incorect!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Parolă"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Conectaţi-vă"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Nume de utilizator sau parolă nevalide."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Se verifică..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Deblocaţi"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sunet activat"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Depanarea USB este conectată"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Selectaţi pentru a dezactiva depanarea USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Selectaţi metoda de intrare"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"candidaţi"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Căutare pe web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Solicitare de locaţie"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Da"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nu"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Limita pentru ştergere a fost depăşită"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Ştergeţi elementele."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Anulaţi aceste ştergeri."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Pentru moment, nu efectuaţi nicio acţiune."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 40e29cf4634d..22ee02a6e07c 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Выключение..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Планшетный ПК будет отключен."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Телефон будет выключен."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Выключить?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Недавние"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Нет последних приложений."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Настройки планшетного ПК"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Режим полета"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Режим полета ВКЛЮЧЕН"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Режим полета ВЫКЛЮЧЕН"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безопасный режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Система Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Платные услуги"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Позволяет выполнять привязку к интерфейсу ввода верхнего уровня. Не требуется для обычных приложений."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"связать с фоновым рисунком"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Разрешает выполнять привязку к интерфейсу фонового рисунка верхнего уровня. Не требуется для обычных приложений."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"взаимодействовать с администратором устройства"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Позволяет владельцу отправлять целевые значения администратору устройства. Никогда не используется обычными приложениями."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"изменять ориентацию экрана"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Позволяет приложению считывать и записывать данные в любые ресурсы, принадлежащие группе диагностики (например, файлы в каталоге /dev). Это может повлиять на стабильность и безопасность системы. Эта возможность может быть использована ТОЛЬКО производителем или оператором для диагностики аппаратного обеспечения."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"включать или отключать компоненты приложения"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Позволяет приложению отключать или включать компоненты другого приложения. Вредоносные приложения могут использовать это разрешение для отключения важных возможностей планшетного ПК. Это разрешение следует использовать с осторожностью, так как оно может привести к несовместимости, нестабильности и неработоспособности компонентов приложения."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Позволяет приложению отключать или включать компоненты другого приложения. Вредоносные приложения могут использовать это разрешение для отключения важных возможностей планшетного ПК. Это разрешение следует использовать с осторожностью, так как оно может привести к несовместимости, нестабильности и неработоспособности компонентов приложения."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Позволяет приложению отключать или включать компоненты другого приложения. Вредоносные приложения могут использовать это разрешение для отключения важных возможностей планшетного ПК. Это разрешение следует использовать с осторожностью, так как оно может привести к несовместимости, нестабильности и неработоспособности компонентов приложения."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"выбирать предпочтительные приложения"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Позволяет приложению изменять предпочтительные приложения. Вредоносные приложения могут использовать эту возможность для незаметного изменения запущенных приложений и для сбора конфиденциальной информации с помощью имитации подключения существующих приложений."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"изменять общие настройки системы"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"изменять/удалять содержимое SD-карты"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Разрешает приложению запись на USB-накопитель."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Разрешает приложению запись на SD-карту"</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"изм./удал. содерж. мультимедиа"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Позволяет приложению изменять содержание внутреннего хранилища мультимедиа."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"получать доступ к кэшу файловой системы"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Разрешает программам доступ для записи и чтения к кэшу файловой системы."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"совершать и принимать интернет-вызовы"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Настройте глобальный прокси-сервер устройства, который будет использоваться при активной политике. Глобальный прокси-сервер должен настроить первый администратор устройства."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Задать время действия пароля"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Задать время действия пароля перед появлением экрана блокировки"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Домашний"</item> <item msgid="869923650527136615">"Мобильный"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Рабочий"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Другой"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Введите PIN-код"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Введите пароль для разблокировки"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Введите PIN-код для разблокировки"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Неверный PIN-код!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Пароль"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Вход"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Неверное имя пользователя или пароль."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Проверка..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Разблокировать"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Вкл. звук"</string> @@ -673,12 +665,14 @@ <string name="js_dialog_before_unload" msgid="1901675448179653089">"Перейти с этой страницы?"\n\n"<xliff:g id="MESSAGE">%s</xliff:g>"\n\n"Нажмите \"ОК\", чтобы продолжить, или \"Отмена\", чтобы остаться на текущей странице."</string> <string name="save_password_label" msgid="6860261758665825069">"Подтвердите"</string> <string name="double_tap_toast" msgid="1068216937244567247">"Совет: нажмите дважды, чтобы увеличить и уменьшить масштаб."</string> - <string name="autofill_this_form" msgid="1272247532604569872">"Автозаполнение"</string> + <string name="autofill_this_form" msgid="1272247532604569872">"Автозап."</string> <string name="setup_autofill" msgid="8154593408885654044">"Нужна настройка"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"считывать историю и закладки браузера"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Разрешает приложению считывать все URL, посещенные браузером, и все его закладки."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"записывать историю и закладки браузера"</string> @@ -694,7 +688,7 @@ <string name="save_password_never" msgid="8274330296785855105">"Никогда"</string> <string name="open_permission_deny" msgid="5661861460947222274">"У вас нет разрешения на открытие этой страницы."</string> <string name="text_copied" msgid="4985729524670131385">"Текст скопирован в буфер обмена."</string> - <string name="more_item_label" msgid="4650918923083320495">"Ещё"</string> + <string name="more_item_label" msgid="4650918923083320495">"Дополнительно"</string> <string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string> <string name="menu_space_shortcut_label" msgid="2410328639272162537">"пробел"</string> <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"ввод"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Отладка по USB разрешена"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Нажмите, чтобы отключить отладку USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Выберите способ ввода"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"варианты"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 совпадение"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> из <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Готово"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Отключение USB-накопителя..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Отключение SD-карты..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Очистка USB-накопителя..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Веб-поиск"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Запрос местоположения"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Да"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Нет"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Превышен предел удаления"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Удалить элементы."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Отменить удаления."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Ничего не делать сейчас."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 0e4331f899fd..397688daaae1 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Režim V lietadle"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Režim V lietadle je ZAPNUTÝ"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Režim V lietadle je VYPNUTÝ"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Núdzový režim"</string> <string name="android_system_label" msgid="6577375335728551336">"Systém Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Spoplatnené služby"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Umožňuje držiteľovi viazať sa na najvyššiu úroveň rozhrania metódy vstupu. Bežné aplikácie by toto nastavenie nemali vôbec využívať."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"väzba na tapetu"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Umožňuje držiteľovi viazať sa na najvyššiu úroveň rozhrania tapety. Bežné aplikácie by toto nastavenie vôbec nemali využívať."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"komunikovať so správcom zariadenia"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Umožňuje držiteľovi odosielať informácie správcovi zariadenia. Bežné aplikácie by toto oprávnenie nemali nikdy požadovať."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"zmena orientácie obrazovky"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Vyberte globálny server proxy, ktorý sa bude používať po aktivácii pravidiel. Platný globálny server proxy nastavuje iba prvý správca zariadenia."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Nastav. koniec platnosti hesla"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Ovládanie doby, po uplynutí ktorej treba zmeniť heslo na odomknutie obrazovky"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Domovská stránka"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Práca"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Iné"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Zadajte kód PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Zadajte heslo pre odomknutie"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Zadajte kód PIN pre odomknutie"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Nesprávny kód PIN"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Heslo"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Prihlásiť sa"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Neplatné používateľské meno alebo heslo."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Prebieha kontrola..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Odomknúť"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Zapnúť zvuk"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Ladenie cez rozhranie USB pripojené"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Vyberte, ak chcete zakázať ladenie USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Výber metódy vstupu"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" AÁÄBCČDĎDZDŽEÉFGHCHIÍJKLĽMNŇOÓÔPRŔSŠTŤUÚVWXYÝZŽ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidáti"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Hľadať na webe"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Žiadosť o informácie o polohe"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Áno"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nie"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Bol prekročený limit odstraňovania."</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Odstrániť položky."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Vrátiť odstránenia späť."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Nevykonávať akciu."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 8608525931cf..91c42a84938d 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Način za letalo"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Način za letalo je VKLOPLJEN"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Način za letalo je IZKLOPLJEN"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100 +"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Varni način"</string> <string name="android_system_label" msgid="6577375335728551336">"Sistem Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Plačljive storitve"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Dovoljuje lastniku, da se poveže z vmesnikom načina vnosa najvišje ravni. Tega nikoli ni treba uporabiti za navadne programe."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"povezovanje z ozadjem"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Dovoljuje, da se lastnik poveže z vmesnikom ozadja najvišje ravni. Tega nikoli ni treba uporabiti za navadne programe."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interakcija s skrbnikom naprave"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Dovoljuje lastniku, da pošlje namere skrbniku naprave. Nikoli se ne uporablja za navadne programe."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"spreminjanje usmerjenosti zaslona"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Nastavite globalni strežnik proxy naprave, ki bo v uporabi, ko je pravilnik omogočen. Samo skrbnik prve naprave lahko nastavi veljaven globalni strežnik proxy."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Nastavitev poteka gesla"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Nastavite, koliko časa prej je treba spremeniti geslo za odklepanje zaslona"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Začetna stran"</item> <item msgid="869923650527136615">"Mobilni"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Služba"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Drugo"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Vnesite kodo PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Vnesite geslo za odklop"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Vnesite PIN za odklepanje"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Nepravilna koda PIN."</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Geslo"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Prijava"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Neveljavno uporabniško ime ali geslo."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Preverjanje ..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Odkleni"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Vklopi zvok"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"iskanje in odpravljanje napak USB je povezano"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Izberite, če želite onemogočiti iskanje in odpravljanje napak prek vrat USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Izbiranje načina vnosa"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidati"</u></string> @@ -1010,30 +997,26 @@ <string name="media_unknown_state" msgid="729192782197290385">"Neznano stanje zunanjih nosilcev podatkov."</string> <string name="share" msgid="1778686618230011964">"Deli z dr."</string> <string name="find" msgid="4808270900322985960">"Najdi"</string> - <string name="websearch" msgid="4337157977400211589">"Spletno iskanje"</string> + <!-- no translation found for websearch (4337157977400211589) --> + <skip /> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Zahteva za lokacijo"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Da"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Ne"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Omejitev brisanja je presežena"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Izbriši elemente."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Razveljavi brisanje."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Zaenkrat ne stori ničesar."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 11e62475f41b..c5c1e43c4e40 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Режим рада у авиону"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Режим рада у авиону је УКЉУЧЕН"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Режим рада у авиону је ИСКЉУЧЕН"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безбедни режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Android систем"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Услуге које се плаћају"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Омогућава власнику да се обавеже на интерфејс методе уноса највишег нивоа. Обичне апликације никада не би требало да је користе."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"обавезивање на позадину"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Омогућава власнику да се обавеже на интерфејс позадине највишег нивоа. Обичне апликације никада не би требало да је користе."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"интеракција са администратором уређаја"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Омогућава власнику да шаље своје намере администратору уређаја. Обичне апликације никада не би требало да је користе."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"промена положаја екрана"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Подесите глобални прокси сервер уређаја који ће се користити док су омогућене смернице. Само први администратор уређаја поставља ефективни глобални прокси сервер."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Подеси време истека лозинке"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Контролишите време када лозинка за закључавање екрана треба да се промени"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Кућа"</item> <item msgid="869923650527136615">"Мобилни"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Посао"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Други"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Унесите PIN кôд"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Унесите лозинку за откључавање"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Унесите PIN да бисте откључали тастатуру"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN кôд је нетачан!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Лозинка"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Пријави ме"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Неважеће корисничко име или лозинка."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Проверавање..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Откључај"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Укључи звук"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Отклањање грешака са USB-а је успостављено"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Изаберите да бисте онемогућили отклањања грешака са USB-а."</string> <string name="select_input_method" msgid="6865512749462072765">"Избор методе уноса"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"кандидати"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Веб претрага"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Захтев за локацију"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Да"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Не"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Премашено је ограничење за брисање"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Избриши ставке."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Опозови брисања."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Не ради ништа за сада."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index dcb10a745221..bda38631d007 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Avslutar…"</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Din pekdator stängs av."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Din telefon stängs av."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Vill du stänga av?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"Senaste"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Inga nya program."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Alternativ för pekdatorn"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Flygplansläge"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Flygplansläge är AKTIVERAT"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Flygplansläge är INAKTIVERAT"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">">100"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Säkert läge"</string> <string name="android_system_label" msgid="6577375335728551336">"Android-system"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Tjänster som kostar pengar"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Innehavaren tillåts att binda till den översta nivåns gränssnitt för en inmatningsmetod. Ska inte behövas för vanliga program."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"binda till en bakgrund"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Innehavaren tillåts att binda till den översta nivåns gränssnitt för en bakgrund. Ska inte behövas för vanliga program."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"arbeta med en enhetsadministratör"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Tillåter att innehavaren skickar avsikter till en enhetsadministratör. Vanliga program behöver aldrig göra detta."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"ändra bildskärmens rikting"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Tillåter att ett program läser och skriver till en resurs som ägs av diag-gruppen; till exempel filer i /dev. Detta kan eventuellt påverka systemets stabilitet och säkerhet. Detta bör ENDAST används av tillverkaren eller operatören för maskinvaruspecifik diagnostik."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"aktivera eller inaktivera programkomponenter"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Tillåter att ett program ändrar inställningen för om en komponent i ett annat program har aktiverats eller inte. Skadliga program kan använda detta för att inaktivera viktiga funktioner i pekdatorn. Var försiktig med behörigheten, eftersom programkomponenter kan bli oanvändbara, inkonsekventa eller instabila."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Tillåter att en app ändrar inställningen för om en komponent i en annan app ska aktiveras eller inte. Skadliga appar kan använda detta för att inaktivera viktiga funktioner i pekdatorn. Var försiktig med behörigheten, eftersom programkomponenter kan bli oanvändbara, inkonsekventa eller instabila."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Tillåter att ett program ändrar inställningen för om en komponent i ett annat program har aktiverats eller inte. Skadliga program kan använda detta för att inaktivera viktiga funktioner i pekdatorn. Var försiktig med behörigheten, eftersom programkomponenter kan bli oanvändbara, inkonsekventa eller instabila."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"ange önskade program"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Tillåter att ett program ändrar dina önskade program. Skadliga program kan utan varning ändra de program som körs och förfalska dina befintliga program så att de samlar privata data från dig."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"ändra globala systeminställningar"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"ändra/ta bort innehåll på SD-kortet"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Får skriva till USB-enheten."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Tillåter att ett program skriver till SD-kortet."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"ändra/ta bort innehåll"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Tillåter att en app ändrar innehållet på den interna lagringsenheten."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"åtkomst till cachefilsystemet"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Tillåter att ett program läser och skriver till cachefilsystemet."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"ringa/ta emot Internetsamtal"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Ange vilken global proxyserver som ska användas när policyn är aktiverad. Endast den första enhetsadministratören anger den faktiska globala proxyservern."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Ange lösenordets utgångsdatum"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Se hur långt det är kvar till du måste ändra lösenordet till låsningsskärmen"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Hem"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Arbete"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Övrigt"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Ange PIN-kod"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Ange lösenord för att låsa upp"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Ange PIN-kod för att låsa upp"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Fel PIN-kod!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Lösenord"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Logga in"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Ogiltigt användarnamn eller lösenord."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrollerar ..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Lås upp"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Ljud på"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"Autofyll"</string> <string name="setup_autofill" msgid="8154593408885654044">"Konfig. Autofyll"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"läsa webbläsarhistorik och bokmärken"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Tillåter att program läser alla webbadresser som webbläsaren har öppnat och alla webbläsarens bokmärken."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"skriva webbläsarhistorik och bokmärken"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB-felsökning ansluten"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Välj att inaktivera USB-felsökning."</string> <string name="select_input_method" msgid="6865512749462072765">"Välj indatametod"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"kandidater"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 träff"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> av <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Klar"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"Demontera USB-lagringsenhet..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"Demonterar SD-kort..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Raderar USB-lagring..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Webbsökning"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Positionsförfrågan"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Ja"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Nej"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Gränsen för borttagning har överskridits"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Ta bort objekten."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Ångra borttagningarna."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Gör ingenting just nu."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index a3f190076668..41593f233afc 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"โหมดใช้งานบนเครื่องบิน"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"เปิดโหมดใช้งานบนเครื่องบิน"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"โหมดใช้งานบนเครื่องบินปิดทำงานอยู่"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"โหมดปลอดภัย"</string> <string name="android_system_label" msgid="6577375335728551336">"ระบบ Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"บริการที่ต้องเสียค่าใช้จ่าย"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"อนุญาตให้ผู้ถือเชื่อมโยงกับอินเทอร์เฟซระดับสูงสุดของวิธีป้อนข้อมูล ไม่ควรต้องใช้สำหรับแอปพลิเคชันทั่วไป"</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"เชื่อมโยงกับวอลเปเปอร์"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"อนุญาตให้ผู้ถือเชื่อมโยงกับอินเทอร์เฟซระดับสูงสุดของวอลเปเปอร์ ไม่ควรต้องใช้สำหรับแอปพลิเคชันทั่วไป"</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"ติดต่อกับผู้ดูแลอุปกรณ์"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"อนุญาตให้ผู้ถือส่งเนื้อหาไปยังโปรแกรมควบคุมอุปกรณ์ ไม่ควรต้องใช้สำหรับแอปพลิเคชันทั่วไป"</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"เปลี่ยนการวางแนวหน้าจอ"</string> @@ -468,7 +465,7 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"แก้ไข/ลบข้อมูลการ์ด SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"อนุญาตให้แอปพลิเคชันเขียนไปยังที่เก็บข้อมูล USB"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"อนุญาตให้แอปพลิเคชันเขียนลงบนการ์ด SD"</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"แก้/ลบเนื้อหาข้อมูลสื่อภายใน"</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"แก้ไข/ลบเนื้อหาของที่เก็บข้อมูลสื่อภายใน"</string> <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"อนุญาตให้แอปพลิเคชันแก้ไขเนื้อหาของที่เก็บข้อมูลสื่อภายใน"</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"เข้าถึงระบบไฟล์แคช"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"อนุญาตให้แอปพลิเคชันอ่านและเขียนระบบไฟล์แคช"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"ตั้งค่าพร็อกซีส่วนกลางของอุปกรณ์ที่จะใช้ขณะเปิดการใช้งานนโยบาย เฉพาะผู้ดูแลอุปกรณ์คนแรกเท่านั้นที่ตั้งค่าพร็อกซีส่วนกลางที่มีผลบังคับ"</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"ตั้งค่าการหมดอายุของรหัสผ่าน"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"ควบคุมระยะเวลาก่อนที่จะต้องเปลี่ยนรหัสผ่านการล็อกหน้าจอ"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"บ้าน"</item> <item msgid="869923650527136615">"มือถือ"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"ที่ทำงาน"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"อื่นๆ"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"ป้อนรหัส PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"ป้อนรหัสผ่านเพื่อปลดล็อก"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"ป้อน PIN เพื่อปลดล็อก"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"รหัส PIN ไม่ถูกต้อง!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"รหัสผ่าน"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ลงชื่อเข้าใช้"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"กำลังตรวจสอบ..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"ปลดล็อก"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"เปิดเสียง"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"เชื่อมต่อการแก้ไขข้อบกพร่อง USB แล้ว"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"เลือกเพื่อปิดใช้งานการแก้ไขข้อบกพร่อง USB"</string> <string name="select_input_method" msgid="6865512749462072765">"เลือกวิธีป้อนข้อมูล"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรลวศษสหฬอฮ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรลวศษสหฬอฮ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"ตัวเลือก"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"ค้นเว็บ"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"คำขอตำแหน่ง"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"ใช่"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"ไม่"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"เกินจำนวนการลบสูงสุด"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"ลบรายการ"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"เลิกทำการลบ"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"ไม่ทำอะไรในขณะนี้"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 5c97ea9ad57d..f65d77ea85cb 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Airplane mode"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Naka-ON ang airplane mode"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Naka-OFF ang airplane mode"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Mga serbisyong ginagastusan mo"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Pinapayagan ang holder na sumailalim sa nangungunang antas na interface ng pamamaraan ng pag-input. Hindi dapat kailanmang kailanganin para sa mga normal na application."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"sumailalim sa wallpaper"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Pinapayagan ang holder na sumailalim sa interface na nasa nangungunang antas ng wallpaper. Hindi kailanman dapat na kailanganin para sa mga normal na application."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"makipag-ugnay sa tagapangasiwa ng device"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Pinapayagan ang holder na magpadala ng mga intensyon sa administrator ng device. Hindi kailanman dapat kailanganin para sa mga normal na application."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"baguhin ang orientation ng screen"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Itakda ang pandaigdigang proxy ng device na gagamitin habang pinagana ang patakaran. Tanging ang unang admin ng device ang magtatakda sa may bisang pandaigdigang proxy."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Itakda pag-expire ng password"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Kontrolin kung gaano katagal bago kailangang palitan ang password sa pag-lock ng screen"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Home"</item> <item msgid="869923650527136615">"Mobile"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Trabaho"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Iba pa"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Ipasok ang PIN code"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Ipasok ang password upang i-unlock"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Ipasok ang PIN upang i-unlock"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Maling PIN code!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Password"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Mag-sign in"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Di-wastong username o password."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Sinusuri..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"I-unlock"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"I-on ang tunog"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Konektado ang debugging ng USB"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Piliin upang huwag paganahin ang debugging ng USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Pumili ng pamamaraan ng pag-input"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"mga kandidato"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Paghahanap sa Web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Hiling ng lokasyon"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Oo"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Hindi"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Nalagpasan na ang limitasyon sa pagtanggal"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Tanggalin ang mga item."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"I-undo ang mga pagtanggal."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Walang gawin sa ngayon."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 811142efd4a4..762ea47612c7 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"Kapanıyor…"</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Tabletiniz kapanacak."</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Telefonunuz kapanacak."</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"Kapatmak istiyor musunuz?"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"En Son Görevler"</string> <string name="no_recent_tasks" msgid="279702952298056674">"Hiçbir yeni uygulama yok."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"Tablet seçenekleri"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Uçak modu"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Uçak modu AÇIK"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Uçak modu KAPALI"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Güvenli mod"</string> <string name="android_system_label" msgid="6577375335728551336">"Android Sistemi"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Size maliyet getiren hizmetler"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Tutucunun bir giriş yönteminin en üst düzey arayüzüne bağlanmasına izin verir. Normal uygulamalarda hiçbir zaman gerek duyulmamalıdır."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"bir duvar kağıdına tabi kıl"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Hesap sahibine bir duvar kağıdının en üst düzey arayüzüne bağlanma izni verir. Normal uygulamalarda hiçbir zaman gerek duyulmamalıdır."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"bir cihaz yöneticisi ile etkileşimde bulun"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Cihazın sahibinin cihaz yöneticisine amaç göndermesine izin verir. Normal uygulamalarda hiçbir zaman gerek duyulmamalıdır."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"ekran yönünü değiştir"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"Uygulamanın tanılama grubundaki bir kaynağa ait herhangi bir kaynağı; örneğin /dev içindeki dosyaları okumasına ve bunlara yazmasına izin verir. Bu işlevin sistem kararlılığını ve güvenliğini olumsuz etkileme olasılığı vardır. Üretici veya operatör tarafından YALNIZCA donanıma özgü tanılama için kullanılmalıdır."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"uygulama bileşenlerini etkinleştir veya devre dışı bırak"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"Uygulamaya başka bir uygulamanın bir bileşenini etkinleştirme ayarını değiştirme izni verir. Kötü amaçlı uygulamalar bu ayarı tabletin önemli yeteneklerini devre dışı bırakmak için kullanabilir. Bu iznin verilmesi uygulama bileşenlerini kullanılamaz, tutarsız veya kararsız bir duruma sokabileceği için izin verilirken dikkatli olunmalıdır."</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Uygulamaya, başka bir uygulamanın bir bileşenini etkinleştirme ayarını değiştirme izni verir. Kötü amaçlı uygulamalar bu ayarı tabletin önemli yeteneklerini devre dışı bırakmak için kullanabilir. Bu iznin verilmesi uygulama bileşenlerini kullanılamaz, tutarsız veya kararsız bir duruma sokabileceği için izin verilirken dikkatli olunmalıdır."</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"Uygulamaya başka bir uygulamanın bir bileşenini etkinleştirme ayarını değiştirme izni verir. Kötü amaçlı uygulamalar bu ayarı tabletin önemli yeteneklerini devre dışı bırakmak için kullanabilir. Bu iznin verilmesi uygulama bileşenlerini kullanılamaz, tutarsız veya kararsız bir duruma sokabileceği için izin verilirken dikkatli olunmalıdır."</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"tercih edilen uygulamaları ayarla"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"Uygulamanın tercih ettiğiniz uygulamaları değiştirmesine izin verir. Bu işlem, kötü amaçlı uygulamaların, çalışmakta olan uygulamaları sessizce değiştirerek mevcut uygulamalarınızı aldatıp kişisel bilgilerinizi almasına izin verebilir."</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"genel sistem ayarlarını değiştir"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"SD kart içeriklerini değiştir/sil"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Uygulamanın USB dep birimine yazmasına izni verir."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Bir uygulamaya SD karta yazma izni verir."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"dahili medya depolama birimi içeriğini değiştir/sil"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Uygulamaya, dahili medya depolama içeriğini değiştirme izni verir."</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"önbellek dosya sistemine eriş"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Bir uygulamanın önbellek dosya sisteminde okuma yazma yapmasına izin verir."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"İnternet çağrılar yap/alma"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Politika etkin olduğunda kullanılacak cihaz genelinde geçerli proxy\'yi ayarlayın. Etkin genel proxy\'yi yalnızca ilk cihaz yöneticisi ayarlar."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Şifre süre sonu tarihi ayarla"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Ekran kilitleme şifresinin ne kadar süre sonra değiştirilmesi gerekeceğini denetleyin."</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Ev"</item> <item msgid="869923650527136615">"Mobil"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"İş"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Diğer"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"PIN kodunu gir"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Kilidi açmak için şifreyi girin"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Kilidi açmak için PIN\'i girin"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Yanlış PIN kodu!"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Şifre"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Oturum aç"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Geçersiz kullanıcı adı veya şifre."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Kontrol ediliyor..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Kilit Aç"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sesi aç"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"OtoDoldr"</string> <string name="setup_autofill" msgid="8154593408885654044">"Oto Doldr Ayarla"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"Tarayıcı geçmişini ve favorileri oku"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"Uygulamaya Tarayıcının ziyaret etmiş olduğu tüm URL\'leri ve Tarayıcının tüm favorilerini okuma izni verir."</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"Tarayıcı geçmişini ve favorileri yaz"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB hata ayıklaması bağlandı"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"USB hata ayıklamasını devre dışı bırakmak için tıklayın."</string> <string name="select_input_method" msgid="6865512749462072765">"Giriş yöntemini seç"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"adaylar"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 eşleşme"</item> <item quantity="other" msgid="4641872797067609177">"<xliff:g id="INDEX">%d</xliff:g> / <xliff:g id="TOTAL">%d</xliff:g>"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"Bitti"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"USB depolama biriminin bağlantısı kesiliyor..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"SD kartın bağlantısı kesiliyor..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"USB dep brm silinyr..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"Google Web Arama"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Konumlama isteği"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Evet"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Hayır"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Silme sınırı aşıldı"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Öğeleri silin."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Silme işlemlerini geri alın."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Şimdilik bir şey yapma."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 8c676dd9e557..a2ad6dc205a7 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Режим польоту"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Режим польоту ВВІМК."</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Режим польоту ВИМК."</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Безп. режим"</string> <string name="android_system_label" msgid="6577375335728551336">"Система Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Служби, які потребують оплати"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Дозволяє власнику прив\'язувати до інтерфейсу верхнього рівня методу введення. Ніколи не потрібний для звичайних програм."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"прив\'зати до фон. мал."</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Дозволяє власнику прив\'язувати до інтерфейсу верхнього рівня фон. малюнка. Ніколи не потрібний для звичайних програм."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"взаємодіяти з адмін. пристрою"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Дозволяє власнику надсилати цілі адміністратору пристрою. Ніколи не потрібний для звичайних програм."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"змінювати орієнтацію екрана"</string> @@ -468,8 +465,8 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"змінювати/видал. вміст карти SD"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"Дозволяє програмі записувати на носій USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Дозволяє програмі записувати на карту SD."</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"змінювати/видаляти вміст внутр. сховища даних"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Дозволяє програмі змінювати вміст внутрішнього сховища даних."</string> + <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"змін./видаляти вміст внутр. сховища медіа-файлів"</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Дозволяє програмі змінювати вміст внутрішнього сховища медіа-файлів."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"отр. дост. до файл. сист. кешу"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Дозволяє програмі зчитувати та записувати файлову сист. кешу."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"здійсн./отрим. Інтернет-дзвін."</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Устан. використ. глоб. проксі, коли ввімкнено політику. Лише адміністратор першого пристрою встановлює активний глоб. проксі."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Установити термін дії пароля"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Регулює, за скільки часу перед блокуванням екрана треба змінювати пароль"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Дом."</item> <item msgid="869923650527136615">"Мобільний"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Робоча"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Інша"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Введіть PIN-код"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Введіть пароль, щоб розбл."</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Введ. PIN для розблок."</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Неправильний PIN-код!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Пароль"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Увійти"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Недійсне ім\'я корист. чи пароль."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Перевірка..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Розблок."</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Увімк. звук"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Налагодження USB підключ."</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Вибер., щоб вимкн. налагодж. USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Виберіть метод введ-ня"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789АБВГҐДЕЄЖЗИІЇЙКЛМНОПРСТУФХЦЧШЩЬЮЯ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"кандидати"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Веб-пошук"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Запит про місцезнаходження"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Так"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Ні"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Перевищено ліміт видалень"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Видалити елементи."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Скасувати видалення."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Наразі нічого не робити."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 64888710c98c..4e5220a347ed 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -151,7 +151,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Chế độ trên máy bay"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Chế độ trên máy bay BẬT"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Chế độ trên máy bay TẮT"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"Chế độ an toàn"</string> <string name="android_system_label" msgid="6577375335728551336">"Hệ thống Android"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"Dịch vụ tính tiền của bạn"</string> @@ -255,10 +256,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"Cho phép chủ nhân ràng buộc với giao diện cấp cao nhất của phương thức nhập. Không cần thiết cho các ứng dụng thông thường."</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"liên kết với hình nền"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Cho phép chủ nhân ràng buộc với giao diện cấp cao nhất của hình nền. Không cần thiết cho các ứng dụng thông thường."</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"tương tác với quản trị viên thiết bị"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Cho phép chủ nhân gửi các ý định đến quản trị viên thiết bị. Không cần thiết cho các ứng dụng thông thường."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"thay đổi hướng màn hình"</string> @@ -469,7 +466,7 @@ <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"C.phép ứ.dụng ghi vào b.nhớ USB."</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"Cho phép ứng dụng ghi vào thẻ SD."</string> <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"sửa đổi/xóa nội dung trên bộ nhớ phương tiện cục bộ"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Cho phép ứng dụng sửa đổi nội dung của bộ nhớ phương tiện cục bộ."</string> + <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"Cho phép ứng dụng sửa đổi nội dung của bộ nhớ phương tiện nội bộ."</string> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"truy cập hệ thống tệp bộ nhớ cache"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"Cho phép ứng dụng đọc và ghi hệ thống tệp bộ nhớ cache."</string> <string name="permlab_use_sip" msgid="5986952362795870502">"thực hiện/nhận cuộc gọi qua Internet"</string> @@ -490,10 +487,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Đặt proxy chung của điện thoại được sử dụng trong khi chính sách được bật. Chỉ quản trị viên đầu tiên của điện thoại mới có thể đặt proxy chung hiệu quả."</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"Đặt hết hạn mật khẩu"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"Kiểm soát thời lượng trước khi mật khẩu khóa màn hình cần được thay đổi"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Nhà riêng"</item> <item msgid="869923650527136615">"ĐT di động"</item> @@ -608,8 +601,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Cơ quan"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Khác"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"Nhập mã PIN"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"Nhập mật khẩu để mở khoá"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"Nhập PIN để mở khóa"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"Mã PIN không chính xác!"</string> @@ -653,8 +644,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Mật khẩu"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Đăng nhập"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Tên người dùng hoặc mật khẩu không hợp lệ."</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"Đang kiểm tra..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"Mở khoá"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Bật âm thanh"</string> @@ -911,8 +900,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"Gỡ lỗi USB đã được kết nối"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"Chọn để vô hiệu hoá gỡ lỗi USB."</string> <string name="select_input_method" msgid="6865512749462072765">"Chọn phương thức nhập"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"ứng viên"</u></string> @@ -1013,27 +1000,22 @@ <string name="websearch" msgid="4337157977400211589">"Tìm kiếm trên web"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"Yêu cầu vị trí"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"Có"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"Không"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"Đã vượt quá giới hạn xóa"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"Xóa mục."</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"Hoàn tác việc xóa."</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"Ngay bây giờ bạn không cần làm gì cả."</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 7489de782db1..1cfc5cf51892 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"您的平板电脑会关闭。"</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"您的手机会关机。"</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"要关闭手机吗？"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"近期任务"</string> <string name="no_recent_tasks" msgid="279702952298056674">"没有最近的应用程序。"</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"平板电脑选项"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"飞行模式"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"已开启飞行模式"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"已关闭飞行模式"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系统"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"需要您付费的服务"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"允许手机用户绑定至输入法的顶级界面。普通应用程序从不需要使用此权限。"</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"绑定到壁纸"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"允许手机用户绑定到壁纸的顶级界面。应该从不需要将此权限授予普通应用程序。"</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"与设备管理器交互"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"允许持有对象将意向发送到设备管理器。普通的应用程序一律无需此权限。"</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"更改屏幕显示方向"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"允许应用程序读取/写入诊断组所拥有的任何资源（例如，/dev 中的文件）。这可能会影响系统稳定性和安全性。此权限仅供制造商或运营商诊断硬件问题。"</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"启用或停用应用程序组件"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"允许应用程序更改是否启用其他应用程序的组件。恶意应用程序可借此停用重要的平板电脑功能。使用此权限时请务必谨慎，因为这可能导致应用程序组件陷入不可用、不一致或不稳定的状态。"</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"允许应用程序更改是否启用其他应用程序的组件。恶意应用程序可借此停用重要的平板电脑功能。使用此权限时请务必谨慎，因为这可能导致应用程序组件陷入不可用、不一致或不稳定的状态。"</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"允许应用程序更改是否启用其他应用程序的组件。恶意应用程序可借此停用重要的平板电脑功能。使用此权限时请务必谨慎，因为这可能导致应用程序组件陷入不可用、不一致或不稳定的状态。"</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"设置首选应用程序"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"允许应用程序修改首选的应用程序。这样恶意应用程序可能会暗中更改运行的应用程序，从而骗过您的现有应用程序来收集您的保密数据。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"修改全局系统设置"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"修改/删除 SD 卡中的内容"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"允许应用程序写入 USB 存储设备。"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"允许应用程序写入 SD 卡。"</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"修改/删除内部媒体存储设备的内容"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"允许应用程序修改内部媒体存储设备的内容。"</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"访问缓存文件系统"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"允许应用程序读取和写入缓存文件系统。"</string> <string name="permlab_use_sip" msgid="5986952362795870502">"拨打/接听互联网通话"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"请设置在启用政策的情况下要使用的设备全局代理。只有第一设备管理员才可设置有效的全局代理。"</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"设置密码有效期"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"控制屏幕锁定密码的使用期限"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"住宅"</item> <item msgid="869923650527136615">"手机"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"单位"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"其他"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"输入 PIN 码"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"输入密码进行解锁"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"输入 PIN 进行解锁"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN 码不正确！"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"密码"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"登录"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"用户名或密码无效。"</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"正在检查..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"解锁"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"打开声音"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"自动填充"</string> <string name="setup_autofill" msgid="8154593408885654044">"设置自动填充"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$3$2$1"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">"， "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$3$2$1"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"读取浏览器的历史记录和书签"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"允许应用程序读取用浏览器访问过的所有网址，以及浏览器的所有书签。"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"写入浏览器的历史记录和书签"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"已连接 USB 调试"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"选择停用 USB 调试。"</string> <string name="select_input_method" msgid="6865512749462072765">"选择输入法"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"候选"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 个匹配项"</item> <item quantity="other" msgid="4641872797067609177">"第 <xliff:g id="INDEX">%d</xliff:g> 项，共 <xliff:g id="TOTAL">%d</xliff:g> 项"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"完成"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"正在卸载 USB 存储设备..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"正在卸载 SD 卡..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"正在格式化 USB 存储设备"</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"网页搜索"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"定位请求"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"是"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"否"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"超出删除限制"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"删除这些项。"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"撤消删除。"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"目前不进行任何操作。"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 194932c6754f..d0f460fcda41 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -138,7 +138,8 @@ <string name="shutdown_progress" msgid="2281079257329981203">"關機中..."</string> <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"您的平板電腦將會關機。"</string> <string name="shutdown_confirm" product="default" msgid="649792175242821353">"手機即將關機。"</string> - <!-- outdated translation 4249474800794963142 --> <string name="shutdown_confirm_question" msgid="6656441286856415014">"您要關機嗎？"</string> + <!-- no translation found for shutdown_confirm_question (6656441286856415014) --> + <skip /> <string name="recent_tasks_title" msgid="3691764623638127888">"最新的"</string> <string name="no_recent_tasks" msgid="279702952298056674">"最近沒有存取應用程式。"</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"平板電腦選項"</string> @@ -151,7 +152,8 @@ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"飛航模式"</string> <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"飛航模式為 [開啟]"</string> <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"飛航模式為 [關閉]"</string> - <string name="status_bar_notification_info_overflow" msgid="5833510281787786290">"100+"</string> + <!-- no translation found for status_bar_notification_info_overflow (5833510281787786290) --> + <skip /> <string name="safeMode" msgid="2788228061547930246">"安全模式"</string> <string name="android_system_label" msgid="6577375335728551336">"Android 系統"</string> <string name="permgrouplab_costMoney" msgid="5429808217861460401">"需要額外費用的服務。"</string> @@ -255,10 +257,6 @@ <string name="permdesc_bindInputMethod" msgid="3734838321027317228">"允許擁有人連結至輸入法的最頂層介面。一般應用程式不需使用此選項。"</string> <string name="permlab_bindWallpaper" msgid="8716400279937856462">"連結至桌布"</string> <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"允許擁有人連結至桌布的最頂層介面，一般應用程式不需使用此選項。"</string> - <!-- no translation found for permlab_bindRemoteViews (5697987759897367099) --> - <skip /> - <!-- no translation found for permdesc_bindRemoteViews (2930855984822926963) --> - <skip /> <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"與裝置管理員互動"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"允許應用程式將調用請求 (intent) 傳送至裝置管理員；一般應用程式不需使用此選項。"</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"變更螢幕顯示方向"</string> @@ -289,7 +287,7 @@ <string name="permdesc_diagnostic" msgid="3121238373951637049">"允許應用程式讀寫 diag 群組的資源；例如：/dev 裡的檔案。這可能會影響系統穩定性與安全性。此功能僅供製造商或技術人員用於硬體規格偵測。"</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"啟用或停用應用程式元件"</string> <string name="permdesc_changeComponentState" product="tablet" msgid="4647419365510068321">"允許應用程式啟用或停用其他應用程式的元件。惡意應用程式可藉此停用重要的平板電腦功能。由於這個權限可能會導致應用程式元件無法使用、造成不一致或不穩定的問題，因此請謹慎斟酌授權。"</string> - <!-- outdated translation 1791075936446230356 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"允許應用程式啟用或停用其他應用程式的元件。惡意應用程式可藉此停用重要的平板電腦功能。由於這個權限可能會導致應用程式元件無法使用、造成不一致或不穩定的問題，因此請謹慎斟酌授權。"</string> + <!-- outdated translation 4647419365510068321 --> <string name="permdesc_changeComponentState" product="default" msgid="3443473726140080761">"允許應用程式啟用或停用其他應用程式的元件。惡意應用程式可藉此停用重要的平板電腦功能。由於這個權限可能會導致應用程式元件無法使用、造成不一致或不穩定的問題，因此請謹慎斟酌授權。"</string> <string name="permlab_setPreferredApplications" msgid="3393305202145172005">"設定喜好的應用程式"</string> <string name="permdesc_setPreferredApplications" msgid="760008293501937546">"允許應用程式修改您偏好的應用程式。請注意：惡意程式可能藉以秘密竄改執行的程式，或偽造已存在的程式以收集私人資料。"</string> <string name="permlab_writeSettings" msgid="1365523497395143704">"編輯全域系統設定"</string> @@ -468,8 +466,10 @@ <string name="permlab_sdcardWrite" product="default" msgid="8079403759001777291">"修改/刪除 SD 卡的內容"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6594393334785738252">"允許應用程式寫入 USB 儲存裝置。"</string> <string name="permdesc_sdcardWrite" product="default" msgid="6643963204976471878">"允許應用程式寫入 SD 卡。"</string> - <string name="permlab_mediaStorageWrite" product="default" msgid="6859839199706879015">"修改/刪除內部媒體儲存裝置內容"</string> - <string name="permdesc_mediaStorageWrite" product="default" msgid="8232008512478316233">"允許應用程式修改內部媒體儲存裝置內容。"</string> + <!-- no translation found for permlab_mediaStorageWrite (6859839199706879015) --> + <skip /> + <!-- no translation found for permdesc_mediaStorageWrite (8232008512478316233) --> + <skip /> <string name="permlab_cache_filesystem" msgid="5656487264819669824">"存取快取檔案系統"</string> <string name="permdesc_cache_filesystem" msgid="1624734528435659906">"允許應用程式讀取及寫入快取檔案系統。"</string> <string name="permlab_use_sip" msgid="5986952362795870502">"撥打/接聽網路電話"</string> @@ -490,10 +490,6 @@ <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"設定政策啟用時所要使用的裝置全域 Proxy，只有第一個裝置管理員所設定的全域 Proxy 具有效力。"</string> <string name="policylab_expirePassword" msgid="2314569545488269564">"設定密碼到期日"</string> <string name="policydesc_expirePassword" msgid="7276906351852798814">"控制螢幕鎖定密碼的使用期限"</string> - <!-- no translation found for policylab_encryptedStorage (8901326199909132915) --> - <skip /> - <!-- no translation found for policydesc_encryptedStorage (2504984732631479399) --> - <skip /> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"住家電話"</item> <item msgid="869923650527136615">"行動電話"</item> @@ -608,8 +604,6 @@ <string name="sipAddressTypeWork" msgid="6920725730797099047">"公司"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"其他"</string> <string name="keyguard_password_enter_pin_code" msgid="3731488827218876115">"輸入 PIN 碼"</string> - <!-- no translation found for keyguard_password_entry_touch_hint (7906561917570259833) --> - <skip /> <string name="keyguard_password_enter_password_code" msgid="9138158344813213754">"輸入密碼即可解鎖"</string> <string name="keyguard_password_enter_pin_password_code" msgid="638347075625491514">"輸入 PIN 進行解鎖"</string> <string name="keyguard_password_wrong_pin_code" msgid="1295984114338107718">"PIN 碼錯誤！"</string> @@ -653,8 +647,6 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"密碼"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"登入"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"使用者名稱或密碼錯誤。"</string> - <!-- no translation found for lockscreen_glogin_account_recovery_hint (8253152905532900548) --> - <skip /> <string name="lockscreen_glogin_checking_password" msgid="6758890536332363322">"檢查中..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"解除封鎖"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"開啟音效"</string> @@ -676,9 +668,11 @@ <string name="autofill_this_form" msgid="1272247532604569872">"自動填入功能"</string> <string name="setup_autofill" msgid="8154593408885654044">"設定自動填入功能"</string> <string name="autofill_address_name_separator" msgid="2504700673286691795">" "</string> - <!-- outdated translation 7531610259426153850 --> <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_name_format (3268041054899214945) --> + <skip /> <string name="autofill_address_summary_separator" msgid="7483307893170324129">"， "</string> - <!-- outdated translation 8398158823767723887 --> <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <!-- no translation found for autofill_address_summary_format (4874459455786827344) --> + <skip /> <string name="permlab_readHistoryBookmarks" msgid="1284843728203412135">"讀取瀏覽器的記錄與書籤"</string> <string name="permdesc_readHistoryBookmarks" msgid="4981489815467617191">"允許應用程式讀取瀏覽器曾經造訪過的所有網址，以及瀏覽器的所有書籤。"</string> <string name="permlab_writeHistoryBookmarks" msgid="9009434109836280374">"寫入瀏覽器的記錄與書籤"</string> @@ -911,8 +905,6 @@ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB 偵錯模式已啟用"</string> <string name="adb_active_notification_message" msgid="8470296818270110396">"選取以停用 USB 偵錯。"</string> <string name="select_input_method" msgid="6865512749462072765">"選取輸入方式"</string> - <!-- no translation found for configure_input_methods (6324843080254191535) --> - <skip /> <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> <string name="candidates_style" msgid="4333913089637062257"><u>"待選項目"</u></string> @@ -994,7 +986,8 @@ <item quantity="one" msgid="8167147081136579439">"1 個相符項目"</item> <item quantity="other" msgid="4641872797067609177">"第 <xliff:g id="INDEX">%d</xliff:g> 個相符項目 (共 <xliff:g id="TOTAL">%d</xliff:g> 個相符項目)"</item> </plurals> - <!-- outdated translation 9218298627167585235 --> <string name="action_mode_done" msgid="7217581640461922289">"完成"</string> + <!-- no translation found for action_mode_done (7217581640461922289) --> + <skip /> <string name="progress_unmounting" product="nosdcard" msgid="535863554318797377">"正在卸載 USB 儲存裝置..."</string> <string name="progress_unmounting" product="default" msgid="5556813978958789471">"正在卸載 SD 卡..."</string> <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"正在清除 USB 儲存裝置..."</string> @@ -1013,27 +1006,22 @@ <string name="websearch" msgid="4337157977400211589">"網頁搜尋"</string> <!-- no translation found for gpsNotifTicker (5622683912616496172) --> <skip /> - <!-- outdated translation 7533028619350196545 --> <string name="gpsNotifTitle" msgid="5446858717157416839">"位置資訊要求"</string> + <!-- no translation found for gpsNotifTitle (5446858717157416839) --> + <skip /> <!-- no translation found for gpsNotifMessage (1374718023224000702) --> <skip /> - <!-- outdated translation 1511016393202739483 --> <string name="gpsVerifYes" msgid="2346566072867213563">"是"</string> - <!-- outdated translation 661731239940896232 --> <string name="gpsVerifNo" msgid="1146564937346454865">"否"</string> - <!-- outdated translation 6088394702274114202 --> <string name="sync_too_many_deletes" msgid="5296321850662746890">"超過刪除上限"</string> - <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> + <!-- no translation found for gpsVerifYes (2346566072867213563) --> <skip /> - <!-- outdated translation 7782215155483034729 --> <string name="sync_really_delete" msgid="8933566316059338692">"刪除這些項目。"</string> - <!-- outdated translation 6501390120900825477 --> <string name="sync_undo_deletes" msgid="8610996708225006328">"復原刪除。"</string> - <!-- outdated translation 612038572646360281 --> <string name="sync_do_nothing" msgid="8717589462945226869">"暫停執行 。"</string> - <!-- no translation found for vpn_notification_title_connected (3197819122581348515) --> + <!-- no translation found for gpsVerifNo (1146564937346454865) --> <skip /> - <!-- no translation found for vpn_notification_title_disconnected (4614192702448522822) --> + <!-- no translation found for sync_too_many_deletes (5296321850662746890) --> <skip /> - <!-- no translation found for vpn_notification_hint_disconnected (4689796928510104200) --> + <!-- no translation found for sync_too_many_deletes_desc (7030265992955132593) --> <skip /> - <!-- no translation found for choose_account_label (4191313562041125787) --> + <!-- no translation found for sync_really_delete (8933566316059338692) --> <skip /> - <!-- no translation found for number_picker_increment_button (4830170763103463443) --> + <!-- no translation found for sync_undo_deletes (8610996708225006328) --> <skip /> - <!-- no translation found for number_picker_decrement_button (2576606679160067262) --> + <!-- no translation found for sync_do_nothing (8717589462945226869) --> <skip /> </resources> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index f9809709fa55..1c9b5876b199 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1345,6 +1345,22 @@ <enum name="KEYCODE_PROG_YELLOW" value="185" /> <enum name="KEYCODE_PROG_BLUE" value="186" /> <enum name="KEYCODE_APP_SWITCH" value="187" /> + <enum name="KEYCODE_BUTTON_1" value="188" /> + <enum name="KEYCODE_BUTTON_2" value="189" /> + <enum name="KEYCODE_BUTTON_3" value="190" /> + <enum name="KEYCODE_BUTTON_4" value="191" /> + <enum name="KEYCODE_BUTTON_5" value="192" /> + <enum name="KEYCODE_BUTTON_6" value="193" /> + <enum name="KEYCODE_BUTTON_7" value="194" /> + <enum name="KEYCODE_BUTTON_8" value="195" /> + <enum name="KEYCODE_BUTTON_9" value="196" /> + <enum name="KEYCODE_BUTTON_10" value="197" /> + <enum name="KEYCODE_BUTTON_11" value="198" /> + <enum name="KEYCODE_BUTTON_12" value="199" /> + <enum name="KEYCODE_BUTTON_13" value="200" /> + <enum name="KEYCODE_BUTTON_14" value="201" /> + <enum name="KEYCODE_BUTTON_15" value="202" /> + <enum name="KEYCODE_BUTTON_16" value="203" /> </attr> <!-- ***************************************************************** --> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index ea91c218b605..df80546688fa 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -58,10 +58,6 @@ <group gid="sdcard_rw" /> </permission> - <permission name="android.permission.ACCESS_USB" > - <group gid="usb" /> - </permission> - <permission name="android.permission.ACCESS_MTP" > <group gid="mtp" /> </permission> diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl index 1ee121e977d9..0aefc3114679 100644 --- a/data/keyboards/Generic.kl +++ b/data/keyboards/Generic.kl @@ -262,6 +262,24 @@ key 233 HEADSETHOOK # key 240 "KEY_UNKNOWN" +key 288 BUTTON_1 +key 289 BUTTON_2 +key 290 BUTTON_3 +key 291 BUTTON_4 +key 292 BUTTON_5 +key 293 BUTTON_6 +key 294 BUTTON_7 +key 295 BUTTON_8 +key 296 BUTTON_9 +key 297 BUTTON_10 +key 298 BUTTON_11 +key 299 BUTTON_12 +key 300 BUTTON_13 +key 301 BUTTON_14 +key 302 BUTTON_15 +key 303 BUTTON_16 + + key 304 BUTTON_A key 305 BUTTON_B key 306 BUTTON_C diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 10ce3471c11d..32abcc001ffd 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -467,37 +467,28 @@ <li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li> <li><a href="/guide/developing/tools/monkey.html">Monkey</a></li> - <li class="toggle-list"> - <div> - <a href="/guide/developing/tools/monkeyrunner_concepts.html"> - <span class="en">monkeyrunner</span> - </a> - </div> - <ul> - <li> - <a href="/guide/developing/tools/MonkeyDevice.html"> - <span class="en">MonkeyDevice</span> - </a> - </li> - <li> - <a href="/guide/developing/tools/MonkeyImage.html"> - <span class="en">MonkeyImage</span> - </a> - </li> - <li> - <a href="/guide/developing/tools/MonkeyRunner.html"> - <span class="en">MonkeyRunner</span> - </a> - </li> - </ul> - </li> - <li><a href="<?cs var:toroot ?>guide/developing/tools/proguard.html">ProGuard</a> -<span class="new">new!</span></li> - <li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li> - <li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li> - <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html" >zipalign</a></li> - </ul> - </li> + <li class="toggle-list"> + <div><a href="/guide/developing/tools/monkeyrunner_concepts.html"> + <span class="en">monkeyrunner</span> + </a></div> + <ul> + <li><a href="/guide/developing/tools/MonkeyDevice.html"> + <span class="en">MonkeyDevice</span> + </a></li> + <li><a href="/guide/developing/tools/MonkeyImage.html"> + <span class="en">MonkeyImage</span> + </a></li> + <li><a href="/guide/developing/tools/MonkeyRunner.html"> + <span class="en">MonkeyRunner</span> + </a></li> + </ul> + </li> + <li><a href="/guide/developing/tools/proguard.html">ProGuard</a></li> + <li><a href="/guide/developing/tools/adb.html#sqlite">sqlite3</a></li> + <li><a href="/guide/developing/tools/traceview.html">Traceview</a></li> + <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html">zipalign</a></li> + </ul> + </li> </ul> </li> diff --git a/drm/common/Android.mk b/drm/common/Android.mk index c79a91a3ec33..f1136c916615 100644 --- a/drm/common/Android.mk +++ b/drm/common/Android.mk @@ -26,7 +26,6 @@ LOCAL_SRC_FILES:= \ DrmInfoStatus.cpp \ DrmRights.cpp \ DrmSupportInfo.cpp \ - IDrmIOService.cpp \ IDrmManagerService.cpp \ IDrmServiceListener.cpp \ DrmInfoEvent.cpp \ diff --git a/drm/common/IDrmIOService.cpp b/drm/common/IDrmIOService.cpp deleted file mode 100644 index e44ca55e5631..000000000000 --- a/drm/common/IDrmIOService.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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. - */ - -#include <stdint.h> -#include <sys/types.h> -#include <binder/Parcel.h> -#include <binder/IPCThreadState.h> -#include <drm/drm_framework_common.h> -#include "IDrmIOService.h" - -using namespace android; - -void BpDrmIOService::writeToFile(const String8& filePath, const String8& dataBuffer) { - Parcel data, reply; - - data.writeInterfaceToken(IDrmIOService::getInterfaceDescriptor()); - data.writeString8(filePath); - data.writeString8(dataBuffer); - - remote()->transact(WRITE_TO_FILE, data, &reply); -} - -String8 BpDrmIOService::readFromFile(const String8& filePath) { - - Parcel data, reply; - - data.writeInterfaceToken(IDrmIOService::getInterfaceDescriptor()); - data.writeString8(filePath); - - remote()->transact(READ_FROM_FILE, data, &reply); - return reply.readString8(); -} - -IMPLEMENT_META_INTERFACE(DrmIOService, "drm.IDrmIOService"); - -status_t BnDrmIOService::onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { - - switch (code) { - case WRITE_TO_FILE: - { - CHECK_INTERFACE(IDrmIOService, data, reply); - - writeToFile(data.readString8(), data.readString8()); - return DRM_NO_ERROR; - } - - case READ_FROM_FILE: - { - CHECK_INTERFACE(IDrmIOService, data, reply); - - String8 dataBuffer = readFromFile(data.readString8()); - reply->writeString8(dataBuffer); - return DRM_NO_ERROR; - } - - default: - return BBinder::onTransact(code, data, reply, flags); - } -} - diff --git a/drm/drmioserver/Android.mk b/drm/drmioserver/Android.mk deleted file mode 100644 index 11571c7904bc..000000000000 --- a/drm/drmioserver/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -# -# 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. -# -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_drmioserver.cpp \ - DrmIOService.cpp - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libbinder - -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -ldl -else - LOCAL_SHARED_LIBRARIES += libdl -endif - -LOCAL_STATIC_LIBRARIES := libdrmframeworkcommon - -LOCAL_C_INCLUDES := \ - $(TOP)/frameworks/base/drm/libdrmframework/include \ - $(TOP)/frameworks/base/include - -LOCAL_MODULE:= drmioserver - -LOCAL_MODULE_TAGS := optional - -include $(BUILD_EXECUTABLE) diff --git a/drm/drmioserver/DrmIOService.cpp b/drm/drmioserver/DrmIOService.cpp deleted file mode 100644 index 60e6e70daacf..000000000000 --- a/drm/drmioserver/DrmIOService.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - */ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "DrmIOService" -#include <utils/Log.h> - -#include <binder/IServiceManager.h> -#include "DrmIOService.h" -#include "ReadWriteUtils.h" - -using namespace android; - -void DrmIOService::instantiate() { - LOGV("instantiate"); - defaultServiceManager()->addService(String16("drm.drmIOService"), new DrmIOService()); -} - -DrmIOService::DrmIOService() { - LOGV("created"); -} - -DrmIOService::~DrmIOService() { - LOGV("Destroyed"); -} - -void DrmIOService::writeToFile(const String8& filePath, const String8& dataBuffer) { - LOGV("Entering writeToFile"); - ReadWriteUtils::writeToFile(filePath, dataBuffer); -} - -String8 DrmIOService::readFromFile(const String8& filePath) { - LOGV("Entering readFromFile"); - return ReadWriteUtils::readBytes(filePath); -} - diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index b6e0c30fd65e..ef7d274cc12b 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -87,7 +87,7 @@ void DrmManager::removeUniqueId(int uniqueId) { } status_t DrmManager::loadPlugIns() { - String8 pluginDirPath("/system/lib/drm/plugins/native"); + String8 pluginDirPath("/system/lib/drm"); return loadPlugIns(pluginDirPath); } diff --git a/drm/libdrmframework/include/IDrmIOService.h b/drm/libdrmframework/include/IDrmIOService.h deleted file mode 100644 index 5e0d907e6794..000000000000 --- a/drm/libdrmframework/include/IDrmIOService.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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. - */ - -#ifndef __IDRM_IO_SERVICE_H__ -#define __IDRM_IO_SERVICE_H__ - -#include <utils/RefBase.h> -#include <binder/IInterface.h> -#include <binder/Parcel.h> - -namespace android { - -/** - * This is the interface class for DRM IO service. - * - */ -class IDrmIOService : public IInterface -{ -public: - enum { - WRITE_TO_FILE = IBinder::FIRST_CALL_TRANSACTION, - READ_FROM_FILE - }; - -public: - DECLARE_META_INTERFACE(DrmIOService); - -public: - /** - * Writes the data into the file path provided - * - * @param[in] filePath Path of the file - * @param[in] dataBuffer Data to write - */ - virtual void writeToFile(const String8& filePath, const String8& dataBuffer) = 0; - - /** - * Reads the data from the file path provided - * - * @param[in] filePath Path of the file - * @return Data read from the file - */ - virtual String8 readFromFile(const String8& filePath) = 0; -}; - -/** - * This is the Binder implementation class for DRM IO service. - */ -class BpDrmIOService: public BpInterface<IDrmIOService> -{ -public: - BpDrmIOService(const sp<IBinder>& impl) - : BpInterface<IDrmIOService>(impl) {} - - virtual void writeToFile(const String8& filePath, const String8& dataBuffer); - - virtual String8 readFromFile(const String8& filePath); -}; - -/** - * This is the Binder implementation class for DRM IO service. - */ -class BnDrmIOService: public BnInterface<IDrmIOService> -{ -public: - virtual status_t onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags = 0); -}; - -}; - -#endif /* __IDRM_IO_SERVICE_H__ */ - diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk index d4a6f18dbbe1..af67aa3b50dd 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk @@ -60,7 +60,7 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/include \ external/openssl/include -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm/plugins/native +LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/drm LOCAL_MODULE_TAGS := optional diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/surfaceflinger/ISurfaceComposer.h index 56ed3a4cf84c..361e7dc28d28 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/surfaceflinger/ISurfaceComposer.h @@ -44,6 +44,8 @@ public: eSecure = 0x00000080, eNonPremultiplied = 0x00000100, eOpaque = 0x00000400, + eProtectedByApp = 0x00000800, + eProtectedByDRM = 0x00001000, eFXSurfaceNormal = 0x00000000, eFXSurfaceBlur = 0x00010000, diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index 8b256f426590..02d6f8ffd20e 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -54,9 +54,11 @@ public: USAGE_SW_WRITE_RARELY = GRALLOC_USAGE_SW_WRITE_RARELY, USAGE_SW_WRITE_OFTEN = GRALLOC_USAGE_SW_WRITE_OFTEN, USAGE_SW_WRITE_MASK = GRALLOC_USAGE_SW_WRITE_MASK, - + USAGE_SOFTWARE_MASK = USAGE_SW_READ_MASK|USAGE_SW_WRITE_MASK, - + + USAGE_PROTECTED = GRALLOC_USAGE_PROTECTED, + USAGE_HW_TEXTURE = GRALLOC_USAGE_HW_TEXTURE, USAGE_HW_RENDER = GRALLOC_USAGE_HW_RENDER, USAGE_HW_2D = GRALLOC_USAGE_HW_2D, diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h index 9b1a8975e457..dbccf29b110e 100755 --- a/include/ui/KeycodeLabels.h +++ b/include/ui/KeycodeLabels.h @@ -212,6 +212,22 @@ static const KeycodeLabel KEYCODES[] = { { "PROG_YELLOW", 185 }, { "PROG_BLUE", 186 }, { "APP_SWITCH", 187 }, + { "BUTTON_1", 188 }, + { "BUTTON_2", 189 }, + { "BUTTON_3", 190 }, + { "BUTTON_4", 191 }, + { "BUTTON_5", 192 }, + { "BUTTON_6", 193 }, + { "BUTTON_7", 194 }, + { "BUTTON_8", 195 }, + { "BUTTON_9", 196 }, + { "BUTTON_10", 197 }, + { "BUTTON_11", 198 }, + { "BUTTON_12", 199 }, + { "BUTTON_13", 200 }, + { "BUTTON_14", 201 }, + { "BUTTON_15", 202 }, + { "BUTTON_16", 203 }, // NOTE: If you add a new keycode here you must also add it to several other files. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk index 38358525c61a..2d0b6c4e2f1e 100644 --- a/libs/rs/Android.mk +++ b/libs/rs/Android.mk @@ -130,6 +130,28 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) +# Now build a host version for serialization +include $(CLEAR_VARS) +LOCAL_CFLAGS += -DANDROID_RS_BUILD_FOR_HOST + +LOCAL_SRC_FILES:= \ + rsAllocation.cpp \ + rsComponent.cpp \ + rsElement.cpp \ + rsFileA3D.cpp \ + rsObjectBase.cpp \ + rsMesh.cpp \ + rsStream.cpp \ + rsType.cpp + +LOCAL_STATIC_LIBRARIES := libcutils libutils + +LOCAL_LDLIBS := -lpthread +LOCAL_MODULE:= libRSserialize +LOCAL_MODULE_TAGS := optional + +include $(BUILD_HOST_STATIC_LIBRARY) + # include the java examples include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\ java \ diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h index f160ef1a7b40..882a0b0777bb 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/RenderScript.h @@ -365,6 +365,9 @@ RsAllocation rsaAllocationCreateFromBitmap(RsContext con, RsType vtype, RsAllocation rsaAllocationCubeCreateFromBitmap(RsContext con, RsType vtype, RsAllocationMipmapControl mips, const void *data, uint32_t usages); +#ifdef ANDROID_RS_BUILD_FOR_HOST +#define NO_RS_FUNCS +#endif #ifndef NO_RS_FUNCS #include "rsgApiFuncDecl.h" diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index c598f0395362..2839b76cdeb2 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -21,12 +21,7 @@ #include <GLES/glext.h> #else #include "rsContextHostStub.h" - -#include <OpenGL/gl.h> -#include <OpenGl/glext.h> -#endif - -#include "utils/StopWatch.h" +#endif //ANDROID_RS_BUILD_FOR_HOST static void rsaAllocationGenerateScriptMips(RsContext con, RsAllocation va); @@ -83,7 +78,7 @@ Allocation::~Allocation() { mPtr = NULL; } freeScriptMemory(); - +#ifndef ANDROID_RS_BUILD_FOR_HOST if (mBufferID) { // Causes a SW crash.... //LOGV(" mBufferID %i", mBufferID); @@ -94,6 +89,7 @@ Allocation::~Allocation() { glDeleteTextures(1, &mTextureID); mTextureID = 0; } +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::setCpuWritable(bool) { @@ -118,6 +114,7 @@ void Allocation::deferedUploadToTexture(const Context *rsc) { } uint32_t Allocation::getGLTarget() const { +#ifndef ANDROID_RS_BUILD_FOR_HOST if (getIsTexture()) { if (mType->getDimFaces()) { return GL_TEXTURE_CUBE_MAP; @@ -128,6 +125,7 @@ uint32_t Allocation::getGLTarget() const { if (getIsBufferObject()) { return GL_ARRAY_BUFFER; } +#endif //ANDROID_RS_BUILD_FOR_HOST return 0; } @@ -158,7 +156,7 @@ void Allocation::syncAll(Context *rsc, RsAllocationUsageType src) { } void Allocation::uploadToTexture(const Context *rsc) { - +#ifndef ANDROID_RS_BUILD_FOR_HOST mUsageFlags |= RS_ALLOCATION_USAGE_GRAPHICS_TEXTURE; GLenum type = mType->getElement()->getComponent().getGLType(); GLenum format = mType->getElement()->getComponent().getGLFormat(); @@ -195,8 +193,10 @@ void Allocation::uploadToTexture(const Context *rsc) { } rsc->checkError("Allocation::uploadToTexture"); +#endif //ANDROID_RS_BUILD_FOR_HOST } +#ifndef ANDROID_RS_BUILD_FOR_HOST const static GLenum gFaceOrder[] = { GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X, @@ -205,10 +205,12 @@ const static GLenum gFaceOrder[] = { GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z }; +#endif //ANDROID_RS_BUILD_FOR_HOST void Allocation::update2DTexture(const void *ptr, uint32_t xoff, uint32_t yoff, uint32_t lod, RsAllocationCubemapFace face, uint32_t w, uint32_t h) { +#ifndef ANDROID_RS_BUILD_FOR_HOST GLenum type = mType->getElement()->getComponent().getGLType(); GLenum format = mType->getElement()->getComponent().getGLFormat(); GLenum target = (GLenum)getGLTarget(); @@ -220,9 +222,11 @@ void Allocation::update2DTexture(const void *ptr, uint32_t xoff, uint32_t yoff, t = gFaceOrder[face]; } glTexSubImage2D(t, lod, xoff, yoff, w, h, format, type, ptr); +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::upload2DTexture(bool isFirstUpload) { +#ifndef ANDROID_RS_BUILD_FOR_HOST GLenum type = mType->getElement()->getComponent().getGLType(); GLenum format = mType->getElement()->getComponent().getGLFormat(); @@ -258,10 +262,9 @@ void Allocation::upload2DTexture(bool isFirstUpload) { } if (mMipmapControl == RS_ALLOCATION_MIPMAP_ON_SYNC_TO_TEXTURE) { -#ifndef ANDROID_RS_BUILD_FOR_HOST glGenerateMipmap(target); -#endif //ANDROID_RS_BUILD_FOR_HOST } +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::deferedUploadToBufferObject(const Context *rsc) { @@ -270,6 +273,7 @@ void Allocation::deferedUploadToBufferObject(const Context *rsc) { } void Allocation::uploadToBufferObject(const Context *rsc) { +#ifndef ANDROID_RS_BUILD_FOR_HOST rsAssert(!mType->getDimY()); rsAssert(!mType->getDimZ()); @@ -288,6 +292,7 @@ void Allocation::uploadToBufferObject(const Context *rsc) { glBufferData(target, mType->getSizeBytes(), getPtr(), GL_DYNAMIC_DRAW); glBindBuffer(target, 0); rsc->checkError("Allocation::uploadToBufferObject"); +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::uploadCheck(Context *rsc) { @@ -386,7 +391,7 @@ void Allocation::elementData(Context *rsc, uint32_t x, const void *data, ptr += mType->getElement()->getFieldOffsetBytes(cIdx); if (sizeBytes != e->getSizeBytes()) { - LOGE("Error Allocation::subElementData data size %i does not match field size %i.", sizeBytes, e->getSizeBytes()); + LOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes()); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size."); return; } @@ -429,7 +434,7 @@ void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y, ptr += mType->getElement()->getFieldOffsetBytes(cIdx); if (sizeBytes != e->getSizeBytes()) { - LOGE("Error Allocation::subElementData data size %i does not match field size %i.", sizeBytes, e->getSizeBytes()); + LOGE("Error Allocation::subElementData data size %i does not match field size %zu.", sizeBytes, e->getSizeBytes()); rsc->setError(RS_ERROR_BAD_VALUE, "subElementData bad size."); return; } @@ -445,10 +450,13 @@ void Allocation::elementData(Context *rsc, uint32_t x, uint32_t y, } void Allocation::addProgramToDirty(const Program *p) { +#ifndef ANDROID_RS_BUILD_FOR_HOST mToDirtyList.push(p); +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::removeProgramToDirty(const Program *p) { +#ifndef ANDROID_RS_BUILD_FOR_HOST for (size_t ct=0; ct < mToDirtyList.size(); ct++) { if (mToDirtyList[ct] == p) { mToDirtyList.removeAt(ct); @@ -456,6 +464,7 @@ void Allocation::removeProgramToDirty(const Program *p) { } } rsAssert(0); +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::dumpLOGV(const char *prefix) const { @@ -530,9 +539,11 @@ Allocation *Allocation::createFromStream(Context *rsc, IStream *stream) { } void Allocation::sendDirty() const { +#ifndef ANDROID_RS_BUILD_FOR_HOST for (size_t ct=0; ct < mToDirtyList.size(); ct++) { mToDirtyList[ct]->forceDirty(); } +#endif //ANDROID_RS_BUILD_FOR_HOST } void Allocation::incRefs(const void *ptr, size_t ct, size_t startOff) const { @@ -591,7 +602,7 @@ void Allocation::resize2D(Context *rsc, uint32_t dimX, uint32_t dimY) { ///////////////// // - +#ifndef ANDROID_RS_BUILD_FOR_HOST namespace android { namespace renderscript { @@ -674,8 +685,6 @@ static void mip(const Adapter2D &out, const Adapter2D &in) { } } -#ifndef ANDROID_RS_BUILD_FOR_HOST - void rsi_AllocationSyncAll(Context *rsc, RsAllocation va, RsAllocationUsageType src) { Allocation *a = static_cast<Allocation *>(va); a->syncAll(rsc, src); @@ -739,8 +748,6 @@ void rsi_AllocationResize2D(Context *rsc, RsAllocation va, uint32_t dimX, uint32 a->resize2D(rsc, dimX, dimY); } -#endif //ANDROID_RS_BUILD_FOR_HOST - } } @@ -840,3 +847,5 @@ RsAllocation rsaAllocationCubeCreateFromBitmap(RsContext con, RsType vtype, texAlloc->deferedUploadToTexture(rsc); return texAlloc; } + +#endif //ANDROID_RS_BUILD_FOR_HOST diff --git a/libs/rs/rsComponent.cpp b/libs/rs/rsComponent.cpp index 81ade5d4f60f..cb3caf805c5a 100644 --- a/libs/rs/rsComponent.cpp +++ b/libs/rs/rsComponent.cpp @@ -18,8 +18,6 @@ #ifndef ANDROID_RS_BUILD_FOR_HOST #include <GLES/gl.h> -#else -#include <OpenGL/gl.h> #endif using namespace android; @@ -183,6 +181,7 @@ bool Component::isReference() const { } uint32_t Component::getGLType() const { +#ifndef ANDROID_RS_BUILD_FOR_HOST switch (mType) { case RS_TYPE_UNSIGNED_5_6_5: return GL_UNSIGNED_SHORT_5_6_5; case RS_TYPE_UNSIGNED_5_5_5_1: return GL_UNSIGNED_SHORT_5_5_5_1; @@ -196,11 +195,12 @@ uint32_t Component::getGLType() const { case RS_TYPE_SIGNED_16: return GL_SHORT; default: break; } - +#endif //ANDROID_RS_BUILD_FOR_HOST return 0; } uint32_t Component::getGLFormat() const { +#ifndef ANDROID_RS_BUILD_FOR_HOST switch (mKind) { case RS_KIND_PIXEL_L: return GL_LUMINANCE; case RS_KIND_PIXEL_A: return GL_ALPHA; @@ -209,6 +209,7 @@ uint32_t Component::getGLFormat() const { case RS_KIND_PIXEL_RGBA: return GL_RGBA; default: break; } +#endif //ANDROID_RS_BUILD_FOR_HOST return 0; } diff --git a/libs/rs/rsContextHostStub.h b/libs/rs/rsContextHostStub.h index 8cfb38bd5b18..7e8ec3972696 100644 --- a/libs/rs/rsContextHostStub.h +++ b/libs/rs/rsContextHostStub.h @@ -18,34 +18,18 @@ #define ANDROID_RS_CONTEXT_HOST_STUB_H #include "rsUtils.h" -//#include "rsMutex.h" - -//#include "rsThreadIO.h" #include "rsType.h" -#include "rsMatrix.h" #include "rsAllocation.h" #include "rsMesh.h" -//#include "rsDevice.h" -#include "rsScriptC.h" #include "rsAllocation.h" -#include "rsAdapter.h" -#include "rsSampler.h" -#include "rsProgramFragment.h" -#include "rsProgramStore.h" -#include "rsProgramRaster.h" -#include "rsProgramVertex.h" -#include "rsShaderCache.h" -#include "rsVertexArray.h" - -//#include "rsgApiStructs.h" -//#include "rsLocklessFifo.h" - -//#include <ui/egl/android_natives.h> // --------------------------------------------------------------------------- namespace android { namespace renderscript { +#define CHECK_OBJ(o) +#define CHECK_OBJ_OR_NULL(o) + class Device; class Context { @@ -56,36 +40,13 @@ public: ~Context() { } - //StructuredAllocationContext mStateAllocation; ElementState mStateElement; TypeState mStateType; - SamplerState mStateSampler; - //ProgramFragmentState mStateFragment; - ProgramStoreState mStateFragmentStore; - //ProgramRasterState mStateRaster; - //ProgramVertexState mStateVertex; - VertexArrayState mStateVertexArray; - - //ScriptCState mScriptC; - ShaderCache mShaderCache; - RsSurfaceConfig mUserSurfaceConfig; //bool setupCheck(); - ProgramFragment * getDefaultProgramFragment() const { - return NULL; - } - ProgramVertex * getDefaultProgramVertex() const { - return NULL; - } - ProgramStore * getDefaultProgramStore() const { - return NULL; - } - ProgramRaster * getDefaultProgramRaster() const { - return NULL; - } uint32_t getWidth() const {return 0;} uint32_t getHeight() const {return 0;} @@ -99,6 +60,8 @@ public: _RS_TIMER_TOTAL }; + void timerSet(Timers) { } + bool checkVersion1_1() const {return false; } bool checkVersion2_0() const {return false; } @@ -157,3 +120,4 @@ protected: } } #endif + diff --git a/libs/rs/rsElement.cpp b/libs/rs/rsElement.cpp index 6ae8bb8f640e..7c3b9e8dc42d 100644 --- a/libs/rs/rsElement.cpp +++ b/libs/rs/rsElement.cpp @@ -17,10 +17,8 @@ #ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" -#include <GLES/gl.h> #else #include "rsContextHostStub.h" -#include <OpenGL/gl.h> #endif using namespace android; @@ -65,7 +63,7 @@ size_t Element::getSizeBits() const { void Element::dumpLOGV(const char *prefix) const { ObjectBase::dumpLOGV(prefix); - LOGV("%s Element: fieldCount: %i, size bytes: %i", prefix, mFieldCount, getSizeBytes()); + LOGV("%s Element: fieldCount: %zu, size bytes: %zu", prefix, mFieldCount, getSizeBytes()); for (uint32_t ct = 0; ct < mFieldCount; ct++) { LOGV("%s Element field index: %u ------------------", prefix, ct); LOGV("%s name: %s, offsetBits: %u, arraySize: %u", diff --git a/libs/rs/rsFileA3D.cpp b/libs/rs/rsFileA3D.cpp index d34ddd68b77e..97ce8c8affa4 100644 --- a/libs/rs/rsFileA3D.cpp +++ b/libs/rs/rsFileA3D.cpp @@ -249,31 +249,31 @@ ObjectBase *FileA3D::initializeFromEntry(size_t index) { entry->mRsObj = Allocation::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_PROGRAM_VERTEX: - entry->mRsObj = ProgramVertex::createFromStream(mRSC, mReadStream); + //entry->mRsObj = ProgramVertex::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_PROGRAM_RASTER: - entry->mRsObj = ProgramRaster::createFromStream(mRSC, mReadStream); + //entry->mRsObj = ProgramRaster::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_PROGRAM_FRAGMENT: - entry->mRsObj = ProgramFragment::createFromStream(mRSC, mReadStream); + //entry->mRsObj = ProgramFragment::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_PROGRAM_STORE: - entry->mRsObj = ProgramStore::createFromStream(mRSC, mReadStream); + //entry->mRsObj = ProgramStore::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_SAMPLER: - entry->mRsObj = Sampler::createFromStream(mRSC, mReadStream); + //entry->mRsObj = Sampler::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_ANIMATION: - entry->mRsObj = Animation::createFromStream(mRSC, mReadStream); + //entry->mRsObj = Animation::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_ADAPTER_1D: - entry->mRsObj = Adapter1D::createFromStream(mRSC, mReadStream); + //entry->mRsObj = Adapter1D::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_ADAPTER_2D: - entry->mRsObj = Adapter2D::createFromStream(mRSC, mReadStream); + //entry->mRsObj = Adapter2D::createFromStream(mRSC, mReadStream); break; case RS_A3D_CLASS_ID_SCRIPT_C: - return NULL; + break; } if (entry->mRsObj) { entry->mRsObj->incUserRef(); diff --git a/libs/rs/rsMesh.cpp b/libs/rs/rsMesh.cpp index baf4c5319074..8cf76e5f64a1 100644 --- a/libs/rs/rsMesh.cpp +++ b/libs/rs/rsMesh.cpp @@ -22,9 +22,6 @@ #include <GLES/glext.h> #else #include "rsContextHostStub.h" - -#include <OpenGL/gl.h> -#include <OpenGl/glext.h> #endif using namespace android; @@ -35,10 +32,13 @@ Mesh::Mesh(Context *rsc) : ObjectBase(rsc) { mPrimitivesCount = 0; mVertexBuffers = NULL; mVertexBufferCount = 0; + +#ifndef ANDROID_RS_BUILD_FOR_HOST mAttribs = NULL; mAttribAllocationIndex = NULL; mAttribCount = 0; +#endif } Mesh::~Mesh() { @@ -53,12 +53,97 @@ Mesh::~Mesh() { delete[] mPrimitives; } +#ifndef ANDROID_RS_BUILD_FOR_HOST if (mAttribs) { delete[] mAttribs; delete[] mAttribAllocationIndex; } +#endif +} + +void Mesh::serialize(OStream *stream) const { + // Need to identify ourselves + stream->addU32((uint32_t)getClassId()); + + String8 name(getName()); + stream->addString(&name); + + // Store number of vertex streams + stream->addU32(mVertexBufferCount); + for (uint32_t vCount = 0; vCount < mVertexBufferCount; vCount ++) { + mVertexBuffers[vCount]->serialize(stream); + } + + stream->addU32(mPrimitivesCount); + // Store the primitives + for (uint32_t pCount = 0; pCount < mPrimitivesCount; pCount ++) { + Primitive_t * prim = mPrimitives[pCount]; + + stream->addU8((uint8_t)prim->mPrimitive); + + if (prim->mIndexBuffer.get()) { + stream->addU32(1); + prim->mIndexBuffer->serialize(stream); + } else { + stream->addU32(0); + } + } +} + +Mesh *Mesh::createFromStream(Context *rsc, IStream *stream) { + // First make sure we are reading the correct object + RsA3DClassID classID = (RsA3DClassID)stream->loadU32(); + if (classID != RS_A3D_CLASS_ID_MESH) { + LOGE("mesh loading skipped due to invalid class id"); + return NULL; + } + + Mesh * mesh = new Mesh(rsc); + + String8 name; + stream->loadString(&name); + mesh->setName(name.string(), name.size()); + + mesh->mVertexBufferCount = stream->loadU32(); + if (mesh->mVertexBufferCount) { + mesh->mVertexBuffers = new ObjectBaseRef<Allocation>[mesh->mVertexBufferCount]; + + for (uint32_t vCount = 0; vCount < mesh->mVertexBufferCount; vCount ++) { + Allocation *vertexAlloc = Allocation::createFromStream(rsc, stream); + mesh->mVertexBuffers[vCount].set(vertexAlloc); + } + } + + mesh->mPrimitivesCount = stream->loadU32(); + if (mesh->mPrimitivesCount) { + mesh->mPrimitives = new Primitive_t *[mesh->mPrimitivesCount]; + + // load all primitives + for (uint32_t pCount = 0; pCount < mesh->mPrimitivesCount; pCount ++) { + Primitive_t * prim = new Primitive_t; + mesh->mPrimitives[pCount] = prim; + + prim->mPrimitive = (RsPrimitive)stream->loadU8(); + + // Check to see if the index buffer was stored + uint32_t isIndexPresent = stream->loadU32(); + if (isIndexPresent) { + Allocation *indexAlloc = Allocation::createFromStream(rsc, stream); + prim->mIndexBuffer.set(indexAlloc); + } + } + } + +#ifndef ANDROID_RS_BUILD_FOR_HOST + mesh->updateGLPrimitives(); + mesh->initVertexAttribs(); + mesh->uploadAll(rsc); +#endif + return mesh; } +#ifndef ANDROID_RS_BUILD_FOR_HOST + bool Mesh::isValidGLComponent(const Element *elem, uint32_t fieldIdx) { // Do not create attribs for padding if (elem->getFieldName(fieldIdx)[0] == '#') { @@ -224,86 +309,6 @@ void Mesh::updateGLPrimitives() { } } -void Mesh::serialize(OStream *stream) const { - // Need to identify ourselves - stream->addU32((uint32_t)getClassId()); - - String8 name(getName()); - stream->addString(&name); - - // Store number of vertex streams - stream->addU32(mVertexBufferCount); - for (uint32_t vCount = 0; vCount < mVertexBufferCount; vCount ++) { - mVertexBuffers[vCount]->serialize(stream); - } - - stream->addU32(mPrimitivesCount); - // Store the primitives - for (uint32_t pCount = 0; pCount < mPrimitivesCount; pCount ++) { - Primitive_t * prim = mPrimitives[pCount]; - - stream->addU8((uint8_t)prim->mPrimitive); - - if (prim->mIndexBuffer.get()) { - stream->addU32(1); - prim->mIndexBuffer->serialize(stream); - } else { - stream->addU32(0); - } - } -} - -Mesh *Mesh::createFromStream(Context *rsc, IStream *stream) { - // First make sure we are reading the correct object - RsA3DClassID classID = (RsA3DClassID)stream->loadU32(); - if (classID != RS_A3D_CLASS_ID_MESH) { - LOGE("mesh loading skipped due to invalid class id"); - return NULL; - } - - Mesh * mesh = new Mesh(rsc); - - String8 name; - stream->loadString(&name); - mesh->setName(name.string(), name.size()); - - mesh->mVertexBufferCount = stream->loadU32(); - if (mesh->mVertexBufferCount) { - mesh->mVertexBuffers = new ObjectBaseRef<Allocation>[mesh->mVertexBufferCount]; - - for (uint32_t vCount = 0; vCount < mesh->mVertexBufferCount; vCount ++) { - Allocation *vertexAlloc = Allocation::createFromStream(rsc, stream); - mesh->mVertexBuffers[vCount].set(vertexAlloc); - } - } - - mesh->mPrimitivesCount = stream->loadU32(); - if (mesh->mPrimitivesCount) { - mesh->mPrimitives = new Primitive_t *[mesh->mPrimitivesCount]; - - // load all primitives - for (uint32_t pCount = 0; pCount < mesh->mPrimitivesCount; pCount ++) { - Primitive_t * prim = new Primitive_t; - mesh->mPrimitives[pCount] = prim; - - prim->mPrimitive = (RsPrimitive)stream->loadU8(); - - // Check to see if the index buffer was stored - uint32_t isIndexPresent = stream->loadU32(); - if (isIndexPresent) { - Allocation *indexAlloc = Allocation::createFromStream(rsc, stream); - prim->mIndexBuffer.set(indexAlloc); - } - } - } - - mesh->updateGLPrimitives(); - mesh->initVertexAttribs(); - mesh->uploadAll(rsc); - - return mesh; -} - void Mesh::computeBBox() { float *posPtr = NULL; uint32_t vectorSize = 0; @@ -347,13 +352,6 @@ void Mesh::computeBBox() { } } - -MeshContext::MeshContext() { -} - -MeshContext::~MeshContext() { -} - namespace android { namespace renderscript { @@ -428,3 +426,5 @@ void rsaMeshGetIndices(RsContext con, RsMesh mv, RsAllocation *va, uint32_t *pri } } } + +#endif diff --git a/libs/rs/rsMesh.h b/libs/rs/rsMesh.h index 410b70bc5632..e44f90d226e6 100644 --- a/libs/rs/rsMesh.h +++ b/libs/rs/rsMesh.h @@ -50,15 +50,18 @@ public: Primitive_t ** mPrimitives; uint32_t mPrimitivesCount; + virtual void serialize(OStream *stream) const; + virtual RsA3DClassID getClassId() const { return RS_A3D_CLASS_ID_MESH; } + static Mesh *createFromStream(Context *rsc, IStream *stream); + +#ifndef ANDROID_RS_BUILD_FOR_HOST void render(Context *) const; void renderPrimitive(Context *, uint32_t primIndex) const; void renderPrimitiveRange(Context *, uint32_t primIndex, uint32_t start, uint32_t len) const; void uploadAll(Context *); void updateGLPrimitives(); - virtual void serialize(OStream *stream) const; - virtual RsA3DClassID getClassId() const { return RS_A3D_CLASS_ID_MESH; } - static Mesh *createFromStream(Context *rsc, IStream *stream); + // Bounding volumes float mBBoxMin[3]; @@ -76,12 +79,15 @@ protected: // buffer, it lets us properly map it uint32_t *mAttribAllocationIndex; uint32_t mAttribCount; +#endif }; class MeshContext { public: - MeshContext(); - ~MeshContext(); + MeshContext() { + } + ~MeshContext() { + } }; } diff --git a/libs/rs/rsType.cpp b/libs/rs/rsType.cpp index d7b5f1204361..b94c2f8eaf44 100644 --- a/libs/rs/rsType.cpp +++ b/libs/rs/rsType.cpp @@ -16,10 +16,8 @@ #ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" -#include <GLES/gl.h> #else #include "rsContextHostStub.h" -#include <OpenGL/gl.h> #endif using namespace android; @@ -146,7 +144,7 @@ uint32_t Type::getLODFaceOffset(uint32_t lod, RsAllocationCubemapFace face, uint void Type::dumpLOGV(const char *prefix) const { char buf[1024]; ObjectBase::dumpLOGV(prefix); - LOGV("%s Type: x=%i y=%i z=%i mip=%i face=%i", prefix, mDimX, mDimY, mDimZ, mDimLOD, mFaces); + LOGV("%s Type: x=%zu y=%zu z=%zu mip=%i face=%i", prefix, mDimX, mDimY, mDimZ, mDimLOD, mFaces); snprintf(buf, sizeof(buf), "%s element: ", prefix); mElement->dumpLOGV(buf); } diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh index 464e1d9aba5e..4768bbed1f14 100644 --- a/libs/rs/scriptc/rs_core.rsh +++ b/libs/rs/scriptc/rs_core.rsh @@ -295,6 +295,256 @@ extern void __attribute__((overloadable)) rsMatrixTranspose(rs_matrix3x3 *m); extern void __attribute__((overloadable)) rsMatrixTranspose(rs_matrix2x2 *m); ///////////////////////////////////////////////////// +// quaternion ops +///////////////////////////////////////////////////// + +static void __attribute__((overloadable)) +rsQuaternionSet(rs_quaternion *q, float w, float x, float y, float z) { + q->w = w; + q->x = x; + q->y = y; + q->z = z; +} + +static void __attribute__((overloadable)) +rsQuaternionSet(rs_quaternion *q, const rs_quaternion *rhs) { + q->w = rhs->w; + q->x = rhs->x; + q->y = rhs->y; + q->z = rhs->z; +} + +static void __attribute__((overloadable)) +rsQuaternionMultiply(rs_quaternion *q, float s) { + q->w *= s; + q->x *= s; + q->y *= s; + q->z *= s; +} + +static void __attribute__((overloadable)) +rsQuaternionMultiply(rs_quaternion *q, const rs_quaternion *rhs) { + q->w = -q->x*rhs->x - q->y*rhs->y - q->z*rhs->z + q->w*rhs->w; + q->x = q->x*rhs->w + q->y*rhs->z - q->z*rhs->y + q->w*rhs->x; + q->y = -q->x*rhs->z + q->y*rhs->w + q->z*rhs->x + q->w*rhs->y; + q->z = q->x*rhs->y - q->y*rhs->x + q->z*rhs->w + q->w*rhs->z; +} + +static void +rsQuaternionAdd(rs_quaternion *q, const rs_quaternion *rhs) { + q->w *= rhs->w; + q->x *= rhs->x; + q->y *= rhs->y; + q->z *= rhs->z; +} + +static void +rsQuaternionLoadRotateUnit(rs_quaternion *q, float rot, float x, float y, float z) { + rot *= (float)(M_PI / 180.0f) * 0.5f; + float c = cos(rot); + float s = sin(rot); + + q->w = c; + q->x = x * s; + q->y = y * s; + q->z = z * s; +} + +static void +rsQuaternionLoadRotate(rs_quaternion *q, float rot, float x, float y, float z) { + const float len = x*x + y*y + z*z; + if (len != 1) { + const float recipLen = 1.f / sqrt(len); + x *= recipLen; + y *= recipLen; + z *= recipLen; + } + rsQuaternionLoadRotateUnit(q, rot, x, y, z); +} + +static void +rsQuaternionConjugate(rs_quaternion *q) { + q->x = -q->x; + q->y = -q->y; + q->z = -q->z; +} + +static float +rsQuaternionDot(const rs_quaternion *q0, const rs_quaternion *q1) { + return q0->w*q1->w + q0->x*q1->x + q0->y*q1->y + q0->z*q1->z; +} + +static void +rsQuaternionNormalize(rs_quaternion *q) { + const float len = rsQuaternionDot(q, q); + if (len != 1) { + const float recipLen = 1.f / sqrt(len); + rsQuaternionMultiply(q, recipLen); + } +} + +static void +rsQuaternionSlerp(rs_quaternion *q, const rs_quaternion *q0, const rs_quaternion *q1, float t) { + if (t <= 0.0f) { + rsQuaternionSet(q, q0); + return; + } + if (t >= 1.0f) { + rsQuaternionSet(q, q1); + return; + } + + rs_quaternion tempq0, tempq1; + rsQuaternionSet(&tempq0, q0); + rsQuaternionSet(&tempq1, q1); + + float angle = rsQuaternionDot(q0, q1); + if (angle < 0) { + rsQuaternionMultiply(&tempq0, -1.0f); + angle *= -1.0f; + } + + float scale, invScale; + if (angle + 1.0f > 0.05f) { + if (1.0f - angle >= 0.05f) { + float theta = acos(angle); + float invSinTheta = 1.0f / sin(theta); + scale = sin(theta * (1.0f - t)) * invSinTheta; + invScale = sin(theta * t) * invSinTheta; + } else { + scale = 1.0f - t; + invScale = t; + } + } else { + rsQuaternionSet(&tempq1, tempq0.z, -tempq0.y, tempq0.x, -tempq0.w); + scale = sin(M_PI * (0.5f - t)); + invScale = sin(M_PI * t); + } + + rsQuaternionSet(q, tempq0.w*scale + tempq1.w*invScale, tempq0.x*scale + tempq1.x*invScale, + tempq0.y*scale + tempq1.y*invScale, tempq0.z*scale + tempq1.z*invScale); +} + +static void rsQuaternionGetMatrixUnit(rs_matrix4x4 *m, const rs_quaternion *q) { + float x2 = 2.0f * q->x * q->x; + float y2 = 2.0f * q->y * q->y; + float z2 = 2.0f * q->z * q->z; + float xy = 2.0f * q->x * q->y; + float wz = 2.0f * q->w * q->z; + float xz = 2.0f * q->x * q->z; + float wy = 2.0f * q->w * q->y; + float wx = 2.0f * q->w * q->x; + float yz = 2.0f * q->y * q->z; + + m->m[0] = 1.0f - y2 - z2; + m->m[1] = xy - wz; + m->m[2] = xz + wy; + m->m[3] = 0.0f; + + m->m[4] = xy + wz; + m->m[5] = 1.0f - x2 - z2; + m->m[6] = yz - wx; + m->m[7] = 0.0f; + + m->m[8] = xz - wy; + m->m[9] = yz - wx; + m->m[10] = 1.0f - x2 - y2; + m->m[11] = 0.0f; + + m->m[12] = 0.0f; + m->m[13] = 0.0f; + m->m[14] = 0.0f; + m->m[15] = 1.0f; +} + +///////////////////////////////////////////////////// +// utility funcs +///////////////////////////////////////////////////// +__inline__ static void __attribute__((overloadable, always_inline)) +rsExtractFrustumPlanes(const rs_matrix4x4 *modelViewProj, + float4 *left, float4 *right, + float4 *top, float4 *bottom, + float4 *near, float4 *far) { + // x y z w = a b c d in the plane equation + left->x = modelViewProj->m[3] + modelViewProj->m[0]; + left->y = modelViewProj->m[7] + modelViewProj->m[4]; + left->z = modelViewProj->m[11] + modelViewProj->m[8]; + left->w = modelViewProj->m[15] + modelViewProj->m[12]; + + right->x = modelViewProj->m[3] - modelViewProj->m[0]; + right->y = modelViewProj->m[7] - modelViewProj->m[4]; + right->z = modelViewProj->m[11] - modelViewProj->m[8]; + right->w = modelViewProj->m[15] - modelViewProj->m[12]; + + top->x = modelViewProj->m[3] - modelViewProj->m[1]; + top->y = modelViewProj->m[7] - modelViewProj->m[5]; + top->z = modelViewProj->m[11] - modelViewProj->m[9]; + top->w = modelViewProj->m[15] - modelViewProj->m[13]; + + bottom->x = modelViewProj->m[3] + modelViewProj->m[1]; + bottom->y = modelViewProj->m[7] + modelViewProj->m[5]; + bottom->z = modelViewProj->m[11] + modelViewProj->m[9]; + bottom->w = modelViewProj->m[15] + modelViewProj->m[13]; + + near->x = modelViewProj->m[3] + modelViewProj->m[2]; + near->y = modelViewProj->m[7] + modelViewProj->m[6]; + near->z = modelViewProj->m[11] + modelViewProj->m[10]; + near->w = modelViewProj->m[15] + modelViewProj->m[14]; + + far->x = modelViewProj->m[3] - modelViewProj->m[2]; + far->y = modelViewProj->m[7] - modelViewProj->m[6]; + far->z = modelViewProj->m[11] - modelViewProj->m[10]; + far->w = modelViewProj->m[15] - modelViewProj->m[14]; + + float len = length(left->xyz); + *left /= len; + len = length(right->xyz); + *right /= len; + len = length(top->xyz); + *top /= len; + len = length(bottom->xyz); + *bottom /= len; + len = length(near->xyz); + *near /= len; + len = length(far->xyz); + *far /= len; +} + +__inline__ static bool __attribute__((overloadable, always_inline)) +rsIsSphereInFrustum(float4 *sphere, + float4 *left, float4 *right, + float4 *top, float4 *bottom, + float4 *near, float4 *far) { + + float distToCenter = dot(left->xyz, sphere->xyz) + left->w; + if (distToCenter < -sphere->w) { + return false; + } + distToCenter = dot(right->xyz, sphere->xyz) + right->w; + if (distToCenter < -sphere->w) { + return false; + } + distToCenter = dot(top->xyz, sphere->xyz) + top->w; + if (distToCenter < -sphere->w) { + return false; + } + distToCenter = dot(bottom->xyz, sphere->xyz) + bottom->w; + if (distToCenter < -sphere->w) { + return false; + } + distToCenter = dot(near->xyz, sphere->xyz) + near->w; + if (distToCenter < -sphere->w) { + return false; + } + distToCenter = dot(far->xyz, sphere->xyz) + far->w; + if (distToCenter < -sphere->w) { + return false; + } + return true; +} + + +///////////////////////////////////////////////////// // int ops ///////////////////////////////////////////////////// diff --git a/libs/rs/scriptc/rs_types.rsh b/libs/rs/scriptc/rs_types.rsh index 367af4642e23..a010096507b1 100644 --- a/libs/rs/scriptc/rs_types.rsh +++ b/libs/rs/scriptc/rs_types.rsh @@ -73,6 +73,8 @@ typedef struct { float m[4]; } rs_matrix2x2; +typedef float4 rs_quaternion; + #define RS_PACKED __attribute__((packed, aligned(4))) #endif diff --git a/media/java/android/mtp/MtpClient.java b/media/java/android/mtp/MtpClient.java new file mode 100644 index 000000000000..19ee92a650bd --- /dev/null +++ b/media/java/android/mtp/MtpClient.java @@ -0,0 +1,270 @@ +/* + * 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. + */ + +package android.mtp; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.hardware.UsbConstants; +import android.hardware.UsbDevice; +import android.hardware.UsbInterface; +import android.hardware.UsbManager; +import android.os.ParcelFileDescriptor; +import android.util.Log; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * This class helps an application manage a list of connected MTP devices. + * It listens for MTP devices being attached and removed from the USB host bus + * and notifies the application when the MTP device list changes. + * {@hide} + */ +public class MtpClient { + + private static final String TAG = "MtpClient"; + + private final Context mContext; + private final UsbManager mUsbManager; + private final ArrayList<Listener> mListeners = new ArrayList<Listener>(); + private final ArrayList<MtpDevice> mDeviceList = new ArrayList<MtpDevice>(); + + private final BroadcastReceiver mUsbReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + String deviceName = intent.getStringExtra(UsbManager.EXTRA_DEVICE_NAME); + + synchronized (mDeviceList) { + MtpDevice mtpDevice = getDeviceLocked(deviceName); + + if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(intent.getAction())) { + if (mtpDevice == null) { + UsbDevice usbDevice = + (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); + mtpDevice = openDevice(usbDevice); + } + if (mtpDevice != null) { + mDeviceList.add(mtpDevice); + for (Listener listener : mListeners) { + listener.deviceAdded(mtpDevice); + } + } + } else if (mtpDevice != null) { + mDeviceList.remove(mtpDevice); + for (Listener listener : mListeners) { + listener.deviceRemoved(mtpDevice); + } + } + } + } + }; + + public interface Listener { + public void deviceAdded(MtpDevice device); + public void deviceRemoved(MtpDevice device); + } + + static public boolean isCamera(UsbDevice device) { + int count = device.getInterfaceCount(); + for (int i = 0; i < count; i++) { + UsbInterface intf = device.getInterface(i); + if (intf.getInterfaceClass() == UsbConstants.USB_CLASS_STILL_IMAGE && + intf.getInterfaceSubclass() == 1 && + intf.getInterfaceProtocol() == 1) { + return true; + } + } + return false; + } + + private MtpDevice openDevice(UsbDevice usbDevice) { + if (isCamera(usbDevice)) { + MtpDevice mtpDevice = new MtpDevice(usbDevice); + if (mtpDevice.open(mUsbManager)) { + return mtpDevice; + } + } + return null; + } + + public MtpClient(Context context) { + mContext = context; + mUsbManager = (UsbManager)context.getSystemService(Context.USB_SERVICE); + + IntentFilter filter = new IntentFilter(); + filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED); + filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED); + context.registerReceiver(mUsbReceiver, filter); + + for (UsbDevice usbDevice : mUsbManager.getDeviceList().values()) { + MtpDevice mtpDevice = getDeviceLocked(usbDevice.getDeviceName()); + if (mtpDevice == null) { + mtpDevice = openDevice(usbDevice); + } + if (mtpDevice != null) { + mDeviceList.add(mtpDevice); + } + } + } + + public void close() { + mContext.unregisterReceiver(mUsbReceiver); + } + + @Override + protected void finalize() throws Throwable { + try { + close(); + } finally { + super.finalize(); + } + } + + public void addListener(Listener listener) { + synchronized (mDeviceList) { + if (!mListeners.contains(listener)) { + mListeners.add(listener); + } + } + } + + public void removeListener(Listener listener) { + synchronized (mDeviceList) { + mListeners.remove(listener); + } + } + + public MtpDevice getDevice(String deviceName) { + synchronized (mDeviceList) { + return getDeviceLocked(deviceName); + } + } + + public MtpDevice getDevice(int id) { + synchronized (mDeviceList) { + return getDeviceLocked(UsbDevice.getDeviceName(id)); + } + } + + private MtpDevice getDeviceLocked(String deviceName) { + for (MtpDevice device : mDeviceList) { + if (device.getDeviceName().equals(deviceName)) { + return device; + } + } + return null; + } + + public List<MtpDevice> getDeviceList() { + synchronized (mDeviceList) { + return new ArrayList<MtpDevice>(mDeviceList); + } + } + + public List<MtpStorageInfo> getStorageList(String deviceName) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return null; + } + int[] storageIds = device.getStorageIds(); + if (storageIds == null) { + return null; + } + + int length = storageIds.length; + ArrayList<MtpStorageInfo> storageList = new ArrayList<MtpStorageInfo>(length); + for (int i = 0; i < length; i++) { + MtpStorageInfo info = device.getStorageInfo(storageIds[i]); + if (info == null) { + Log.w(TAG, "getStorageInfo failed"); + } else { + storageList.add(info); + } + } + return storageList; + } + + public MtpObjectInfo getObjectInfo(String deviceName, int objectHandle) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return null; + } + return device.getObjectInfo(objectHandle); + } + + public boolean deleteObject(String deviceName, int objectHandle) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return false; + } + return device.deleteObject(objectHandle); + } + + public List<MtpObjectInfo> getObjectList(String deviceName, int storageId, int objectHandle) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return null; + } + if (objectHandle == 0) { + // all objects in root of storage + objectHandle = 0xFFFFFFFF; + } + int[] handles = device.getObjectHandles(storageId, 0, objectHandle); + if (handles == null) { + return null; + } + + int length = handles.length; + ArrayList<MtpObjectInfo> objectList = new ArrayList<MtpObjectInfo>(length); + for (int i = 0; i < length; i++) { + MtpObjectInfo info = device.getObjectInfo(handles[i]); + if (info == null) { + Log.w(TAG, "getObjectInfo failed"); + } else { + objectList.add(info); + } + } + return objectList; + } + + public byte[] getObject(String deviceName, int objectHandle, int objectSize) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return null; + } + return device.getObject(objectHandle, objectSize); + } + + public byte[] getThumbnail(String deviceName, int objectHandle) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return null; + } + return device.getThumbnail(objectHandle); + } + + public boolean importFile(String deviceName, int objectHandle, String destPath) { + MtpDevice device = getDevice(deviceName); + if (device == null) { + return false; + } + return device.importFile(objectHandle, destPath); + } +} diff --git a/media/java/android/mtp/MtpDevice.java b/media/java/android/mtp/MtpDevice.java new file mode 100644 index 000000000000..2d726c23dbf8 --- /dev/null +++ b/media/java/android/mtp/MtpDevice.java @@ -0,0 +1,141 @@ +/* + * 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. + */ + +package android.mtp; + +import android.hardware.UsbDevice; +import android.hardware.UsbManager; +import android.os.ParcelFileDescriptor; +import android.util.Log; + +/** + * This class represents an MTP device connected on the USB host bus. + * + * {@hide} + */ +public final class MtpDevice { + + private static final String TAG = "MtpDevice"; + + private final UsbDevice mDevice; + + static { + System.loadLibrary("media_jni"); + } + + public MtpDevice(UsbDevice device) { + mDevice = device; + } + + public boolean open(UsbManager manager) { + if (manager.openDevice(mDevice)) { + return native_open(mDevice.getDeviceName(), mDevice.getFileDescriptor()); + } else { + return false; + } + } + + public void close() { + Log.d(TAG, "close"); + native_close(); + } + + @Override + protected void finalize() throws Throwable { + Log.d(TAG, "finalize"); + try { + native_close(); + } finally { + super.finalize(); + } + } + + public String getDeviceName() { + return mDevice.getDeviceName(); + } + + public int getDeviceId() { + return mDevice.getDeviceId(); + } + + @Override + public String toString() { + return mDevice.getDeviceName(); + } + + public MtpDeviceInfo getDeviceInfo() { + return native_get_device_info(); + } + + public int[] getStorageIds() { + return native_get_storage_ids(); + } + + public int[] getObjectHandles(int storageId, int format, int objectHandle) { + return native_get_object_handles(storageId, format, objectHandle); + } + + public byte[] getObject(int objectHandle, int objectSize) { + return native_get_object(objectHandle, objectSize); + } + + public byte[] getThumbnail(int objectHandle) { + return native_get_thumbnail(objectHandle); + } + + public MtpStorageInfo getStorageInfo(int storageId) { + return native_get_storage_info(storageId); + } + + public MtpObjectInfo getObjectInfo(int objectHandle) { + return native_get_object_info(objectHandle); + } + + public boolean deleteObject(int objectHandle) { + return native_delete_object(objectHandle); + } + + public long getParent(int objectHandle) { + return native_get_parent(objectHandle); + } + + public long getStorageID(int objectHandle) { + return native_get_storage_id(objectHandle); + } + + // Reads a file from device to host to the specified destination. + // Returns true if the transfer succeeds. + public boolean importFile(int objectHandle, String destPath) { + return native_import_file(objectHandle, destPath); + } + + // used by the JNI code + private int mNativeContext; + + private native boolean native_open(String deviceName, int fd); + private native void native_close(); + private native MtpDeviceInfo native_get_device_info(); + private native int[] native_get_storage_ids(); + private native MtpStorageInfo native_get_storage_info(int storageId); + private native int[] native_get_object_handles(int storageId, int format, int objectHandle); + private native MtpObjectInfo native_get_object_info(int objectHandle); + private native byte[] native_get_object(int objectHandle, int objectSize); + private native byte[] native_get_thumbnail(int objectHandle); + private native boolean native_delete_object(int objectHandle); + private native long native_get_parent(int objectHandle); + private native long native_get_storage_id(int objectHandle); + private native boolean native_import_file(int objectHandle, String destPath); +} diff --git a/media/java/android/mtp/MtpDeviceInfo.java b/media/java/android/mtp/MtpDeviceInfo.java new file mode 100644 index 000000000000..d918c20ec080 --- /dev/null +++ b/media/java/android/mtp/MtpDeviceInfo.java @@ -0,0 +1,72 @@ +/* + * 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. + */ + +package android.mtp; + +/** + * This class encapsulates information about an MTP device. + * This corresponds to the DeviceInfo Dataset described in + * section 5.1.1 of the MTP specification. + * + * {@hide} + */ +public class MtpDeviceInfo { + + private String mManufacturer; + private String mModel; + private String mVersion; + private String mSerialNumber; + + // only instantiated via JNI + private MtpDeviceInfo() { + } + + /** + * Returns the manufacturer's name for the MTP device + * + * @return the manufacturer name + */ + public final String getManufacturer() { + return mManufacturer; + } + + /** + * Returns the model name for the MTP device + * + * @return the model name + */ + public final String getModel() { + return mModel; + } + + /** + * Returns the version string the MTP device + * + * @return the device version + */ + public final String getVersion() { + return mVersion; + } + + /** + * Returns the unique serial number for the MTP device + * + * @return the serial number + */ + public final String getSerialNumber() { + return mSerialNumber; + } +}
\ No newline at end of file diff --git a/media/java/android/mtp/MtpObjectInfo.java b/media/java/android/mtp/MtpObjectInfo.java new file mode 100644 index 000000000000..309d5243d918 --- /dev/null +++ b/media/java/android/mtp/MtpObjectInfo.java @@ -0,0 +1,257 @@ +/* + * 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. + */ + +package android.mtp; + +/** + * This class encapsulates information about an object on an MTP device. + * This corresponds to the ObjectInfo Dataset described in + * section 5.3.1 of the MTP specification. + * + * {@hide} + */ +public final class MtpObjectInfo { + private int mHandle; + private int mStorageId; + private int mFormat; + private int mProtectionStatus; + private int mCompressedSize; + private int mThumbFormat; + private int mThumbCompressedSize; + private int mThumbPixWidth; + private int mThumbPixHeight; + private int mImagePixWidth; + private int mImagePixHeight; + private int mImagePixDepth; + private int mParent; + private int mAssociationType; + private int mAssociationDesc; + private int mSequenceNumber; + private String mName; + private long mDateCreated; + private long mDateModified; + private String mKeywords; + + // only instantiated via JNI + private MtpObjectInfo() { + } + + /** + * Returns the object handle for the MTP object + * + * @return the object handle + */ + public final int getObjectHandle() { + return mHandle; + } + + /** + * Returns the storage ID for the MTP object's storage unit + * + * @return the storage ID + */ + public final int getStorageId() { + return mStorageId; + } + + /** + * Returns the format code for the MTP object + * + * @return the format code + */ + public final int getFormat() { + return mFormat; + } + + /** + * Returns the protection status for the MTP object + * Possible values are: + * + * <ul> + * <li> {@link android.mtp.MtpConstants#PROTECTION_STATUS_NONE} + * <li> {@link android.mtp.MtpConstants#PROTECTION_STATUS_READ_ONLY} + * <li> {@link android.mtp.MtpConstants#PROTECTION_STATUS_NON_TRANSFERABLE_DATA} + * </ul> + * + * @return the protection status + */ + public final int getProtectionStatus() { + return mProtectionStatus; + } + + /** + * Returns the size of the MTP object + * + * @return the object size + */ + public final int getCompressedSize() { + return mCompressedSize; + } + + /** + * Returns the format code for the MTP object's thumbnail + * Will be zero for objects with no thumbnail + * + * @return the thumbnail format code + */ + public final int getThumbFormat() { + return mThumbFormat; + } + + /** + * Returns the size of the MTP object's thumbnail + * Will be zero for objects with no thumbnail + * + * @return the thumbnail size + */ + public final int getThumbCompressedSize() { + return mThumbCompressedSize; + } + + /** + * Returns the width of the MTP object's thumbnail in pixels + * Will be zero for objects with no thumbnail + * + * @return the thumbnail width + */ + public final int getThumbPixWidth() { + return mThumbPixWidth; + } + + /** + * Returns the height of the MTP object's thumbnail in pixels + * Will be zero for objects with no thumbnail + * + * @return the thumbnail height + */ + public final int getThumbPixHeight() { + return mThumbPixHeight; + } + + /** + * Returns the width of the MTP object in pixels + * Will be zero for non-image objects + * + * @return the image width + */ + public final int getImagePixWidth() { + return mImagePixWidth; + } + + /** + * Returns the height of the MTP object in pixels + * Will be zero for non-image objects + * + * @return the image height + */ + public final int getImagePixHeight() { + return mImagePixHeight; + } + + /** + * Returns the depth of the MTP object in bits per pixel + * Will be zero for non-image objects + * + * @return the image depth + */ + public final int getImagePixDepth() { + return mImagePixDepth; + } + + /** + * Returns the object handle for the object's parent + * Will be zero for the root directory of a storage unit + * + * @return the object's parent + */ + public final int getParent() { + return mParent; + } + + /** + * Returns the association type for the MTP object + * Will be zero objects that are not of format + * {@link android.mtp.MtpConstants#FORMAT_ASSOCIATION} + * For directories the association type is typically + * {@link android.mtp.MtpConstants#ASSOCIATION_TYPE_GENERIC_FOLDER} + * + * @return the object's association type + */ + public final int getAssociationType() { + return mAssociationType; + } + + /** + * Returns the association description for the MTP object + * Will be zero objects that are not of format + * {@link android.mtp.MtpConstants#FORMAT_ASSOCIATION} + * + * @return the object's association description + */ + public final int getAssociationDesc() { + return mAssociationDesc; + } + + /** + * Returns the sequence number for the MTP object + * This field is typically not used for MTP devices, + * but is sometimes used to define a sequence of photos + * on PTP cameras. + * + * @return the object's sequence number + */ + public final int getSequenceNumber() { + return mSequenceNumber; + } + + /** + * Returns the name of the MTP object + * + * @return the object's name + */ + public final String getName() { + return mName; + } + + /** + * Returns the creation date of the MTP object + * The value is represented as milliseconds since January 1, 1970 + * + * @return the object's creation date + */ + public final long getDateCreated() { + return mDateCreated; + } + + /** + * Returns the modification date of the MTP object + * The value is represented as milliseconds since January 1, 1970 + * + * @return the object's modification date + */ + public final long getDateModified() { + return mDateModified; + } + + /** + * Returns a comma separated list of keywords for the MTP object + * + * @return the object's keyword list + */ + public final String getKeywords() { + return mKeywords; + } +} diff --git a/media/java/android/mtp/MtpStorageInfo.java b/media/java/android/mtp/MtpStorageInfo.java new file mode 100644 index 000000000000..811455a9ce3c --- /dev/null +++ b/media/java/android/mtp/MtpStorageInfo.java @@ -0,0 +1,82 @@ +/* + * 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. + */ + +package android.mtp; + +/** + * This class encapsulates information about a storage unit on an MTP device. + * This corresponds to the StorageInfo Dataset described in + * section 5.2.2 of the MTP specification. + * + * {@hide} + */ +public final class MtpStorageInfo { + + private int mStorageId; + private long mMaxCapacity; + private long mFreeSpace; + private String mDescription; + private String mVolumeIdentifier; + + // only instantiated via JNI + private MtpStorageInfo() { + } + + /** + * Returns the storage ID for the storage unit + * + * @return the storage ID + */ + public final int getStorageId() { + return mStorageId; + } + + /** + * Returns the maximum storage capacity for the storage unit in bytes + * + * @return the maximum capacity + */ + public final long getMaxCapacity() { + return mMaxCapacity; + } + + /** + * Returns the amount of free space in the storage unit in bytes + * + * @return the amount of free space + */ + public final long getFreeSpace() { + return mFreeSpace; + } + + /** + * Returns the description string for the storage unit + * + * @return the storage unit description + */ + public final String getDescription() { + return mDescription; + } + + /** + * Returns the volume identifier for the storage unit + * + * @return the storage volume identifier + */ + public final String getVolumeIdentifier() { + return mVolumeIdentifier; + } +} diff --git a/media/jni/Android.mk b/media/jni/Android.mk index ab6e51283c74..2a89a2a9dfe5 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -10,6 +10,7 @@ LOCAL_SRC_FILES:= \ android_media_MediaProfiles.cpp \ android_media_AmrInputStream.cpp \ android_mtp_MtpDatabase.cpp \ + android_mtp_MtpDevice.cpp \ android_mtp_MtpServer.cpp \ LOCAL_SHARED_LIBRARIES := \ diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index f0609b2b69d3..0884e350d769 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -776,6 +776,7 @@ extern int register_android_media_ResampleInputStream(JNIEnv *env); extern int register_android_media_MediaProfiles(JNIEnv *env); extern int register_android_media_AmrInputStream(JNIEnv *env); extern int register_android_mtp_MtpDatabase(JNIEnv *env); +extern int register_android_mtp_MtpDevice(JNIEnv *env); extern int register_android_mtp_MtpServer(JNIEnv *env); jint JNI_OnLoad(JavaVM* vm, void* reserved) @@ -829,6 +830,11 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) goto bail; } + if (register_android_mtp_MtpDevice(env) < 0) { + LOGE("ERROR: MtpDevice native registration failed"); + goto bail; + } + if (register_android_mtp_MtpServer(env) < 0) { LOGE("ERROR: MtpServer native registration failed"); goto bail; diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp new file mode 100644 index 000000000000..9e67985b52db --- /dev/null +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -0,0 +1,663 @@ +/* + * 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. + */ + +// #define LOG_NDEBUG 0 + +#define LOG_TAG "MtpDeviceJNI" +#include "utils/Log.h" + +#include <stdio.h> +#include <assert.h> +#include <limits.h> +#include <unistd.h> +#include <fcntl.h> + +#include "jni.h" +#include "JNIHelp.h" +#include "android_runtime/AndroidRuntime.h" +#include "private/android_filesystem_config.h" + +#include "MtpTypes.h" +#include "MtpDevice.h" +#include "MtpDeviceInfo.h" +#include "MtpStorageInfo.h" +#include "MtpObjectInfo.h" + +using namespace android; + +// ---------------------------------------------------------------------------- + +static jfieldID field_context; + +jclass clazz_deviceInfo; +jclass clazz_storageInfo; +jclass clazz_objectInfo; + +jmethodID constructor_deviceInfo; +jmethodID constructor_storageInfo; +jmethodID constructor_objectInfo; + +// MtpDeviceInfo fields +static jfieldID field_deviceInfo_manufacturer; +static jfieldID field_deviceInfo_model; +static jfieldID field_deviceInfo_version; +static jfieldID field_deviceInfo_serialNumber; + +// MtpStorageInfo fields +static jfieldID field_storageInfo_storageId; +static jfieldID field_storageInfo_maxCapacity; +static jfieldID field_storageInfo_freeSpace; +static jfieldID field_storageInfo_description; +static jfieldID field_storageInfo_volumeIdentifier; + +// MtpObjectInfo fields +static jfieldID field_objectInfo_handle; +static jfieldID field_objectInfo_storageId; +static jfieldID field_objectInfo_format; +static jfieldID field_objectInfo_protectionStatus; +static jfieldID field_objectInfo_compressedSize; +static jfieldID field_objectInfo_thumbFormat; +static jfieldID field_objectInfo_thumbCompressedSize; +static jfieldID field_objectInfo_thumbPixWidth; +static jfieldID field_objectInfo_thumbPixHeight; +static jfieldID field_objectInfo_imagePixWidth; +static jfieldID field_objectInfo_imagePixHeight; +static jfieldID field_objectInfo_imagePixDepth; +static jfieldID field_objectInfo_parent; +static jfieldID field_objectInfo_associationType; +static jfieldID field_objectInfo_associationDesc; +static jfieldID field_objectInfo_sequenceNumber; +static jfieldID field_objectInfo_name; +static jfieldID field_objectInfo_dateCreated; +static jfieldID field_objectInfo_dateModified; +static jfieldID field_objectInfo_keywords; + +#ifdef HAVE_ANDROID_OS + +MtpDevice* get_device_from_object(JNIEnv* env, jobject javaDevice) +{ + return (MtpDevice*)env->GetIntField(javaDevice, field_context); +} + +static void checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) { + if (env->ExceptionCheck()) { + LOGE("An exception was thrown by callback '%s'.", methodName); + LOGE_EX(env); + env->ExceptionClear(); + } +} + +#endif // HAVE_ANDROID_OS + +// ---------------------------------------------------------------------------- + +static jboolean +android_mtp_MtpDevice_open(JNIEnv *env, jobject thiz, jstring deviceName, jint fd) +{ +#ifdef HAVE_ANDROID_OS + LOGD("open\n"); + const char *deviceNameStr = env->GetStringUTFChars(deviceName, NULL); + MtpDevice* device = MtpDevice::open(deviceNameStr, fd); + env->ReleaseStringUTFChars(deviceName, deviceNameStr); + + if (device) + env->SetIntField(thiz, field_context, (int)device); + return (device != NULL); +#endif +} + +static void +android_mtp_MtpDevice_close(JNIEnv *env, jobject thiz) +{ +#ifdef HAVE_ANDROID_OS + LOGD("close\n"); + MtpDevice* device = get_device_from_object(env, thiz); + if (device) { + device->close(); + delete device; + env->SetIntField(thiz, field_context, 0); + } +#endif +} + +static jobject +android_mtp_MtpDevice_get_device_info(JNIEnv *env, jobject thiz) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) { + LOGD("android_mtp_MtpDevice_get_device_info device is null"); + return NULL; + } + MtpDeviceInfo* deviceInfo = device->getDeviceInfo(); + if (!deviceInfo) { + LOGD("android_mtp_MtpDevice_get_device_info deviceInfo is null"); + return NULL; + } + jobject info = env->NewObject(clazz_deviceInfo, constructor_deviceInfo); + if (info == NULL) { + LOGE("Could not create a MtpDeviceInfo object"); + delete deviceInfo; + return NULL; + } + + if (deviceInfo->mManufacturer) + env->SetObjectField(info, field_deviceInfo_manufacturer, + env->NewStringUTF(deviceInfo->mManufacturer)); + if (deviceInfo->mModel) + env->SetObjectField(info, field_deviceInfo_model, + env->NewStringUTF(deviceInfo->mModel)); + if (deviceInfo->mVersion) + env->SetObjectField(info, field_deviceInfo_version, + env->NewStringUTF(deviceInfo->mVersion)); + if (deviceInfo->mSerial) + env->SetObjectField(info, field_deviceInfo_serialNumber, + env->NewStringUTF(deviceInfo->mSerial)); + + delete deviceInfo; + return info; +#else + return NULL; +#endif +} + +static jintArray +android_mtp_MtpDevice_get_storage_ids(JNIEnv *env, jobject thiz) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) + return NULL; + MtpStorageIDList* storageIDs = device->getStorageIDs(); + if (!storageIDs) + return NULL; + + int length = storageIDs->size(); + jintArray array = env->NewIntArray(length); + // FIXME is this cast safe? + env->SetIntArrayRegion(array, 0, length, (const jint *)storageIDs->array()); + + delete storageIDs; + return array; +#else + return NULL; +#endif +} + +static jobject +android_mtp_MtpDevice_get_storage_info(JNIEnv *env, jobject thiz, jint storageID) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) + return NULL; + MtpStorageInfo* storageInfo = device->getStorageInfo(storageID); + if (!storageInfo) + return NULL; + + jobject info = env->NewObject(clazz_storageInfo, constructor_storageInfo); + if (info == NULL) { + LOGE("Could not create a MtpStorageInfo object"); + delete storageInfo; + return NULL; + } + + if (storageInfo->mStorageID) + env->SetIntField(info, field_storageInfo_storageId, storageInfo->mStorageID); + if (storageInfo->mMaxCapacity) + env->SetLongField(info, field_storageInfo_maxCapacity, storageInfo->mMaxCapacity); + if (storageInfo->mFreeSpaceBytes) + env->SetLongField(info, field_storageInfo_freeSpace, storageInfo->mFreeSpaceBytes); + if (storageInfo->mStorageDescription) + env->SetObjectField(info, field_storageInfo_description, + env->NewStringUTF(storageInfo->mStorageDescription)); + if (storageInfo->mVolumeIdentifier) + env->SetObjectField(info, field_storageInfo_volumeIdentifier, + env->NewStringUTF(storageInfo->mVolumeIdentifier)); + + delete storageInfo; + return info; +#else + return NULL; +#endif +} + +static jintArray +android_mtp_MtpDevice_get_object_handles(JNIEnv *env, jobject thiz, + jint storageID, jint format, jint objectID) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) + return NULL; + MtpObjectHandleList* handles = device->getObjectHandles(storageID, format, objectID); + if (!handles) + return NULL; + + int length = handles->size(); + jintArray array = env->NewIntArray(length); + // FIXME is this cast safe? + env->SetIntArrayRegion(array, 0, length, (const jint *)handles->array()); + + delete handles; + return array; +#else + return NULL; +#endif +} + +static jobject +android_mtp_MtpDevice_get_object_info(JNIEnv *env, jobject thiz, jint objectID) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) + return NULL; + MtpObjectInfo* objectInfo = device->getObjectInfo(objectID); + if (!objectInfo) + return NULL; + jobject info = env->NewObject(clazz_objectInfo, constructor_objectInfo); + if (info == NULL) { + LOGE("Could not create a MtpObjectInfo object"); + delete objectInfo; + return NULL; + } + + if (objectInfo->mHandle) + env->SetIntField(info, field_objectInfo_handle, objectInfo->mHandle); + if (objectInfo->mStorageID) + env->SetIntField(info, field_objectInfo_storageId, objectInfo->mStorageID); + if (objectInfo->mFormat) + env->SetIntField(info, field_objectInfo_format, objectInfo->mFormat); + if (objectInfo->mProtectionStatus) + env->SetIntField(info, field_objectInfo_protectionStatus, objectInfo->mProtectionStatus); + if (objectInfo->mCompressedSize) + env->SetIntField(info, field_objectInfo_compressedSize, objectInfo->mCompressedSize); + if (objectInfo->mThumbFormat) + env->SetIntField(info, field_objectInfo_thumbFormat, objectInfo->mThumbFormat); + if (objectInfo->mThumbCompressedSize) + env->SetIntField(info, field_objectInfo_thumbCompressedSize, objectInfo->mThumbCompressedSize); + if (objectInfo->mThumbPixWidth) + env->SetIntField(info, field_objectInfo_thumbPixWidth, objectInfo->mThumbPixWidth); + if (objectInfo->mThumbPixHeight) + env->SetIntField(info, field_objectInfo_thumbPixHeight, objectInfo->mThumbPixHeight); + if (objectInfo->mImagePixWidth) + env->SetIntField(info, field_objectInfo_imagePixWidth, objectInfo->mImagePixWidth); + if (objectInfo->mImagePixHeight) + env->SetIntField(info, field_objectInfo_imagePixHeight, objectInfo->mImagePixHeight); + if (objectInfo->mImagePixDepth) + env->SetIntField(info, field_objectInfo_imagePixDepth, objectInfo->mImagePixDepth); + if (objectInfo->mParent) + env->SetIntField(info, field_objectInfo_parent, objectInfo->mParent); + if (objectInfo->mAssociationType) + env->SetIntField(info, field_objectInfo_associationType, objectInfo->mAssociationType); + if (objectInfo->mAssociationDesc) + env->SetIntField(info, field_objectInfo_associationDesc, objectInfo->mAssociationDesc); + if (objectInfo->mSequenceNumber) + env->SetIntField(info, field_objectInfo_sequenceNumber, objectInfo->mSequenceNumber); + if (objectInfo->mName) + env->SetObjectField(info, field_objectInfo_name, env->NewStringUTF(objectInfo->mName)); + if (objectInfo->mDateCreated) + env->SetLongField(info, field_objectInfo_dateCreated, objectInfo->mDateCreated); + if (objectInfo->mDateModified) + env->SetLongField(info, field_objectInfo_dateModified, objectInfo->mDateModified); + if (objectInfo->mKeywords) + env->SetObjectField(info, field_objectInfo_keywords, + env->NewStringUTF(objectInfo->mKeywords)); + + delete objectInfo; + return info; +#else + return NULL; +#endif +} + +struct get_object_callback_data { + JNIEnv *env; + jbyteArray array; +}; + +static bool get_object_callback(void* data, int offset, int length, void* clientData) +{ + get_object_callback_data* cbData = (get_object_callback_data *)clientData; + cbData->env->SetByteArrayRegion(cbData->array, offset, length, (jbyte *)data); + return true; +} + +static jbyteArray +android_mtp_MtpDevice_get_object(JNIEnv *env, jobject thiz, jint objectID, jint objectSize) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) + return NULL; + + jbyteArray array = env->NewByteArray(objectSize); + if (!array) { + jniThrowException(env, "java/lang/OutOfMemoryError", NULL); + return NULL; + } + + get_object_callback_data data; + data.env = env; + data.array = array; + + if (device->readObject(objectID, get_object_callback, objectSize, &data)) + return array; +#endif + return NULL; +} + +static jbyteArray +android_mtp_MtpDevice_get_thumbnail(JNIEnv *env, jobject thiz, jint objectID) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (!device) + return NULL; + + int length; + void* thumbnail = device->getThumbnail(objectID, length); + if (! thumbnail) + return NULL; + jbyteArray array = env->NewByteArray(length); + env->SetByteArrayRegion(array, 0, length, (const jbyte *)thumbnail); + + free(thumbnail); + return array; +#else + return NULL; +#endif +} + +static jboolean +android_mtp_MtpDevice_delete_object(JNIEnv *env, jobject thiz, jint object_id) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (device) + return device->deleteObject(object_id); + else + #endif + return NULL; +} + +static jlong +android_mtp_MtpDevice_get_parent(JNIEnv *env, jobject thiz, jint object_id) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (device) + return device->getParent(object_id); + else +#endif + return -1; +} + +static jlong +android_mtp_MtpDevice_get_storage_id(JNIEnv *env, jobject thiz, jint object_id) +{ + #ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (device) + return device->getStorageID(object_id); + else +#endif + return -1; +} + +static jboolean +android_mtp_MtpDevice_import_file(JNIEnv *env, jobject thiz, jint object_id, jstring dest_path) +{ +#ifdef HAVE_ANDROID_OS + MtpDevice* device = get_device_from_object(env, thiz); + if (device) { + const char *destPathStr = env->GetStringUTFChars(dest_path, NULL); + bool result = device->readObject(object_id, destPathStr, AID_SDCARD_RW, 0664); + env->ReleaseStringUTFChars(dest_path, destPathStr); + return result; + } +#endif + return NULL; +} + +// ---------------------------------------------------------------------------- + +static JNINativeMethod gMethods[] = { + {"native_open", "(Ljava/lang/String;I)Z", + (void *)android_mtp_MtpDevice_open}, + {"native_close", "()V", (void *)android_mtp_MtpDevice_close}, + {"native_get_device_info", "()Landroid/mtp/MtpDeviceInfo;", + (void *)android_mtp_MtpDevice_get_device_info}, + {"native_get_storage_ids", "()[I", (void *)android_mtp_MtpDevice_get_storage_ids}, + {"native_get_storage_info", "(I)Landroid/mtp/MtpStorageInfo;", + (void *)android_mtp_MtpDevice_get_storage_info}, + {"native_get_object_handles","(III)[I", + (void *)android_mtp_MtpDevice_get_object_handles}, + {"native_get_object_info", "(I)Landroid/mtp/MtpObjectInfo;", + (void *)android_mtp_MtpDevice_get_object_info}, + {"native_get_object", "(II)[B",(void *)android_mtp_MtpDevice_get_object}, + {"native_get_thumbnail", "(I)[B",(void *)android_mtp_MtpDevice_get_thumbnail}, + {"native_delete_object", "(I)Z", (void *)android_mtp_MtpDevice_delete_object}, + {"native_get_parent", "(I)J", (void *)android_mtp_MtpDevice_get_parent}, + {"native_get_storage_id", "(I)J", (void *)android_mtp_MtpDevice_get_storage_id}, + {"native_import_file", "(ILjava/lang/String;)Z", + (void *)android_mtp_MtpDevice_import_file}, +}; + +static const char* const kClassPathName = "android/mtp/MtpDevice"; + +int register_android_mtp_MtpDevice(JNIEnv *env) +{ + jclass clazz; + + LOGD("register_android_mtp_MtpDevice\n"); + + clazz = env->FindClass("android/mtp/MtpDeviceInfo"); + if (clazz == NULL) { + LOGE("Can't find android/mtp/MtpDeviceInfo"); + return -1; + } + constructor_deviceInfo = env->GetMethodID(clazz, "<init>", "()V"); + if (constructor_deviceInfo == NULL) { + LOGE("Can't find android/mtp/MtpDeviceInfo constructor"); + return -1; + } + field_deviceInfo_manufacturer = env->GetFieldID(clazz, "mManufacturer", "Ljava/lang/String;"); + if (field_deviceInfo_manufacturer == NULL) { + LOGE("Can't find MtpDeviceInfo.mManufacturer"); + return -1; + } + field_deviceInfo_model = env->GetFieldID(clazz, "mModel", "Ljava/lang/String;"); + if (field_deviceInfo_model == NULL) { + LOGE("Can't find MtpDeviceInfo.mModel"); + return -1; + } + field_deviceInfo_version = env->GetFieldID(clazz, "mVersion", "Ljava/lang/String;"); + if (field_deviceInfo_version == NULL) { + LOGE("Can't find MtpDeviceInfo.mVersion"); + return -1; + } + field_deviceInfo_serialNumber = env->GetFieldID(clazz, "mSerialNumber", "Ljava/lang/String;"); + if (field_deviceInfo_serialNumber == NULL) { + LOGE("Can't find MtpDeviceInfo.mSerialNumber"); + return -1; + } + clazz_deviceInfo = clazz; + + clazz = env->FindClass("android/mtp/MtpStorageInfo"); + if (clazz == NULL) { + LOGE("Can't find android/mtp/MtpStorageInfo"); + return -1; + } + constructor_storageInfo = env->GetMethodID(clazz, "<init>", "()V"); + if (constructor_storageInfo == NULL) { + LOGE("Can't find android/mtp/MtpStorageInfo constructor"); + return -1; + } + field_storageInfo_storageId = env->GetFieldID(clazz, "mStorageId", "I"); + if (field_storageInfo_storageId == NULL) { + LOGE("Can't find MtpStorageInfo.mStorageId"); + return -1; + } + field_storageInfo_maxCapacity = env->GetFieldID(clazz, "mMaxCapacity", "J"); + if (field_storageInfo_maxCapacity == NULL) { + LOGE("Can't find MtpStorageInfo.mMaxCapacity"); + return -1; + } + field_storageInfo_freeSpace = env->GetFieldID(clazz, "mFreeSpace", "J"); + if (field_storageInfo_freeSpace == NULL) { + LOGE("Can't find MtpStorageInfo.mFreeSpace"); + return -1; + } + field_storageInfo_description = env->GetFieldID(clazz, "mDescription", "Ljava/lang/String;"); + if (field_storageInfo_description == NULL) { + LOGE("Can't find MtpStorageInfo.mDescription"); + return -1; + } + field_storageInfo_volumeIdentifier = env->GetFieldID(clazz, "mVolumeIdentifier", "Ljava/lang/String;"); + if (field_storageInfo_volumeIdentifier == NULL) { + LOGE("Can't find MtpStorageInfo.mVolumeIdentifier"); + return -1; + } + clazz_storageInfo = clazz; + + clazz = env->FindClass("android/mtp/MtpObjectInfo"); + if (clazz == NULL) { + LOGE("Can't find android/mtp/MtpObjectInfo"); + return -1; + } + constructor_objectInfo = env->GetMethodID(clazz, "<init>", "()V"); + if (constructor_objectInfo == NULL) { + LOGE("Can't find android/mtp/MtpObjectInfo constructor"); + return -1; + } + field_objectInfo_handle = env->GetFieldID(clazz, "mHandle", "I"); + if (field_objectInfo_handle == NULL) { + LOGE("Can't find MtpObjectInfo.mHandle"); + return -1; + } + field_objectInfo_storageId = env->GetFieldID(clazz, "mStorageId", "I"); + if (field_objectInfo_storageId == NULL) { + LOGE("Can't find MtpObjectInfo.mStorageId"); + return -1; + } + field_objectInfo_format = env->GetFieldID(clazz, "mFormat", "I"); + if (field_objectInfo_format == NULL) { + LOGE("Can't find MtpObjectInfo.mFormat"); + return -1; + } + field_objectInfo_protectionStatus = env->GetFieldID(clazz, "mProtectionStatus", "I"); + if (field_objectInfo_protectionStatus == NULL) { + LOGE("Can't find MtpObjectInfo.mProtectionStatus"); + return -1; + } + field_objectInfo_compressedSize = env->GetFieldID(clazz, "mCompressedSize", "I"); + if (field_objectInfo_compressedSize == NULL) { + LOGE("Can't find MtpObjectInfo.mCompressedSize"); + return -1; + } + field_objectInfo_thumbFormat = env->GetFieldID(clazz, "mThumbFormat", "I"); + if (field_objectInfo_thumbFormat == NULL) { + LOGE("Can't find MtpObjectInfo.mThumbFormat"); + return -1; + } + field_objectInfo_thumbCompressedSize = env->GetFieldID(clazz, "mThumbCompressedSize", "I"); + if (field_objectInfo_thumbCompressedSize == NULL) { + LOGE("Can't find MtpObjectInfo.mThumbCompressedSize"); + return -1; + } + field_objectInfo_thumbPixWidth = env->GetFieldID(clazz, "mThumbPixWidth", "I"); + if (field_objectInfo_thumbPixWidth == NULL) { + LOGE("Can't find MtpObjectInfo.mThumbPixWidth"); + return -1; + } + field_objectInfo_thumbPixHeight = env->GetFieldID(clazz, "mThumbPixHeight", "I"); + if (field_objectInfo_thumbPixHeight == NULL) { + LOGE("Can't find MtpObjectInfo.mThumbPixHeight"); + return -1; + } + field_objectInfo_imagePixWidth = env->GetFieldID(clazz, "mImagePixWidth", "I"); + if (field_objectInfo_imagePixWidth == NULL) { + LOGE("Can't find MtpObjectInfo.mImagePixWidth"); + return -1; + } + field_objectInfo_imagePixHeight = env->GetFieldID(clazz, "mImagePixHeight", "I"); + if (field_objectInfo_imagePixHeight == NULL) { + LOGE("Can't find MtpObjectInfo.mImagePixHeight"); + return -1; + } + field_objectInfo_imagePixDepth = env->GetFieldID(clazz, "mImagePixDepth", "I"); + if (field_objectInfo_imagePixDepth == NULL) { + LOGE("Can't find MtpObjectInfo.mImagePixDepth"); + return -1; + } + field_objectInfo_parent = env->GetFieldID(clazz, "mParent", "I"); + if (field_objectInfo_parent == NULL) { + LOGE("Can't find MtpObjectInfo.mParent"); + return -1; + } + field_objectInfo_associationType = env->GetFieldID(clazz, "mAssociationType", "I"); + if (field_objectInfo_associationType == NULL) { + LOGE("Can't find MtpObjectInfo.mAssociationType"); + return -1; + } + field_objectInfo_associationDesc = env->GetFieldID(clazz, "mAssociationDesc", "I"); + if (field_objectInfo_associationDesc == NULL) { + LOGE("Can't find MtpObjectInfo.mAssociationDesc"); + return -1; + } + field_objectInfo_sequenceNumber = env->GetFieldID(clazz, "mSequenceNumber", "I"); + if (field_objectInfo_sequenceNumber == NULL) { + LOGE("Can't find MtpObjectInfo.mSequenceNumber"); + return -1; + } + field_objectInfo_name = env->GetFieldID(clazz, "mName", "Ljava/lang/String;"); + if (field_objectInfo_name == NULL) { + LOGE("Can't find MtpObjectInfo.mName"); + return -1; + } + field_objectInfo_dateCreated = env->GetFieldID(clazz, "mDateCreated", "J"); + if (field_objectInfo_dateCreated == NULL) { + LOGE("Can't find MtpObjectInfo.mDateCreated"); + return -1; + } + field_objectInfo_dateModified = env->GetFieldID(clazz, "mDateModified", "J"); + if (field_objectInfo_dateModified == NULL) { + LOGE("Can't find MtpObjectInfo.mDateModified"); + return -1; + } + field_objectInfo_keywords = env->GetFieldID(clazz, "mKeywords", "Ljava/lang/String;"); + if (field_objectInfo_keywords == NULL) { + LOGE("Can't find MtpObjectInfo.mKeywords"); + return -1; + } + clazz_objectInfo = clazz; + + clazz = env->FindClass("android/mtp/MtpDevice"); + if (clazz == NULL) { + LOGE("Can't find android/mtp/MtpDevice"); + return -1; + } + field_context = env->GetFieldID(clazz, "mNativeContext", "I"); + if (field_context == NULL) { + LOGE("Can't find MtpDevice.mNativeContext"); + return -1; + } + + return AndroidRuntime::registerNativeMethods(env, + "android/mtp/MtpDevice", gMethods, NELEM(gMethods)); +} diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp index 26c5aca56b25..9097e20ee3c1 100755 --- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp +++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp @@ -166,7 +166,7 @@ enum { REVERB_VOLUME_RAMP, }; -#define REVERB_DEFAULT_PRESET REVERB_PRESET_MEDIUMROOM +#define REVERB_DEFAULT_PRESET REVERB_PRESET_NONE #define REVERB_SEND_LEVEL (0x0C00) // 0.75 in 4.12 format diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk index 70dc3402e29d..c25285eb2928 100644 --- a/media/mtp/Android.mk +++ b/media/mtp/Android.mk @@ -21,7 +21,6 @@ ifneq ($(TARGET_SIMULATOR),true) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - MtpClient.cpp \ MtpDataPacket.cpp \ MtpDebug.cpp \ MtpDevice.cpp \ @@ -53,7 +52,6 @@ ifeq ($(HOST_OS),linux) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - MtpClient.cpp \ MtpDataPacket.cpp \ MtpDebug.cpp \ MtpDevice.cpp \ diff --git a/media/mtp/MtpClient.cpp b/media/mtp/MtpClient.cpp deleted file mode 100644 index c83054001a0c..000000000000 --- a/media/mtp/MtpClient.cpp +++ /dev/null @@ -1,251 +0,0 @@ -/* - * 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. - */ - -#define LOG_TAG "MtpClient" - -#include "MtpDebug.h" -#include "MtpClient.h" -#include "MtpDevice.h" - -#include <stdio.h> -#include <stdlib.h> -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <errno.h> - -#include <usbhost/usbhost.h> - -struct usb_device; - -namespace android { - -static bool isMtpDevice(uint16_t vendor, uint16_t product) { - // Sandisk Sansa Fuze - if (vendor == 0x0781 && product == 0x74c2) - return true; - // Samsung YP-Z5 - if (vendor == 0x04e8 && product == 0x503c) - return true; - return false; -} - -class MtpClientThread : public Thread { -private: - MtpClient* mClient; - -public: - MtpClientThread(MtpClient* client) - : mClient(client) - { - } - - virtual bool threadLoop() { - return mClient->threadLoop(); - } -}; - - -MtpClient::MtpClient() - : mThread(NULL), - mUsbHostContext(NULL), - mDone(false) -{ -} - -MtpClient::~MtpClient() { - usb_host_cleanup(mUsbHostContext); -} - -bool MtpClient::start() { - Mutex::Autolock autoLock(mMutex); - - if (mThread) - return true; - - mUsbHostContext = usb_host_init(); - if (!mUsbHostContext) - return false; - - mThread = new MtpClientThread(this); - mThread->run("MtpClientThread"); - // wait for the thread to do initial device discovery before returning - mThreadStartCondition.wait(mMutex); - - return true; -} - -void MtpClient::stop() { - mDone = true; -} - -MtpDevice* MtpClient::getDevice(int id) { - for (int i = 0; i < mDeviceList.size(); i++) { - MtpDevice* device = mDeviceList[i]; - if (device->getID() == id) - return device; - } - return NULL; -} - -bool MtpClient::usbDeviceAdded(const char *devname) { - struct usb_descriptor_header* desc; - struct usb_descriptor_iter iter; - - struct usb_device *device = usb_device_open(devname); - if (!device) { - LOGE("usb_device_open failed\n"); - return mDone; - } - - usb_descriptor_iter_init(device, &iter); - - while ((desc = usb_descriptor_iter_next(&iter)) != NULL) { - if (desc->bDescriptorType == USB_DT_INTERFACE) { - struct usb_interface_descriptor *interface = (struct usb_interface_descriptor *)desc; - - if (interface->bInterfaceClass == USB_CLASS_STILL_IMAGE && - interface->bInterfaceSubClass == 1 && // Still Image Capture - interface->bInterfaceProtocol == 1) // Picture Transfer Protocol (PIMA 15470) - { - LOGD("Found camera: \"%s\" \"%s\"\n", usb_device_get_manufacturer_name(device), - usb_device_get_product_name(device)); - } else if (interface->bInterfaceClass == 0xFF && - interface->bInterfaceSubClass == 0xFF && - interface->bInterfaceProtocol == 0) { - char* interfaceName = usb_device_get_string(device, interface->iInterface); - if (!interfaceName || strcmp(interfaceName, "MTP")) - continue; - // Looks like an android style MTP device - LOGD("Found MTP device: \"%s\" \"%s\"\n", usb_device_get_manufacturer_name(device), - usb_device_get_product_name(device)); - } else { - // look for special cased devices based on vendor/product ID - // we are doing this mainly for testing purposes - uint16_t vendor = usb_device_get_vendor_id(device); - uint16_t product = usb_device_get_product_id(device); - if (!isMtpDevice(vendor, product)) { - // not an MTP or PTP device - continue; - } - // request MTP OS string and descriptor - // some music players need to see this before entering MTP mode. - char buffer[256]; - memset(buffer, 0, sizeof(buffer)); - int ret = usb_device_send_control(device, - USB_DIR_IN|USB_RECIP_DEVICE|USB_TYPE_STANDARD, - USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | 0xEE, - 0, sizeof(buffer), buffer); - printf("usb_device_send_control returned %d errno: %d\n", ret, errno); - if (ret > 0) { - printf("got MTP string %s\n", buffer); - ret = usb_device_send_control(device, - USB_DIR_IN|USB_RECIP_DEVICE|USB_TYPE_VENDOR, 1, - 0, 4, sizeof(buffer), buffer); - printf("OS descriptor got %d\n", ret); - } else { - printf("no MTP string\n"); - } - } - - // if we got here, then we have a likely MTP or PTP device - - // interface should be followed by three endpoints - struct usb_endpoint_descriptor *ep; - struct usb_endpoint_descriptor *ep_in_desc = NULL; - struct usb_endpoint_descriptor *ep_out_desc = NULL; - struct usb_endpoint_descriptor *ep_intr_desc = NULL; - for (int i = 0; i < 3; i++) { - ep = (struct usb_endpoint_descriptor *)usb_descriptor_iter_next(&iter); - if (!ep || ep->bDescriptorType != USB_DT_ENDPOINT) { - LOGE("endpoints not found\n"); - return mDone; - } - if (ep->bmAttributes == USB_ENDPOINT_XFER_BULK) { - if (ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) - ep_in_desc = ep; - else - ep_out_desc = ep; - } else if (ep->bmAttributes == USB_ENDPOINT_XFER_INT && - ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) { - ep_intr_desc = ep; - } - } - if (!ep_in_desc || !ep_out_desc || !ep_intr_desc) { - LOGE("endpoints not found\n"); - return mDone; - } - - if (usb_device_claim_interface(device, interface->bInterfaceNumber)) { - LOGE("usb_device_claim_interface failed errno: %d\n", errno); - return mDone; - } - - MtpDevice* mtpDevice = new MtpDevice(device, interface->bInterfaceNumber, - ep_in_desc, ep_out_desc, ep_intr_desc); - mDeviceList.add(mtpDevice); - mtpDevice->initialize(); - deviceAdded(mtpDevice); - return mDone; - } - } - - usb_device_close(device); - return mDone; -} - -bool MtpClient::usbDeviceRemoved(const char *devname) { - for (int i = 0; i < mDeviceList.size(); i++) { - MtpDevice* device = mDeviceList[i]; - if (!strcmp(devname, device->getDeviceName())) { - deviceRemoved(device); - mDeviceList.removeAt(i); - delete device; - LOGD("Camera removed!\n"); - break; - } - } - return mDone; -} - -bool MtpClient::usbDiscoveryDone() { - Mutex::Autolock autoLock(mMutex); - mThreadStartCondition.signal(); - return mDone; -} - -bool MtpClient::threadLoop() { - usb_host_run(mUsbHostContext, usb_device_added, usb_device_removed, usb_discovery_done, this); - return false; -} - -int MtpClient::usb_device_added(const char *devname, void* client_data) { - LOGD("usb_device_added %s\n", devname); - return ((MtpClient *)client_data)->usbDeviceAdded(devname); -} - -int MtpClient::usb_device_removed(const char *devname, void* client_data) { - LOGD("usb_device_removed %s\n", devname); - return ((MtpClient *)client_data)->usbDeviceRemoved(devname); -} - -int MtpClient::usb_discovery_done(void* client_data) { - LOGD("usb_discovery_done\n"); - return ((MtpClient *)client_data)->usbDiscoveryDone(); -} - -} // namespace android diff --git a/media/mtp/MtpClient.h b/media/mtp/MtpClient.h deleted file mode 100644 index fa5c5278714b..000000000000 --- a/media/mtp/MtpClient.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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. - */ - -#ifndef _MTP_CLIENT_H -#define _MTP_CLIENT_H - -#include "MtpTypes.h" - -#include <utils/threads.h> - -struct usb_host_context; - -namespace android { - -class MtpClientThread; - -class MtpClient { -private: - MtpDeviceList mDeviceList; - MtpClientThread* mThread; - Condition mThreadStartCondition; - Mutex mMutex; - struct usb_host_context* mUsbHostContext; - bool mDone; - -public: - MtpClient(); - virtual ~MtpClient(); - - bool start(); - void stop(); - - inline MtpDeviceList& getDeviceList() { return mDeviceList; } - MtpDevice* getDevice(int id); - - - virtual void deviceAdded(MtpDevice *device) = 0; - virtual void deviceRemoved(MtpDevice *device) = 0; - -private: - // these return true if we should stop monitoring USB and clean up - bool usbDeviceAdded(const char *devname); - bool usbDeviceRemoved(const char *devname); - bool usbDiscoveryDone(); - - friend class MtpClientThread; - bool threadLoop(); - static int usb_device_added(const char *devname, void* client_data); - static int usb_device_removed(const char *devname, void* client_data); - static int usb_discovery_done(void* client_data); -}; - -}; // namespace android - -#endif // _MTP_CLIENT_H diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp index d22c72fc4c6a..4383b5fdff75 100644 --- a/media/mtp/MtpDevice.cpp +++ b/media/mtp/MtpDevice.cpp @@ -38,6 +38,121 @@ namespace android { +static bool isMtpDevice(uint16_t vendor, uint16_t product) { + // Sandisk Sansa Fuze + if (vendor == 0x0781 && product == 0x74c2) + return true; + // Samsung YP-Z5 + if (vendor == 0x04e8 && product == 0x503c) + return true; + return false; +} + +MtpDevice* MtpDevice::open(const char* deviceName, int fd) { + struct usb_device *device = usb_device_new(deviceName, fd); + if (!device) { + LOGE("usb_device_new failed for %s", deviceName); + return NULL; + } + + struct usb_descriptor_header* desc; + struct usb_descriptor_iter iter; + + usb_descriptor_iter_init(device, &iter); + + while ((desc = usb_descriptor_iter_next(&iter)) != NULL) { + if (desc->bDescriptorType == USB_DT_INTERFACE) { + struct usb_interface_descriptor *interface = (struct usb_interface_descriptor *)desc; + + if (interface->bInterfaceClass == USB_CLASS_STILL_IMAGE && + interface->bInterfaceSubClass == 1 && // Still Image Capture + interface->bInterfaceProtocol == 1) // Picture Transfer Protocol (PIMA 15470) + { + LOGD("Found camera: \"%s\" \"%s\"\n", usb_device_get_manufacturer_name(device), + usb_device_get_product_name(device)); + } else if (interface->bInterfaceClass == 0xFF && + interface->bInterfaceSubClass == 0xFF && + interface->bInterfaceProtocol == 0) { + char* interfaceName = usb_device_get_string(device, interface->iInterface); + if (!interfaceName || strcmp(interfaceName, "MTP")) + continue; + // Looks like an android style MTP device + LOGD("Found MTP device: \"%s\" \"%s\"\n", usb_device_get_manufacturer_name(device), + usb_device_get_product_name(device)); + } else { + // look for special cased devices based on vendor/product ID + // we are doing this mainly for testing purposes + uint16_t vendor = usb_device_get_vendor_id(device); + uint16_t product = usb_device_get_product_id(device); + if (!isMtpDevice(vendor, product)) { + // not an MTP or PTP device + continue; + } + // request MTP OS string and descriptor + // some music players need to see this before entering MTP mode. + char buffer[256]; + memset(buffer, 0, sizeof(buffer)); + int ret = usb_device_control_transfer(device, + USB_DIR_IN|USB_RECIP_DEVICE|USB_TYPE_STANDARD, + USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | 0xEE, + 0, buffer, sizeof(buffer), 0); + printf("usb_device_control_transfer returned %d errno: %d\n", ret, errno); + if (ret > 0) { + printf("got MTP string %s\n", buffer); + ret = usb_device_control_transfer(device, + USB_DIR_IN|USB_RECIP_DEVICE|USB_TYPE_VENDOR, 1, + 0, 4, buffer, sizeof(buffer), 0); + printf("OS descriptor got %d\n", ret); + } else { + printf("no MTP string\n"); + } + } + + // if we got here, then we have a likely MTP or PTP device + + // interface should be followed by three endpoints + struct usb_endpoint_descriptor *ep; + struct usb_endpoint_descriptor *ep_in_desc = NULL; + struct usb_endpoint_descriptor *ep_out_desc = NULL; + struct usb_endpoint_descriptor *ep_intr_desc = NULL; + for (int i = 0; i < 3; i++) { + ep = (struct usb_endpoint_descriptor *)usb_descriptor_iter_next(&iter); + if (!ep || ep->bDescriptorType != USB_DT_ENDPOINT) { + LOGE("endpoints not found\n"); + return NULL; + } + if (ep->bmAttributes == USB_ENDPOINT_XFER_BULK) { + if (ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) + ep_in_desc = ep; + else + ep_out_desc = ep; + } else if (ep->bmAttributes == USB_ENDPOINT_XFER_INT && + ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) { + ep_intr_desc = ep; + } + } + if (!ep_in_desc || !ep_out_desc || !ep_intr_desc) { + LOGE("endpoints not found\n"); + return NULL; + } + + if (usb_device_claim_interface(device, interface->bInterfaceNumber)) { + LOGE("usb_device_claim_interface failed errno: %d\n", errno); + return NULL; + } + + MtpDevice* mtpDevice = new MtpDevice(device, interface->bInterfaceNumber, + ep_in_desc, ep_out_desc, ep_intr_desc); + mtpDevice->initialize(); + return mtpDevice; + } + } + + usb_device_close(device); + LOGE("device not found"); + return NULL; +} + MtpDevice::MtpDevice(struct usb_device* device, int interface, const struct usb_endpoint_descriptor *ep_in, const struct usb_endpoint_descriptor *ep_out, @@ -49,7 +164,6 @@ MtpDevice::MtpDevice(struct usb_device* device, int interface, mRequestOut(NULL), mRequestIntr(NULL), mDeviceInfo(NULL), - mID(usb_device_get_unique_id(device)), mSessionID(0), mTransactionID(0), mReceivedResponse(false) @@ -430,6 +544,98 @@ MtpProperty* MtpDevice::getObjectPropDesc(MtpObjectProperty code, MtpObjectForma return NULL; } +bool MtpDevice::readObject(MtpObjectHandle handle, + bool (* callback)(void* data, int offset, int length, void* clientData), + int objectSize, void* clientData) { + Mutex::Autolock autoLock(mMutex); + bool result = false; + + mRequest.reset(); + mRequest.setParameter(1, handle); + if (sendRequest(MTP_OPERATION_GET_OBJECT) + && mData.readDataHeader(mRequestIn1)) { + uint32_t length = mData.getContainerLength(); + if (length - MTP_CONTAINER_HEADER_SIZE != objectSize) { + LOGE("readObject error objectSize: %d, length: %d", + objectSize, length); + goto fail; + } + length -= MTP_CONTAINER_HEADER_SIZE; + uint32_t remaining = length; + int offset = 0; + + int initialDataLength = 0; + void* initialData = mData.getData(initialDataLength); + if (initialData) { + if (initialDataLength > 0) { + if (!callback(initialData, 0, initialDataLength, clientData)) + goto fail; + remaining -= initialDataLength; + offset += initialDataLength; + } + free(initialData); + } + + // USB reads greater than 16K don't work + char buffer1[16384], buffer2[16384]; + mRequestIn1->buffer = buffer1; + mRequestIn2->buffer = buffer2; + struct usb_request* req = mRequestIn1; + void* writeBuffer = NULL; + int writeLength = 0; + + while (remaining > 0 || writeBuffer) { + if (remaining > 0) { + // queue up a read request + req->buffer_length = (remaining > sizeof(buffer1) ? sizeof(buffer1) : remaining); + if (mData.readDataAsync(req)) { + LOGE("readDataAsync failed"); + goto fail; + } + } else { + req = NULL; + } + + if (writeBuffer) { + // write previous buffer + if (!callback(writeBuffer, offset, writeLength, clientData)) { + LOGE("write failed"); + // wait for pending read before failing + if (req) + mData.readDataWait(mDevice); + goto fail; + } + offset += writeLength; + writeBuffer = NULL; + } + + // wait for read to complete + if (req) { + int read = mData.readDataWait(mDevice); + if (read < 0) + goto fail; + + if (read > 0) { + writeBuffer = req->buffer; + writeLength = read; + remaining -= read; + req = (req == mRequestIn1 ? mRequestIn2 : mRequestIn1); + } else { + writeBuffer = NULL; + } + } + } + + MtpResponseCode response = readResponse(); + if (response == MTP_RESPONSE_OK) + result = true; + } + +fail: + return result; +} + + // reads the object's data and writes it to the specified file path bool MtpDevice::readObject(MtpObjectHandle handle, const char* destPath, int group, int perm) { LOGD("readObject: %s", destPath); @@ -507,10 +713,14 @@ bool MtpDevice::readObject(MtpObjectHandle handle, const char* destPath, int gro if (read < 0) goto fail; - writeBuffer = req->buffer; - writeLength = read; - remaining -= read; - req = (req == mRequestIn1 ? mRequestIn2 : mRequestIn1); + if (read > 0) { + writeBuffer = req->buffer; + writeLength = read; + remaining -= read; + req = (req == mRequestIn1 ? mRequestIn2 : mRequestIn1); + } else { + writeBuffer = NULL; + } } } diff --git a/media/mtp/MtpDevice.h b/media/mtp/MtpDevice.h index d0a0fb3016ee..b69203ec0f5a 100644 --- a/media/mtp/MtpDevice.h +++ b/media/mtp/MtpDevice.h @@ -45,9 +45,6 @@ private: MtpDeviceInfo* mDeviceInfo; MtpPropertyList mDeviceProperties; - // a unique ID for the device - int mID; - // current session ID MtpSessionID mSessionID; // current transaction ID @@ -67,9 +64,10 @@ public: const struct usb_endpoint_descriptor *ep_in, const struct usb_endpoint_descriptor *ep_out, const struct usb_endpoint_descriptor *ep_intr); - virtual ~MtpDevice(); - inline int getID() const { return mID; } + static MtpDevice* open(const char* deviceName, int fd); + + virtual ~MtpDevice(); void initialize(); void close(); @@ -97,7 +95,11 @@ public: MtpProperty* getDevicePropDesc(MtpDeviceProperty code); MtpProperty* getObjectPropDesc(MtpObjectProperty code, MtpObjectFormat format); - bool readObject(MtpObjectHandle handle, const char* destPath, int group, + bool readObject(MtpObjectHandle handle, + bool (* callback)(void* data, int offset, + int length, void* clientData), + int objectSize, void* clientData); + bool readObject(MtpObjectHandle handle, const char* destPath, int group, int perm); private: diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index be004d2dd786..853a5af864f7 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -343,8 +343,9 @@ MtpResponseCode MtpServer::doGetDeviceInfo() { mData.putAUInt16(deviceProperties); // Device Properties Supported mData.putAUInt16(captureFormats); // Capture Formats mData.putAUInt16(playbackFormats); // Playback Formats - // FIXME - string.set("Google, Inc."); + + property_get("ro.product.manufacturer", prop_value, "unknown manufacturer"); + string.set(prop_value); mData.putString(string); // Manufacturer property_get("ro.product.model", prop_value, "MTP Device"); diff --git a/media/tests/CameraBrowser/Android.mk b/media/tests/CameraBrowser/Android.mk new file mode 100644 index 000000000000..1d8112911d3c --- /dev/null +++ b/media/tests/CameraBrowser/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := tests + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_PACKAGE_NAME := CameraBrowser + +include $(BUILD_PACKAGE) diff --git a/media/tests/CameraBrowser/AndroidManifest.xml b/media/tests/CameraBrowser/AndroidManifest.xml new file mode 100644 index 000000000000..f167f4bec542 --- /dev/null +++ b/media/tests/CameraBrowser/AndroidManifest.xml @@ -0,0 +1,31 @@ +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.camerabrowser"> + + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.ACCESS_USB" /> + + <application android:label="@string/app_label" + android:name="com.android.camerabrowser.CameraBrowserApplication"> + + <activity android:name="CameraBrowser" android:label="Camera Browser"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + + <activity android:name="StorageBrowser" /> + <activity android:name="ObjectBrowser" /> + <activity android:name="ObjectViewer" /> + +<!-- + <receiver android:name="UsbReceiver"> + <intent-filter> + <action android:name="android.hardware.action.USB_DEVICE_ATTACHED" /> + </intent-filter> + </receiver> +--> + </application> + + +</manifest> diff --git a/media/tests/CameraBrowser/res/layout/object_info.xml b/media/tests/CameraBrowser/res/layout/object_info.xml new file mode 100644 index 000000000000..a0499f267bfe --- /dev/null +++ b/media/tests/CameraBrowser/res/layout/object_info.xml @@ -0,0 +1,169 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> +<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/object_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <TableRow> + <TextView android:id="@+id/name_label" + android:text="@string/name_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/name" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/size_label" + android:text="@string/size_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/size" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/format_label" + android:text="@string/format_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/format" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/thumb_width_label" + android:text="@string/thumb_width_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/thumb_width" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/thumb_height_label" + android:text="@string/thumb_height_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/thumb_height" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/thumb_size_label" + android:text="@string/thumb_size_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/thumb_size" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/width_label" + android:text="@string/width_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/width" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/height_label" + android:text="@string/height_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/height" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/depth_label" + android:text="@string/depth_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/depth" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/sequence_label" + android:text="@string/sequence_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/sequence" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/created_label" + android:text="@string/created_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/created" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/modified_label" + android:text="@string/modified_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/modified" + style="@style/info_value" /> + </TableRow> + <TableRow> + <TextView android:id="@+id/keywords_label" + android:text="@string/keywords_label" + android:layout_gravity="right" + android:layout_marginRight="8dip" + style="@style/info_label" /> + + <TextView android:id="@+id/keywords" + style="@style/info_value" /> + </TableRow> + <TableRow> + <ImageView android:id="@+id/thumbnail" /> + </TableRow> + <TableRow> + <Button android:id="@+id/import_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/import_label"> + </Button> + <Button android:id="@+id/delete_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/delete_label"> + </Button> + </TableRow> +</TableLayout> + diff --git a/media/tests/CameraBrowser/res/layout/object_list.xml b/media/tests/CameraBrowser/res/layout/object_list.xml new file mode 100644 index 000000000000..30c18bb8a077 --- /dev/null +++ b/media/tests/CameraBrowser/res/layout/object_list.xml @@ -0,0 +1,33 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <ImageView android:id="@+id/thumbnail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" + android:gravity="center_vertical" + android:paddingLeft="6dip" + android:minHeight="?android:attr/listPreferredItemHeight" /> +</LinearLayout> diff --git a/media/tests/CameraBrowser/res/values/strings.xml b/media/tests/CameraBrowser/res/values/strings.xml new file mode 100644 index 000000000000..932aaecc626c --- /dev/null +++ b/media/tests/CameraBrowser/res/values/strings.xml @@ -0,0 +1,46 @@ +<?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. +--> + +<resources> + <string name="app_label">Camera Browser</string> + + <!-- for object info --> + <string name="name_label">Name: </string> + <string name="size_label">Size: </string> + <string name="format_label">Format: </string> + <string name="thumb_width_label">Thumb Width: </string> + <string name="thumb_height_label">Thumb Height: </string> + <string name="thumb_size_label">Thumb Size: </string> + <string name="width_label">Width: </string> + <string name="height_label">Height: </string> + <string name="depth_label">Depth: </string> + <string name="sequence_label">Sequence: </string> + <string name="created_label">Created: </string> + <string name="modified_label">Modified: </string> + <string name="keywords_label">Keywords: </string> + + <!-- button labels --> + <string name="import_label">Import</string> + <string name="delete_label">Delete</string> + + <!-- toasts --> + <string name="object_saved_message">Object saved</string> + <string name="save_failed_message">Could not save object</string> + <string name="object_deleted_message">Object deleted</string> + <string name="delete_failed_message">Could not delete object</string> + <string name="start_activity_failed_message">Import succeeded, but could not display object</string> + +</resources> diff --git a/media/tests/CameraBrowser/res/values/styles.xml b/media/tests/CameraBrowser/res/values/styles.xml new file mode 100644 index 000000000000..c869985af1d3 --- /dev/null +++ b/media/tests/CameraBrowser/res/values/styles.xml @@ -0,0 +1,34 @@ +<?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. +--> + +<resources> + <style name="info_label"> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:textSize">14sp</item> + <item name="android:textStyle">bold</item> + <item name="android:paddingRight">4dip</item> + </style> + + <style name="info_value"> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:textSize">14sp</item> + <item name="android:textStyle">normal</item> + </style> + +</resources> + diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java new file mode 100644 index 000000000000..f642d9308536 --- /dev/null +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/CameraBrowser.java @@ -0,0 +1,139 @@ +/* + * 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. + */ + +package com.android.camerabrowser; + +import android.app.ListActivity; +import android.content.ContentResolver; +import android.content.Context; +import android.content.Intent; +import android.mtp.MtpClient; +import android.mtp.MtpDevice; +import android.mtp.MtpDeviceInfo; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ListView; +import android.widget.TextView; +import android.widget.TwoLineListItem; + +import java.util.List; + + /** + * A list view displaying all connected cameras. + */ +public class CameraBrowser extends ListActivity implements MtpClient.Listener { + + private static final String TAG = "CameraBrowser"; + + private MtpClient mClient; + private List<MtpDevice> mDeviceList; + + private static final int MODEL_COLUMN = 0; + private static final int MANUFACTURER_COLUMN = 1; + private static final int COLUMN_COUNT = 2; + + private class CameraAdapter extends BaseAdapter { + private final Context mContext; + private final LayoutInflater mInflater; + + public CameraAdapter(Context c) { + mContext = c; + mInflater = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + } + + public int getCount() { + return mDeviceList.size(); + } + + public Object getItem(int position) { + return mDeviceList.get(position); + } + + public long getItemId(int position) { + return position; + } + + public View getView(int position, View convertView, ViewGroup parent) { + TwoLineListItem view; + if (convertView == null) { + view = (TwoLineListItem)mInflater.inflate( + android.R.layout.simple_list_item_2, parent, false); + } else { + view = (TwoLineListItem)convertView; + } + + TextView textView1 = (TextView)view.findViewById(com.android.internal.R.id.text1); + TextView textView2 = (TextView)view.findViewById(com.android.internal.R.id.text2); + MtpDevice device = mDeviceList.get(position); + MtpDeviceInfo info = device.getDeviceInfo(); + if (info != null) { + textView1.setText(info.getManufacturer()); + textView2.setText(info.getModel()); + } else { + textView1.setText("???"); + textView2.setText("???"); + } + return view; + } + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mClient = ((CameraBrowserApplication)getApplication()).getMtpClient(); + mClient.addListener(this); + mDeviceList = mClient.getDeviceList(); + } + + @Override + protected void onResume() { + super.onResume(); + reload(); + } + + @Override + protected void onDestroy() { + mClient.removeListener(this); + super.onDestroy(); + } + + @Override + protected void onListItemClick(ListView l, View v, int position, long id) { + Intent intent = new Intent(this, StorageBrowser.class); + intent.putExtra("device", mDeviceList.get(position).getDeviceName()); + startActivity(intent); + } + + private void reload() { + setListAdapter(new CameraAdapter(this)); + } + + public void deviceAdded(MtpDevice device) { + Log.d(TAG, "deviceAdded: " + device.getDeviceName()); + mDeviceList = mClient.getDeviceList(); + reload(); + } + + public void deviceRemoved(MtpDevice device) { + Log.d(TAG, "deviceRemoved: " + device.getDeviceName()); + mDeviceList = mClient.getDeviceList(); + reload(); + } +} diff --git a/drm/libdrmframework/include/DrmIOService.h b/media/tests/CameraBrowser/src/com/android/camerabrowser/CameraBrowserApplication.java index 244124e79124..6f1edfea2a3e 100644 --- a/drm/libdrmframework/include/DrmIOService.h +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/CameraBrowserApplication.java @@ -14,33 +14,28 @@ * limitations under the License. */ -#ifndef __DRM_IO_SERVICE_H__ -#define __DRM_IO_SERVICE_H__ +package com.android.camerabrowser; -#include "IDrmIOService.h" +import android.app.Application; +import android.mtp.MtpClient; -namespace android { -/** - * This is the implementation class for DRM IO service. - * - * The instance of this class is created while starting the DRM IO service. - * - */ -class DrmIOService : public BnDrmIOService { -public: - static void instantiate(); - -private: - DrmIOService(); - virtual ~DrmIOService(); +public class CameraBrowserApplication extends Application { -public: - void writeToFile(const String8& filePath, const String8& dataBuffer); - String8 readFromFile(const String8& filePath); -}; + private MtpClient mClient; -}; + @Override + public void onCreate() { + mClient = new MtpClient(this); + } -#endif /* __DRM_IO_SERVICE_H__ */ + @Override + public void onTerminate() { + mClient.close(); + mClient = null; + } + public MtpClient getMtpClient() { + return mClient; + } +} diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java new file mode 100644 index 000000000000..736af1f506f2 --- /dev/null +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/DeviceDisconnectedReceiver.java @@ -0,0 +1,52 @@ +/* + * 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. + */ + +package com.android.camerabrowser; + +import android.app.Activity; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.hardware.UsbManager; +import android.util.Log; + +public class DeviceDisconnectedReceiver extends BroadcastReceiver { + + private static final String TAG = "DeviceDisconnectedReceiver"; + + private final Activity mActivity; + private final String mDeviceName; + + public DeviceDisconnectedReceiver(Activity activity, String deviceName) { + mActivity = activity; + mDeviceName = deviceName; + + IntentFilter filter = new IntentFilter(UsbManager.ACTION_USB_DEVICE_DETACHED); + activity.registerReceiver(this, filter); + } + + @Override + public void onReceive(Context context, Intent intent) { + String deviceName = intent.getStringExtra(UsbManager.EXTRA_DEVICE_NAME); + Log.d(TAG, "ACTION_USB_DEVICE_DETACHED " + deviceName); + + // close our activity if the device it is displaying is disconnected + if (deviceName.equals(mDeviceName)) { + mActivity.finish(); + } + } +}
\ No newline at end of file diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java new file mode 100644 index 000000000000..82251d9213e5 --- /dev/null +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectBrowser.java @@ -0,0 +1,147 @@ +/* + * 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. + */ + +package com.android.camerabrowser; + +import android.app.ListActivity; +import android.content.Context; +import android.content.Intent; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.mtp.MtpClient; +import android.mtp.MtpConstants; +import android.mtp.MtpDevice; +import android.mtp.MtpObjectInfo; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.ListView; +import android.widget.TextView; + +import java.util.List; + + /** + * A list view displaying all objects within a container (folder or storage unit). + */ +public class ObjectBrowser extends ListActivity { + + private static final String TAG = "ObjectBrowser"; + + private MtpClient mClient; + private List<MtpObjectInfo> mObjectList; + private String mDeviceName; + private int mStorageID; + private int mObjectID; + private DeviceDisconnectedReceiver mDisconnectedReceiver; + + private class ObjectAdapter extends BaseAdapter { + private final Context mContext; + private final LayoutInflater mInflater; + + public ObjectAdapter(Context c) { + mContext = c; + mInflater = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + } + + public int getCount() { + if (mObjectList == null) { + return 0; + } else { + return mObjectList.size(); + } + } + + public Object getItem(int position) { + return mObjectList.get(position); + } + + public long getItemId(int position) { + return position; + } + + public View getView(int position, View convertView, ViewGroup parent) { + View view; + if (convertView == null) { + view = mInflater.inflate(R.layout.object_list, parent, false); + } else { + view = convertView; + } + + TextView nameView = (TextView)view.findViewById(R.id.name); + MtpObjectInfo info = mObjectList.get(position); + nameView.setText(info.getName()); + + int thumbFormat = info.getThumbFormat(); + if (thumbFormat == MtpConstants.FORMAT_EXIF_JPEG + || thumbFormat == MtpConstants.FORMAT_JFIF) { + byte[] thumbnail = mClient.getThumbnail(mDeviceName, info.getObjectHandle()); + if (thumbnail != null) { + Bitmap bitmap = BitmapFactory.decodeByteArray(thumbnail, 0, thumbnail.length); + if (bitmap != null) { + ImageView thumbView = (ImageView)view.findViewById(R.id.thumbnail); + thumbView.setImageBitmap(bitmap); + } + } + } + return view; + } + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mClient = ((CameraBrowserApplication)getApplication()).getMtpClient(); + mDeviceName = getIntent().getStringExtra("device"); + mStorageID = getIntent().getIntExtra("storage", 0); + mObjectID = getIntent().getIntExtra("object", 0); + mDisconnectedReceiver = new DeviceDisconnectedReceiver(this, mDeviceName); + } + + @Override + protected void onResume() { + super.onResume(); + + mObjectList = mClient.getObjectList(mDeviceName, mStorageID, mObjectID); + setListAdapter(new ObjectAdapter(this)); + } + + @Override + protected void onDestroy() { + unregisterReceiver(mDisconnectedReceiver); + super.onDestroy(); + } + + @Override + protected void onListItemClick(ListView l, View v, int position, long id) { + MtpObjectInfo info = mObjectList.get(position); + Intent intent; + if (info.getFormat() == MtpConstants.FORMAT_ASSOCIATION) { + intent = new Intent(this, ObjectBrowser.class); + } else { + intent = new Intent(this, ObjectViewer.class); + } + intent.putExtra("device", mDeviceName); + intent.putExtra("storage", mStorageID); + intent.putExtra("object", info.getObjectHandle()); + startActivity(intent); + } +} diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java new file mode 100644 index 000000000000..e9ea9f3a1bd8 --- /dev/null +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/ObjectViewer.java @@ -0,0 +1,203 @@ +/* + * 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. + */ + +package com.android.camerabrowser; + +import android.app.Activity; +import android.content.ActivityNotFoundException; +import android.content.Context; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.media.MediaScannerConnection; +import android.media.MediaScannerConnection.MediaScannerConnectionClient; +import android.mtp.MtpClient; +import android.mtp.MtpConstants; +import android.mtp.MtpObjectInfo; +import android.net.Uri; +import android.os.Bundle; +import android.os.Environment; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.TextView; +import android.widget.Toast; + +import java.io.File; +import java.util.Date; + +/** + * A view to display the properties of an object. + */ +public class ObjectViewer extends Activity implements View.OnClickListener { + + private static final String TAG = "ObjectViewer"; + + private MtpClient mClient; + private String mDeviceName; + private int mStorageID; + private int mObjectID; + private String mFileName; + private Button mImportButton; + private Button mDeleteButton; + private DeviceDisconnectedReceiver mDisconnectedReceiver; + + private final class ScannerClient implements MediaScannerConnectionClient { + private final Context mContext; + private String mPath; + + public ScannerClient(Context context) { + mContext = context; + } + + public void setScanPath(String path) { + mPath = path; + } + + @Override + public void onMediaScannerConnected() { + mScannerConnection.scanFile(mPath, null); + } + + @Override + public void onScanCompleted(String path, Uri uri) { + mScannerConnection.disconnect(); + + // try to start an activity to view the file + Intent intent = new Intent(Intent.ACTION_VIEW, uri); + try { + mContext.startActivity(intent); + } catch (ActivityNotFoundException e) { + Toast.makeText(mContext, R.string.start_activity_failed_message, + Toast.LENGTH_SHORT).show(); + } + } + } + + private MediaScannerConnection mScannerConnection; + private ScannerClient mScannerClient; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mClient = ((CameraBrowserApplication)getApplication()).getMtpClient(); + + setContentView(R.layout.object_info); + + mImportButton = (Button)findViewById(R.id.import_button); + mImportButton.setOnClickListener(this); + mDeleteButton = (Button)findViewById(R.id.delete_button); + mDeleteButton.setOnClickListener(this); + + mDeviceName = getIntent().getStringExtra("device"); + mStorageID = getIntent().getIntExtra("storage", 0); + mObjectID = getIntent().getIntExtra("object", 0); + mDisconnectedReceiver = new DeviceDisconnectedReceiver(this, mDeviceName); + mScannerClient = new ScannerClient(this); + mScannerConnection = new MediaScannerConnection(this, mScannerClient); + } + + @Override + protected void onResume() { + super.onResume(); + + MtpObjectInfo info = mClient.getObjectInfo(mDeviceName, mObjectID); + if (info != null) { + TextView view = (TextView)findViewById(R.id.name); + mFileName = info.getName(); + view.setText(mFileName); + view = (TextView)findViewById(R.id.format); + view.setText(Integer.toHexString(info.getFormat()).toUpperCase()); + view = (TextView)findViewById(R.id.size); + view.setText(Long.toString(info.getCompressedSize())); + view = (TextView)findViewById(R.id.thumb_width); + view.setText(Long.toString(info.getThumbPixWidth())); + view = (TextView)findViewById(R.id.thumb_height); + view.setText(Long.toString(info.getThumbPixHeight())); + view = (TextView)findViewById(R.id.thumb_size); + view.setText(Long.toString(info.getThumbCompressedSize())); + view = (TextView)findViewById(R.id.width); + view.setText(Long.toString(info.getImagePixWidth())); + view = (TextView)findViewById(R.id.height); + view.setText(Long.toString(info.getImagePixHeight())); + view = (TextView)findViewById(R.id.depth); + view.setText(Long.toString(info.getImagePixDepth())); + view = (TextView)findViewById(R.id.sequence); + view.setText(Long.toString(info.getSequenceNumber())); + view = (TextView)findViewById(R.id.created); + Date date = new Date(info.getDateCreated() * 1000); + view.setText(date.toString()); + view = (TextView)findViewById(R.id.modified); + date = new Date(info.getDateModified() * 1000); + view.setText(date.toString()); + view = (TextView)findViewById(R.id.keywords); + view.setText(info.getKeywords()); + int thumbFormat = info.getThumbFormat(); + if (thumbFormat == MtpConstants.FORMAT_EXIF_JPEG + || thumbFormat == MtpConstants.FORMAT_JFIF) { + byte[] thumbnail = mClient.getThumbnail(mDeviceName, info.getObjectHandle()); + if (thumbnail != null) { + Bitmap bitmap = BitmapFactory.decodeByteArray(thumbnail, 0, thumbnail.length); + if (bitmap != null) { + ImageView thumbView = (ImageView)findViewById(R.id.thumbnail); + thumbView.setImageBitmap(bitmap); + } + } + } + } + } + + @Override + protected void onDestroy() { + unregisterReceiver(mDisconnectedReceiver); + super.onDestroy(); + } + + private void importObject() { + // copy file to /mnt/sdcard/imported/<filename> + File dest = Environment.getExternalStorageDirectory(); + dest = new File(dest, "imported"); + dest.mkdirs(); + dest = new File(dest, mFileName); + + if (mClient.importFile(mDeviceName, mObjectID, dest.getAbsolutePath())) { + Toast.makeText(this, R.string.object_saved_message, Toast.LENGTH_SHORT).show(); + + mScannerClient.setScanPath(dest.getAbsolutePath()); + mScannerConnection.connect(); + } else { + Toast.makeText(this, R.string.save_failed_message, Toast.LENGTH_SHORT).show(); + } + } + + private void deleteObject() { + if (mClient.deleteObject(mDeviceName, mObjectID)) { + Toast.makeText(this, R.string.object_deleted_message, Toast.LENGTH_SHORT).show(); + finish(); + } else { + Toast.makeText(this, R.string.delete_failed_message, Toast.LENGTH_SHORT).show(); + } + } + + public void onClick(View v) { + if (v == mImportButton) { + importObject(); + } else if (v == mDeleteButton) { + deleteObject(); + } + } +} diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java new file mode 100644 index 000000000000..7d5a5dace7ad --- /dev/null +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/StorageBrowser.java @@ -0,0 +1,121 @@ +/* + * 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. + */ + +package com.android.camerabrowser; + +import android.app.ListActivity; +import android.content.Context; +import android.content.Intent; +import android.mtp.MtpClient; +import android.mtp.MtpDevice; +import android.mtp.MtpStorageInfo; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ListView; +import android.widget.TextView; + +import java.util.List; + +/** + * A list view displaying all storage units on a device. + */ +public class StorageBrowser extends ListActivity { + + private static final String TAG = "StorageBrowser"; + + private MtpClient mClient; + private String mDeviceName; + private List<MtpStorageInfo> mStorageList; + private DeviceDisconnectedReceiver mDisconnectedReceiver; + + private class StorageAdapter extends BaseAdapter { + private final Context mContext; + private final LayoutInflater mInflater; + + public StorageAdapter(Context c) { + mContext = c; + mInflater = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + } + + public int getCount() { + if (mStorageList == null) { + return 0; + } else { + return mStorageList.size(); + } + } + + public Object getItem(int position) { + return mStorageList.get(position); + } + + public long getItemId(int position) { + return position; + } + + public View getView(int position, View convertView, ViewGroup parent) { + TextView view; + if (convertView == null) { + view = (TextView)mInflater.inflate( + android.R.layout.simple_list_item_1, parent, false); + } else { + view = (TextView)convertView; + } + + MtpStorageInfo info = mStorageList.get(position); + if (info != null) { + view.setText(info.getDescription()); + } else { + view.setText("???"); + } + return view; + } + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + mClient = ((CameraBrowserApplication)getApplication()).getMtpClient(); + mDeviceName = getIntent().getStringExtra("device"); + mDisconnectedReceiver = new DeviceDisconnectedReceiver(this, mDeviceName); + } + + @Override + protected void onResume() { + super.onResume(); + mStorageList = mClient.getStorageList(mDeviceName); + setListAdapter(new StorageAdapter(this)); + } + + @Override + protected void onDestroy() { + unregisterReceiver(mDisconnectedReceiver); + super.onDestroy(); + } + + @Override + protected void onListItemClick(ListView l, View v, int position, long id) { + Intent intent = new Intent(this, ObjectBrowser.class); + intent.putExtra("device", mDeviceName); + intent.putExtra("storage", mStorageList.get(position).getStorageId()); + startActivity(intent); + } +} diff --git a/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java b/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java new file mode 100644 index 000000000000..22d9443af6ee --- /dev/null +++ b/media/tests/CameraBrowser/src/com/android/camerabrowser/UsbReceiver.java @@ -0,0 +1,48 @@ +/* + * 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. + */ + +package com.android.camerabrowser; + +import android.content.Context; +import android.content.Intent; +import android.content.BroadcastReceiver; +import android.hardware.UsbDevice; +import android.hardware.UsbManager; +import android.mtp.MtpClient; +import android.os.Bundle; +import android.os.Parcelable; +import android.util.Log; + +public class UsbReceiver extends BroadcastReceiver +{ + private static final String TAG = "UsbReceiver"; + + @Override + public void onReceive(Context context, Intent intent) { + Log.d(TAG, "onReceive " + intent); + if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(intent.getAction())) { + UsbDevice device = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); + if (MtpClient.isCamera(device)) { + String deviceName = device.getDeviceName(); + Log.d(TAG, "Got camera: " + deviceName); + intent = new Intent(context, StorageBrowser.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + intent.putExtra("device", deviceName); + context.startActivity(intent); + } + } + } +} diff --git a/native/include/android/input.h b/native/include/android/input.h index e196686ea37d..bad363d21471 100644 --- a/native/include/android/input.h +++ b/native/include/android/input.h @@ -333,6 +333,7 @@ enum { AINPUT_SOURCE_CLASS_POINTER = 0x00000002, AINPUT_SOURCE_CLASS_NAVIGATION = 0x00000004, AINPUT_SOURCE_CLASS_POSITION = 0x00000008, + AINPUT_SOURCE_CLASS_JOYSTICK = 0x00000010, }; enum { @@ -340,10 +341,12 @@ enum { AINPUT_SOURCE_KEYBOARD = 0x00000100 | AINPUT_SOURCE_CLASS_BUTTON, AINPUT_SOURCE_DPAD = 0x00000200 | AINPUT_SOURCE_CLASS_BUTTON, + AINPUT_SOURCE_GAMEPAD = 0x00000400 | AINPUT_SOURCE_CLASS_BUTTON, AINPUT_SOURCE_TOUCHSCREEN = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER, AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER, AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION, AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION, + AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK, AINPUT_SOURCE_ANY = 0xffffff00, }; diff --git a/native/include/android/keycodes.h b/native/include/android/keycodes.h index b026a0c9421b..c4a7eff947b1 100644 --- a/native/include/android/keycodes.h +++ b/native/include/android/keycodes.h @@ -231,6 +231,22 @@ enum { AKEYCODE_PROG_YELLOW = 185, AKEYCODE_PROG_BLUE = 186, AKEYCODE_APP_SWITCH = 187, + AKEYCODE_BUTTON_1 = 188, + AKEYCODE_BUTTON_2 = 189, + AKEYCODE_BUTTON_3 = 190, + AKEYCODE_BUTTON_4 = 191, + AKEYCODE_BUTTON_5 = 192, + AKEYCODE_BUTTON_6 = 193, + AKEYCODE_BUTTON_7 = 194, + AKEYCODE_BUTTON_8 = 195, + AKEYCODE_BUTTON_9 = 196, + AKEYCODE_BUTTON_10 = 197, + AKEYCODE_BUTTON_11 = 198, + AKEYCODE_BUTTON_12 = 199, + AKEYCODE_BUTTON_13 = 200, + AKEYCODE_BUTTON_14 = 201, + AKEYCODE_BUTTON_15 = 202, + AKEYCODE_BUTTON_16 = 203, // NOTE: If you add a new keycode here you must also add it to several other files. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. diff --git a/opengl/java/android/opengl/GLErrorWrapper.java b/opengl/java/android/opengl/GLErrorWrapper.java index 9b66e497ae0d..66159a82b665 100644 --- a/opengl/java/android/opengl/GLErrorWrapper.java +++ b/opengl/java/android/opengl/GLErrorWrapper.java @@ -1377,5 +1377,287 @@ class GLErrorWrapper extends GLWrapperBase { checkError(); } + @Override + public void glBindFramebufferOES(int target, int framebuffer) { + checkThread(); + mgl11ExtensionPack.glBindFramebufferOES(target, framebuffer); + checkError(); + } + + @Override + public void glBindRenderbufferOES(int target, int renderbuffer) { + checkThread(); + mgl11ExtensionPack.glBindRenderbufferOES(target, renderbuffer); + checkError(); + } + + @Override + public void glBlendEquation(int mode) { + checkThread(); + mgl11ExtensionPack.glBlendEquation(mode); + checkError(); + } + + @Override + public void glBlendEquationSeparate(int modeRGB, int modeAlpha) { + checkThread(); + mgl11ExtensionPack.glBlendEquationSeparate(modeRGB, modeAlpha); + checkError(); + } + + @Override + public void glBlendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, + int dstAlpha) { + checkThread(); + mgl11ExtensionPack.glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha); + checkError(); + } + + @Override + public int glCheckFramebufferStatusOES(int target) { + checkThread(); + int result = mgl11ExtensionPack.glCheckFramebufferStatusOES(target); + checkError(); + return result; + } + + @Override + public void glDeleteFramebuffersOES(int n, int[] framebuffers, int offset) { + checkThread(); + mgl11ExtensionPack.glDeleteFramebuffersOES(n, framebuffers, offset); + checkError(); + } + + @Override + public void glDeleteFramebuffersOES(int n, IntBuffer framebuffers) { + checkThread(); + mgl11ExtensionPack.glDeleteFramebuffersOES(n, framebuffers); + checkError(); + } + + @Override + public void glDeleteRenderbuffersOES(int n, int[] renderbuffers, int offset) { + checkThread(); + mgl11ExtensionPack.glDeleteRenderbuffersOES(n, renderbuffers, offset); + checkError(); + } + + @Override + public void glDeleteRenderbuffersOES(int n, IntBuffer renderbuffers) { + checkThread(); + mgl11ExtensionPack.glDeleteRenderbuffersOES(n, renderbuffers); + checkError(); + } + + @Override + public void glFramebufferRenderbufferOES(int target, int attachment, + int renderbuffertarget, int renderbuffer) { + checkThread(); + mgl11ExtensionPack.glFramebufferRenderbufferOES(target, attachment, renderbuffertarget, renderbuffer); + checkError(); + } + + @Override + public void glFramebufferTexture2DOES(int target, int attachment, + int textarget, int texture, int level) { + checkThread(); + mgl11ExtensionPack.glFramebufferTexture2DOES(target, attachment, textarget, texture, level); + checkError(); + } + + @Override + public void glGenerateMipmapOES(int target) { + checkThread(); + mgl11ExtensionPack.glGenerateMipmapOES(target); + checkError(); + } + + @Override + public void glGenFramebuffersOES(int n, int[] framebuffers, int offset) { + checkThread(); + mgl11ExtensionPack.glGenFramebuffersOES(n, framebuffers, offset); + checkError(); + } + + @Override + public void glGenFramebuffersOES(int n, IntBuffer framebuffers) { + checkThread(); + mgl11ExtensionPack.glGenFramebuffersOES(n, framebuffers); + checkError(); + } + + @Override + public void glGenRenderbuffersOES(int n, int[] renderbuffers, int offset) { + checkThread(); + mgl11ExtensionPack.glGenRenderbuffersOES(n, renderbuffers, offset); + checkError(); + } + + @Override + public void glGenRenderbuffersOES(int n, IntBuffer renderbuffers) { + checkThread(); + mgl11ExtensionPack.glGenRenderbuffersOES(n, renderbuffers); + checkError(); + } + + @Override + public void glGetFramebufferAttachmentParameterivOES(int target, + int attachment, int pname, int[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glGetFramebufferAttachmentParameterivOES(target, attachment, pname, params, offset); + checkError(); + } + + @Override + public void glGetFramebufferAttachmentParameterivOES(int target, + int attachment, int pname, IntBuffer params) { + checkThread(); + mgl11ExtensionPack.glGetFramebufferAttachmentParameterivOES(target, attachment, pname, params); + checkError(); + } + + @Override + public void glGetRenderbufferParameterivOES(int target, int pname, + int[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glGetRenderbufferParameterivOES(target, pname, params, offset); + checkError(); + } + + @Override + public void glGetRenderbufferParameterivOES(int target, int pname, + IntBuffer params) { + checkThread(); + mgl11ExtensionPack.glGetRenderbufferParameterivOES(target, pname, params); + checkError(); + } + + @Override + public void glGetTexGenfv(int coord, int pname, float[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glGetTexGenfv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glGetTexGenfv(int coord, int pname, FloatBuffer params) { + checkThread(); + mgl11ExtensionPack.glGetTexGenfv(coord, pname, params); + checkError(); + } + + @Override + public void glGetTexGeniv(int coord, int pname, int[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glGetTexGeniv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glGetTexGeniv(int coord, int pname, IntBuffer params) { + checkThread(); + mgl11ExtensionPack.glGetTexGeniv(coord, pname, params); + checkError(); + } + + @Override + public void glGetTexGenxv(int coord, int pname, int[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glGetTexGenxv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glGetTexGenxv(int coord, int pname, IntBuffer params) { + checkThread(); + mgl11ExtensionPack.glGetTexGenxv(coord, pname, params); + checkError(); + } + + @Override + public boolean glIsFramebufferOES(int framebuffer) { + checkThread(); + boolean result = mgl11ExtensionPack.glIsFramebufferOES(framebuffer); + checkError(); + return result; + } + + @Override + public boolean glIsRenderbufferOES(int renderbuffer) { + checkThread(); + mgl11ExtensionPack.glIsRenderbufferOES(renderbuffer); + checkError(); + return false; + } + @Override + public void glRenderbufferStorageOES(int target, int internalformat, + int width, int height) { + checkThread(); + mgl11ExtensionPack.glRenderbufferStorageOES(target, internalformat, width, height); + checkError(); + } + + @Override + public void glTexGenf(int coord, int pname, float param) { + checkThread(); + mgl11ExtensionPack.glTexGenf(coord, pname, param); + checkError(); + } + + @Override + public void glTexGenfv(int coord, int pname, float[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glTexGenfv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glTexGenfv(int coord, int pname, FloatBuffer params) { + checkThread(); + mgl11ExtensionPack.glTexGenfv(coord, pname, params); + checkError(); + } + + @Override + public void glTexGeni(int coord, int pname, int param) { + checkThread(); + mgl11ExtensionPack.glTexGeni(coord, pname, param); + checkError(); + } + + @Override + public void glTexGeniv(int coord, int pname, int[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glTexGeniv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glTexGeniv(int coord, int pname, IntBuffer params) { + checkThread(); + mgl11ExtensionPack.glTexGeniv(coord, pname, params); + checkError(); + } + + @Override + public void glTexGenx(int coord, int pname, int param) { + checkThread(); + mgl11ExtensionPack.glTexGenx(coord, pname, param); + checkError(); + } + + @Override + public void glTexGenxv(int coord, int pname, int[] params, int offset) { + checkThread(); + mgl11ExtensionPack.glTexGenxv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glTexGenxv(int coord, int pname, IntBuffer params) { + checkThread(); + mgl11ExtensionPack.glTexGenxv(coord, pname, params); + checkError(); + } } diff --git a/opengl/java/android/opengl/GLLogWrapper.java b/opengl/java/android/opengl/GLLogWrapper.java index 6e97f6775c9b..bff739636b3e 100644 --- a/opengl/java/android/opengl/GLLogWrapper.java +++ b/opengl/java/android/opengl/GLLogWrapper.java @@ -3447,6 +3447,444 @@ class GLLogWrapper extends GLWrapperBase { checkError(); } + @Override + public void glBindFramebufferOES(int target, int framebuffer) { + begin("glBindFramebufferOES"); + arg("target", target); + arg("framebuffer", framebuffer); + end(); + mgl11ExtensionPack.glBindFramebufferOES(target, framebuffer); + checkError(); + } + + @Override + public void glBindRenderbufferOES(int target, int renderbuffer) { + begin("glBindRenderbufferOES"); + arg("target", target); + arg("renderbuffer", renderbuffer); + end(); + mgl11ExtensionPack.glBindRenderbufferOES(target, renderbuffer); + checkError(); + } + + @Override + public void glBlendEquation(int mode) { + begin("glBlendEquation"); + arg("mode", mode); + end(); + mgl11ExtensionPack.glBlendEquation(mode); + checkError(); + } + + @Override + public void glBlendEquationSeparate(int modeRGB, int modeAlpha) { + begin("glBlendEquationSeparate"); + arg("modeRGB", modeRGB); + arg("modeAlpha", modeAlpha); + end(); + mgl11ExtensionPack.glBlendEquationSeparate(modeRGB, modeAlpha); + checkError(); + } + + @Override + public void glBlendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, + int dstAlpha) { + begin("glBlendFuncSeparate"); + arg("srcRGB", srcRGB); + arg("dstRGB", dstRGB); + arg("srcAlpha", srcAlpha); + arg("dstAlpha", dstAlpha); + end(); + mgl11ExtensionPack.glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha); + checkError(); + } + + @Override + public int glCheckFramebufferStatusOES(int target) { + begin("glCheckFramebufferStatusOES"); + arg("target", target); + end(); + int result = mgl11ExtensionPack.glCheckFramebufferStatusOES(target); + checkError(); + return result; + } + + @Override + public void glDeleteFramebuffersOES(int n, int[] framebuffers, int offset) { + begin("glDeleteFramebuffersOES"); + arg("n", n); + arg("framebuffers", framebuffers.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glDeleteFramebuffersOES(n, framebuffers, offset); + checkError(); + } + + @Override + public void glDeleteFramebuffersOES(int n, IntBuffer framebuffers) { + begin("glDeleteFramebuffersOES"); + arg("n", n); + arg("framebuffers", framebuffers.toString()); + end(); + mgl11ExtensionPack.glDeleteFramebuffersOES(n, framebuffers); + checkError(); + } + + @Override + public void glDeleteRenderbuffersOES(int n, int[] renderbuffers, int offset) { + begin("glDeleteRenderbuffersOES"); + arg("n", n); + arg("renderbuffers", renderbuffers.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glDeleteRenderbuffersOES(n, renderbuffers, offset); + checkError(); + } + + @Override + public void glDeleteRenderbuffersOES(int n, IntBuffer renderbuffers) { + begin("glDeleteRenderbuffersOES"); + arg("n", n); + arg("renderbuffers", renderbuffers.toString()); + end(); + mgl11ExtensionPack.glDeleteRenderbuffersOES(n, renderbuffers); + checkError(); + } + + @Override + public void glFramebufferRenderbufferOES(int target, int attachment, + int renderbuffertarget, int renderbuffer) { + begin("glFramebufferRenderbufferOES"); + arg("target", target); + arg("attachment", attachment); + arg("renderbuffertarget", renderbuffertarget); + arg("renderbuffer", renderbuffer); + end(); + mgl11ExtensionPack.glFramebufferRenderbufferOES(target, attachment, renderbuffertarget, renderbuffer); + checkError(); + } + + @Override + public void glFramebufferTexture2DOES(int target, int attachment, + int textarget, int texture, int level) { + begin("glFramebufferTexture2DOES"); + arg("target", target); + arg("attachment", attachment); + arg("textarget", textarget); + arg("texture", texture); + arg("level", level); + end(); + mgl11ExtensionPack.glFramebufferTexture2DOES(target, attachment, textarget, texture, level); + checkError(); + } + + @Override + public void glGenerateMipmapOES(int target) { + begin("glGenerateMipmapOES"); + arg("target", target); + end(); + mgl11ExtensionPack.glGenerateMipmapOES(target); + checkError(); + } + + @Override + public void glGenFramebuffersOES(int n, int[] framebuffers, int offset) { + begin("glGenFramebuffersOES"); + arg("n", n); + arg("framebuffers", framebuffers.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGenFramebuffersOES(n, framebuffers, offset); + checkError(); + } + + @Override + public void glGenFramebuffersOES(int n, IntBuffer framebuffers) { + begin("glGenFramebuffersOES"); + arg("n", n); + arg("framebuffers", framebuffers.toString()); + end(); + mgl11ExtensionPack.glGenFramebuffersOES(n, framebuffers); + checkError(); + } + + @Override + public void glGenRenderbuffersOES(int n, int[] renderbuffers, int offset) { + begin("glGenRenderbuffersOES"); + arg("n", n); + arg("renderbuffers", renderbuffers.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGenRenderbuffersOES(n, renderbuffers, offset); + checkError(); + } + + @Override + public void glGenRenderbuffersOES(int n, IntBuffer renderbuffers) { + begin("glGenRenderbuffersOES"); + arg("n", n); + arg("renderbuffers", renderbuffers.toString()); + end(); + mgl11ExtensionPack.glGenRenderbuffersOES(n, renderbuffers); + checkError(); + } + + @Override + public void glGetFramebufferAttachmentParameterivOES(int target, + int attachment, int pname, int[] params, int offset) { + begin("glGetFramebufferAttachmentParameterivOES"); + arg("target", target); + arg("attachment", attachment); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGetFramebufferAttachmentParameterivOES(target, attachment, pname, params, offset); + checkError(); + } + + @Override + public void glGetFramebufferAttachmentParameterivOES(int target, + int attachment, int pname, IntBuffer params) { + begin("glGetFramebufferAttachmentParameterivOES"); + arg("target", target); + arg("attachment", attachment); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glGetFramebufferAttachmentParameterivOES(target, attachment, pname, params); + checkError(); + } + + @Override + public void glGetRenderbufferParameterivOES(int target, int pname, + int[] params, int offset) { + begin("glGetRenderbufferParameterivOES"); + arg("target", target); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGetRenderbufferParameterivOES(target, pname, params, offset); + checkError(); + } + + @Override + public void glGetRenderbufferParameterivOES(int target, int pname, + IntBuffer params) { + begin("glGetRenderbufferParameterivOES"); + arg("target", target); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glGetRenderbufferParameterivOES(target, pname, params); + checkError(); + } + + @Override + public void glGetTexGenfv(int coord, int pname, float[] params, int offset) { + begin("glGetTexGenfv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGetTexGenfv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glGetTexGenfv(int coord, int pname, FloatBuffer params) { + begin("glGetTexGenfv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glGetTexGenfv(coord, pname, params); + checkError(); + } + + @Override + public void glGetTexGeniv(int coord, int pname, int[] params, int offset) { + begin("glGetTexGeniv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGetTexGeniv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glGetTexGeniv(int coord, int pname, IntBuffer params) { + begin("glGetTexGeniv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glGetTexGeniv(coord, pname, params); + checkError(); + } + + @Override + public void glGetTexGenxv(int coord, int pname, int[] params, int offset) { + begin("glGetTexGenxv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glGetTexGenxv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glGetTexGenxv(int coord, int pname, IntBuffer params) { + begin("glGetTexGenxv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glGetTexGenxv(coord, pname, params); + checkError(); + } + + @Override + public boolean glIsFramebufferOES(int framebuffer) { + begin("glIsFramebufferOES"); + arg("framebuffer", framebuffer); + end(); + boolean result = mgl11ExtensionPack.glIsFramebufferOES(framebuffer); + checkError(); + return result; + } + + @Override + public boolean glIsRenderbufferOES(int renderbuffer) { + begin("glIsRenderbufferOES"); + arg("renderbuffer", renderbuffer); + end(); + mgl11ExtensionPack.glIsRenderbufferOES(renderbuffer); + checkError(); + return false; + } + + @Override + public void glRenderbufferStorageOES(int target, int internalformat, + int width, int height) { + begin("glRenderbufferStorageOES"); + arg("target", target); + arg("internalformat", internalformat); + arg("width", width); + arg("height", height); + end(); + mgl11ExtensionPack.glRenderbufferStorageOES(target, internalformat, width, height); + checkError(); + } + + @Override + public void glTexGenf(int coord, int pname, float param) { + begin("glTexGenf"); + arg("coord", coord); + arg("pname", pname); + arg("param", param); + end(); + mgl11ExtensionPack.glTexGenf(coord, pname, param); + checkError(); + } + + @Override + public void glTexGenfv(int coord, int pname, float[] params, int offset) { + begin("glTexGenfv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glTexGenfv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glTexGenfv(int coord, int pname, FloatBuffer params) { + begin("glTexGenfv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glTexGenfv(coord, pname, params); + checkError(); + } + + @Override + public void glTexGeni(int coord, int pname, int param) { + begin("glTexGeni"); + arg("coord", coord); + arg("pname", pname); + arg("param", param); + end(); + mgl11ExtensionPack.glTexGeni(coord, pname, param); + checkError(); + } + + @Override + public void glTexGeniv(int coord, int pname, int[] params, int offset) { + begin("glTexGeniv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glTexGeniv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glTexGeniv(int coord, int pname, IntBuffer params) { + begin("glTexGeniv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glTexGeniv(coord, pname, params); + checkError(); + } + + @Override + public void glTexGenx(int coord, int pname, int param) { + begin("glTexGenx"); + arg("coord", coord); + arg("pname", pname); + arg("param", param); + end(); + mgl11ExtensionPack.glTexGenx(coord, pname, param); + checkError(); + } + + @Override + public void glTexGenxv(int coord, int pname, int[] params, int offset) { + begin("glTexGenxv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + arg("offset", offset); + end(); + mgl11ExtensionPack.glTexGenxv(coord, pname, params, offset); + checkError(); + } + + @Override + public void glTexGenxv(int coord, int pname, IntBuffer params) { + begin("glTexGenxv"); + arg("coord", coord); + arg("pname", pname); + arg("params", params.toString()); + end(); + mgl11ExtensionPack.glTexGenxv(coord, pname, params); + checkError(); + } + private class PointerInfo { /** * The number of coordinates per vertex. 1..4 diff --git a/opengl/java/android/opengl/GLWrapperBase.java b/opengl/java/android/opengl/GLWrapperBase.java index b0f83f7b2f14..cf252f9cc5d6 100644 --- a/opengl/java/android/opengl/GLWrapperBase.java +++ b/opengl/java/android/opengl/GLWrapperBase.java @@ -28,7 +28,7 @@ import javax.microedition.khronos.opengles.GL11ExtensionPack; * some convenient instance variables and default implementations. */ abstract class GLWrapperBase - implements GL, GL10, GL10Ext, GL11, GL11Ext { + implements GL, GL10, GL10Ext, GL11, GL11Ext, GL11ExtensionPack { public GLWrapperBase(GL gl) { mgl = (GL10) gl; if (gl instanceof GL10Ext) { diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index b5e59353a201..5f01f4d56e66 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"التنبيهات"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"حديثة"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"ليس هناك أية تطبيقات حديثة."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"التطبيقات"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-bg-xlarge/strings.xml b/packages/SystemUI/res/values-bg-xlarge/strings.xml index 9ddb662b140c..8dd6d7cb99bc 100644 --- a/packages/SystemUI/res/values-bg-xlarge/strings.xml +++ b/packages/SystemUI/res/values-bg-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Изч. на вс."</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Изчистване на всичко"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Няма връзка с интернет"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: има връзка"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index a31af2210a8e..aa98f7df40d2 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Известия"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Скорошни"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Няма скорошни приложения."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Приложения"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca-xlarge/strings.xml b/packages/SystemUI/res/values-ca-xlarge/strings.xml index 26b46518ae2d..289a2a361df8 100644 --- a/packages/SystemUI/res/values-ca-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ca-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Esborra-ho"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Esborra-ho tot"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"No connexió Internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: connectat"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 1596717e8485..583044db0977 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificacions"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recents"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"No hi ha aplicacions recents."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplicacions"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs-land/strings.xml b/packages/SystemUI/res/values-cs-land/strings.xml deleted file mode 100644 index 0d7682d2d181..000000000000 --- a/packages/SystemUI/res/values-cs-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Obrazovka je nyní uzamčena v orientaci na šířku."</string> -</resources> diff --git a/packages/SystemUI/res/values-cs-xlarge/strings.xml b/packages/SystemUI/res/values-cs-xlarge/strings.xml index 47a9e5c3178b..b25779275dc0 100644 --- a/packages/SystemUI/res/values-cs-xlarge/strings.xml +++ b/packages/SystemUI/res/values-cs-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Vymazat vše"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Žádné připojení"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: připojeno"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index cb1520ebf742..ea5694dbe443 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Oznámení"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Nejnovější"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Žádné nedávno použité aplikace."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplikace"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-da-land/strings.xml b/packages/SystemUI/res/values-da-land/strings.xml deleted file mode 100644 index 0bc7522e7b4d..000000000000 --- a/packages/SystemUI/res/values-da-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Skærmen er nu låst i liggende retning."</string> -</resources> diff --git a/packages/SystemUI/res/values-da-xlarge/strings.xml b/packages/SystemUI/res/values-da-xlarge/strings.xml index c99afbdf7375..78107abcfc4a 100644 --- a/packages/SystemUI/res/values-da-xlarge/strings.xml +++ b/packages/SystemUI/res/values-da-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Ryd alt"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Ingen internetforb."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi er forbundet"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index bb36ad764086..b95c6cb1bcad 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Meddelelser"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Seneste"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Der er ingen nye programmer."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Programmer"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-de-land/strings.xml b/packages/SystemUI/res/values-de-land/strings.xml deleted file mode 100644 index d4ce8fbbc5ff..000000000000 --- a/packages/SystemUI/res/values-de-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Der Bildschirm ist jetzt im Querformat gesperrt."</string> -</resources> diff --git a/packages/SystemUI/res/values-de-xlarge/strings.xml b/packages/SystemUI/res/values-de-xlarge/strings.xml index b8fa3d66ffce..73c563c3a4b5 100644 --- a/packages/SystemUI/res/values-de-xlarge/strings.xml +++ b/packages/SystemUI/res/values-de-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Alle löschen"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Keine Internetverbindung"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Mit WLAN verbunden"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 53fedbdce58e..4043c2e03acf 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Benachrichtigungen"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Zuletzt verwendet"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Keine neuen Anwendungen"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Apps"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-el-land/strings.xml b/packages/SystemUI/res/values-el-land/strings.xml deleted file mode 100644 index b30a36e7e9e2..000000000000 --- a/packages/SystemUI/res/values-el-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Η οθόνη έχει κλειδωθεί σε οριζόντιο προσανατολισμό."</string> -</resources> diff --git a/packages/SystemUI/res/values-el-xlarge/strings.xml b/packages/SystemUI/res/values-el-xlarge/strings.xml index bbf7637448d4..41f61e21af79 100644 --- a/packages/SystemUI/res/values-el-xlarge/strings.xml +++ b/packages/SystemUI/res/values-el-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Διαγ. όλων"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Χωρίς σύνδ. σε Διαδ."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: συνδέθηκε"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 4b527b11bec6..39a462c37f8d 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Ειδοποιήσεις"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Πρόσφατα"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Δεν υπάρχουν πρόσφατες εφαρμογές."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Εφαρμογές"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index cd7f0a20aab4..72373bbc03ae 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifications"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"No recent applications."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Apps"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-es-land/strings.xml b/packages/SystemUI/res/values-es-land/strings.xml deleted file mode 100644 index 971f062214ce..000000000000 --- a/packages/SystemUI/res/values-es-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"La pantalla está ahora bloqueada en orientación horizontal."</string> -</resources> diff --git a/packages/SystemUI/res/values-es-rUS-land/strings.xml b/packages/SystemUI/res/values-es-rUS-land/strings.xml deleted file mode 100644 index 7be086d34e11..000000000000 --- a/packages/SystemUI/res/values-es-rUS-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"La pantalla está bloqueada en orientación paisaje."</string> -</resources> diff --git a/packages/SystemUI/res/values-es-rUS-xlarge-land/strings.xml b/packages/SystemUI/res/values-es-rUS-xlarge-land/strings.xml new file mode 100644 index 000000000000..78a4c180fffb --- /dev/null +++ b/packages/SystemUI/res/values-es-rUS-xlarge-land/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- XL --> + <string name="toast_rotation_locked" msgid="2686639138967158852">"La pantalla está bloqueada en orientación paisaje."</string> +</resources> diff --git a/packages/SystemUI/res/values-es-rUS-xlarge-port/strings.xml b/packages/SystemUI/res/values-es-rUS-xlarge-port/strings.xml new file mode 100644 index 000000000000..9daef6a93164 --- /dev/null +++ b/packages/SystemUI/res/values-es-rUS-xlarge-port/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- XL --> + <string name="toast_rotation_locked" msgid="4297721709987511908">"La pantalla está bloqueada en orientación retrato."</string> +</resources> diff --git a/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml b/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml index 00b951ef08b8..f29259aebc28 100644 --- a/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml +++ b/packages/SystemUI/res/values-es-rUS-xlarge/strings.xml @@ -1,25 +1,16 @@ <?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. - */ - --> - <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Eliminar todos"</string> - <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Sin conexión a Int."</string> - <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"WiFi conectado"</string> + <!-- XL xlarge --> + <string name="status_bar_clear_all_button" msgid="4341545325987974494">"Eliminar todos"</string> + <!-- XL --> + <string name="status_bar_no_notifications_title" msgid="2492933749414725897">"No tienes notificaciones"</string> + <!-- XL --> + <string name="status_bar_settings_rotation_lock" msgid="9125161825884157545">"Bloquear orient. de pant."</string> + <!-- XL --> + <string name="recent_tasks_app_label" msgid="5550538721034982973">"Google Apps"</string> + <!-- XL xlarge --> + <string name="status_bar_settings_signal_meter_disconnected" msgid="4866302415753953027">"Sin conexión a Internet"</string> + <!-- XL xlarge --> + <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="3832182580451976589">"Wi-Fi conectado"</string> </resources> diff --git a/packages/SystemUI/res/values-es-xlarge/strings.xml b/packages/SystemUI/res/values-es-xlarge/strings.xml index a544f791ee9e..935fdbc3165f 100644 --- a/packages/SystemUI/res/values-es-xlarge/strings.xml +++ b/packages/SystemUI/res/values-es-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Borrar todo"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Sin conexión a Internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Con conexión WiFi"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 97371a41d43a..3acfb4598b82 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificaciones"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Reciente"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"No hay aplicaciones recientes."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplicaciones"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index eae022cbcd96..0528d6862d7a 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"اعلان ها"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"اخیر"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"برنامه اخیری موجود نیست."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"برنامه های کاربردی"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 1eb3c167d928..1ce102a6ca05 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Ilmoitukset"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Viimeisimmät"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Ei viimeaikaisia sovelluksia."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Sovellukset"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-land/strings.xml b/packages/SystemUI/res/values-fr-land/strings.xml deleted file mode 100644 index 307b4bcd84f2..000000000000 --- a/packages/SystemUI/res/values-fr-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"L\'écran est désormais verrouillé au format paysage."</string> -</resources> diff --git a/packages/SystemUI/res/values-fr-xlarge/strings.xml b/packages/SystemUI/res/values-fr-xlarge/strings.xml index 371a9dc41c6c..76e72211e728 100644 --- a/packages/SystemUI/res/values-fr-xlarge/strings.xml +++ b/packages/SystemUI/res/values-fr-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Tout effacer"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Aucune connexion Internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Connecté au Wi-Fi"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 83e070e87930..12308fb1980e 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifications"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Récentes"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Aucune application récente"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Applications"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index d481c4881a88..411336a787ec 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Obavijesti"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Nedavni"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nema nedavnih aplikacija."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplikacije"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu-xlarge/strings.xml b/packages/SystemUI/res/values-hu-xlarge/strings.xml index debf90640df6..d49266f1bba6 100644 --- a/packages/SystemUI/res/values-hu-xlarge/strings.xml +++ b/packages/SystemUI/res/values-hu-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Össz.törl."</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Az összes törlése"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Nincs internetkapcs."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi csatlakozva"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 7b98c472d46f..b82aa77fede5 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Értesítések"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Legutóbbiak"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nincsenek nemrég használt alkalmazások"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Alkalmazások"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index a7926d722843..db170ab631c3 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Pemberitahuan"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Terbaru"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Tidak ada aplikasi terbaru."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Apps"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-it-land/strings.xml b/packages/SystemUI/res/values-it-land/strings.xml deleted file mode 100644 index 0225572bce4e..000000000000 --- a/packages/SystemUI/res/values-it-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Ora lo schermo è bloccato nell\'orientamento orizzontale."</string> -</resources> diff --git a/packages/SystemUI/res/values-it-xlarge/strings.xml b/packages/SystemUI/res/values-it-xlarge/strings.xml index 9130b8dc7542..3b1e302aeee1 100644 --- a/packages/SystemUI/res/values-it-xlarge/strings.xml +++ b/packages/SystemUI/res/values-it-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Canc. tutto"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"No connessione Internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: connesso"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index cfccdafbd50e..ca99d8686f13 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifiche"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recenti"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nessuna applicazione recente."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Applicazioni"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index c6ef37cc5a19..f2d5621fe9a6 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"התראות"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"אחרונות"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"אין יישומים חדשים."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"יישומים"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja-land/strings.xml b/packages/SystemUI/res/values-ja-land/strings.xml deleted file mode 100644 index 80685da585f1..000000000000 --- a/packages/SystemUI/res/values-ja-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"画面を横向きにロックしました。"</string> -</resources> diff --git a/packages/SystemUI/res/values-ja-xlarge/strings.xml b/packages/SystemUI/res/values-ja-xlarge/strings.xml index 126327bab16c..a6af041938a1 100644 --- a/packages/SystemUI/res/values-ja-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ja-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"すべて消去"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"インターネット未接続"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi接続済み"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 153831a013a7..25d887340f5d 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"通知"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"新着"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"新着のアプリケーションはありません。"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"アプリ"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko-land/strings.xml b/packages/SystemUI/res/values-ko-land/strings.xml deleted file mode 100644 index 843ce606b9fb..000000000000 --- a/packages/SystemUI/res/values-ko-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"화면이 가로 방향으로 잠깁니다."</string> -</resources> diff --git a/packages/SystemUI/res/values-ko-xlarge/strings.xml b/packages/SystemUI/res/values-ko-xlarge/strings.xml index 8c489783468a..4962b5e618b3 100644 --- a/packages/SystemUI/res/values-ko-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ko-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"모두 지우기"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"인터넷에 연결되지 않음"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi 연결됨"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 0ec819fdabbb..6c5970abf8a7 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"알림"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"최근 사용한 앱"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"최근에 사용한 애플리케이션이 없습니다."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"애플리케이션"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt-xlarge/strings.xml b/packages/SystemUI/res/values-lt-xlarge/strings.xml index d3c8fce5a826..f9b3ac159e86 100644 --- a/packages/SystemUI/res/values-lt-xlarge/strings.xml +++ b/packages/SystemUI/res/values-lt-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Išv. viską"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Išvalyti viską"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Nėra interneto ryšio"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Prisijungta prie „Wi-Fi“"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 083a0ba1d5d6..90a5e4478231 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Pranešimai"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Naujos"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nėra naujausių programų."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Apps"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv-xlarge/strings.xml b/packages/SystemUI/res/values-lv-xlarge/strings.xml index 9bc9aa6e4344..af3423fa6db2 100644 --- a/packages/SystemUI/res/values-lv-xlarge/strings.xml +++ b/packages/SystemUI/res/values-lv-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Notīr.visu"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Notīrīt visu"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Nav interneta sav."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Izv. sav. ar Wi-Fi"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index e3f31cbadbd2..fb33329cc69f 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Paziņojumi"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Nesens"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nav nesenu lietojumprogrammu."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Lietotnes"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-nb-land/strings.xml b/packages/SystemUI/res/values-nb-land/strings.xml deleted file mode 100644 index e7effde2e48a..000000000000 --- a/packages/SystemUI/res/values-nb-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Skjermen er nå låst i liggende retning."</string> -</resources> diff --git a/packages/SystemUI/res/values-nb-xlarge/strings.xml b/packages/SystemUI/res/values-nb-xlarge/strings.xml index d236f1896bd3..726b06167c57 100644 --- a/packages/SystemUI/res/values-nb-xlarge/strings.xml +++ b/packages/SystemUI/res/values-nb-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Tøm alt"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Ingen Int.-tilkobl."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: tilkoblet"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index c1ee429c4a90..82405a85a1fa 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Varslinger"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Nylig"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Ingen nylig brukte programmer."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Programmer"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl-land/strings.xml b/packages/SystemUI/res/values-nl-land/strings.xml deleted file mode 100644 index 9b31fabe19d8..000000000000 --- a/packages/SystemUI/res/values-nl-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Het scherm is nu vergrendeld in liggende (landschap) stand."</string> -</resources> diff --git a/packages/SystemUI/res/values-nl-xlarge/strings.xml b/packages/SystemUI/res/values-nl-xlarge/strings.xml index eee7e3556072..b2946aecfe56 100644 --- a/packages/SystemUI/res/values-nl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-nl-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Wissen"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Geen internetverb."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Verbonden via Wi-Fi"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index bf61e621386d..4efdcbbea068 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Meldingen"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Geen recente toepassingen."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Toepassingen"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl-land/strings.xml b/packages/SystemUI/res/values-pl-land/strings.xml deleted file mode 100644 index c19df7427e5f..000000000000 --- a/packages/SystemUI/res/values-pl-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Ekran jest teraz zablokowany w orientacji poziomej."</string> -</resources> diff --git a/packages/SystemUI/res/values-pl-xlarge/strings.xml b/packages/SystemUI/res/values-pl-xlarge/strings.xml index e223b84aa41c..8642ea418390 100644 --- a/packages/SystemUI/res/values-pl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-pl-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Wyczyść wszystko"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Brak połączenia internetowego"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: połączono"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 8148ed30dc56..07ef5efecd3c 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Powiadomienia"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Najnowsze"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Brak ostatnio używanych aplikacji."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplikacje"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-land/strings.xml b/packages/SystemUI/res/values-pt-land/strings.xml deleted file mode 100644 index a9ad47d25124..000000000000 --- a/packages/SystemUI/res/values-pt-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"A tela está bloqueada na orientação paisagem."</string> -</resources> diff --git a/packages/SystemUI/res/values-pt-rPT-land/strings.xml b/packages/SystemUI/res/values-pt-rPT-land/strings.xml deleted file mode 100644 index 8d46040dc776..000000000000 --- a/packages/SystemUI/res/values-pt-rPT-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"O ecrã está agora bloqueado na orientação horizontal."</string> -</resources> diff --git a/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml b/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml index 7df815ca2ac1..8ddb2b112eff 100644 --- a/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Limpar tudo"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Sem ligação internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi ligado"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 553e8afc1aa0..aa14ccea80c9 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificações"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nenhuma aplicação recente."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplicações"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-xlarge/strings.xml b/packages/SystemUI/res/values-pt-xlarge/strings.xml index ba790e9740ba..103b2ad5f3da 100644 --- a/packages/SystemUI/res/values-pt-xlarge/strings.xml +++ b/packages/SystemUI/res/values-pt-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Limpar tudo"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Sem conex. à inter."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi conectado"</string> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 0cbbc0089d40..17be76af0a74 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificações"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nenhum aplicativo recente."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplicativos"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml index 7b94e9b3650b..e3fec8822d31 100644 --- a/packages/SystemUI/res/values-rm/strings.xml +++ b/packages/SystemUI/res/values-rm/strings.xml @@ -57,6 +57,4 @@ <skip /> <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> - <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro-xlarge/strings.xml b/packages/SystemUI/res/values-ro-xlarge/strings.xml index e6296cddafcb..07badf41760d 100644 --- a/packages/SystemUI/res/values-ro-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ro-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Şterg. tot"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Ştergeţi-le pe toate"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Fără conex. internet"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi conectat"</string> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index c2b054fede43..2bb3c14a7888 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notificări"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Nu există aplicaţii recente."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplicaţii"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru-land/strings.xml b/packages/SystemUI/res/values-ru-land/strings.xml deleted file mode 100644 index c475a4730997..000000000000 --- a/packages/SystemUI/res/values-ru-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Экран зафиксирован горизонтально."</string> -</resources> diff --git a/packages/SystemUI/res/values-ru-xlarge/strings.xml b/packages/SystemUI/res/values-ru-xlarge/strings.xml index 5c26e909a4ef..001f95c88528 100644 --- a/packages/SystemUI/res/values-ru-xlarge/strings.xml +++ b/packages/SystemUI/res/values-ru-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Удалить все"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Нет подключения"</string> - <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi подкл."</string> + <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi: подключено"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index f6a779eff056..89b9cc840e16 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Уведомления"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Недавние"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Новых приложений нет"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Приложения"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index f535b4855518..97163271e5ee 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Upozornenia"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Najnovšie"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Žiadne nedávno použité aplikácie."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Aplikácie"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl-xlarge/strings.xml b/packages/SystemUI/res/values-sl-xlarge/strings.xml index fcc65debef51..ef50a6795ab6 100644 --- a/packages/SystemUI/res/values-sl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-sl-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Izbriši vse"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Počisti vse"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Brez inter. povez."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi – povezano"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index b70ab426a1e9..b05b93cfa73a 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -32,7 +32,8 @@ <string name="invalid_charger" msgid="4549105996740522523">"Polnjenje po povezavi USB ni podprto."\n"Uporabite priloženi polnilnik."</string> <string name="battery_low_why" msgid="7279169609518386372">"Uporaba baterije"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Nastavitve"</string> - <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> + <!-- no translation found for status_bar_settings_wifi_button (1733928151698311923) --> + <skip /> <string name="status_bar_settings_airplane" msgid="4879879698500955300">"Način za letalo"</string> <string name="status_bar_settings_rotation_lock" msgid="8361452930058000609">"Zakleni usmerjenost zaslona"</string> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"TIHO"</string> @@ -40,9 +41,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Obvestila"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Nedavno"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Ni novih programov."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Programi"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 1e4b221b8ed2..ff1d3fb7754b 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Обавештења"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Недавно"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Нема недавних апликација"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Apps"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv-land/strings.xml b/packages/SystemUI/res/values-sv-land/strings.xml deleted file mode 100644 index 31f598a6904a..000000000000 --- a/packages/SystemUI/res/values-sv-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Bildskärmens riktning är nu låst i liggande format."</string> -</resources> diff --git a/packages/SystemUI/res/values-sv-xlarge/strings.xml b/packages/SystemUI/res/values-sv-xlarge/strings.xml index db85ee1dba04..9379451a59ff 100644 --- a/packages/SystemUI/res/values-sv-xlarge/strings.xml +++ b/packages/SystemUI/res/values-sv-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Ta bort alla"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Ingen Internetansl."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi-ansluten"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 58774be6c221..06b6880b9635 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Aviseringar"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Senaste"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Inga nya program."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Appar"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-th-xlarge/strings.xml b/packages/SystemUI/res/values-th-xlarge/strings.xml index 428e9ab60937..fb4cbae43fdc 100644 --- a/packages/SystemUI/res/values-th-xlarge/strings.xml +++ b/packages/SystemUI/res/values-th-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"ล้างหมด"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"ล้างทั้งหมด"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"ไม่มีการเชื่อมต่ออินเทอร์เน็ต"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"เชื่อมต่อ Wi-Fi แล้ว"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 923b3dba7e16..2d337a90c5fe 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"การแจ้งเตือน"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"เมื่อเร็วๆ นี้"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"ไม่มีแอปพลิเคชันล่าสุด"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"แอปพลิเคชัน"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl-xlarge/strings.xml b/packages/SystemUI/res/values-tl-xlarge/strings.xml index 25584b19726b..3560c9636334 100644 --- a/packages/SystemUI/res/values-tl-xlarge/strings.xml +++ b/packages/SystemUI/res/values-tl-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"I-clear lahat"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"I-clear ang lahat"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Wala net connection"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Konektado ang WiFi"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 888e886bf19b..e94d3cc9b5a7 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Mga Notification"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Kamakailan"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Walang kamakailang mga application."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Apps"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr-land/strings.xml b/packages/SystemUI/res/values-tr-land/strings.xml deleted file mode 100644 index bfe32dbfc6a1..000000000000 --- a/packages/SystemUI/res/values-tr-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"Ekran yatay yönde kilitlendi"</string> -</resources> diff --git a/packages/SystemUI/res/values-tr-xlarge/strings.xml b/packages/SystemUI/res/values-tr-xlarge/strings.xml index fa937c398f9c..f7d20b5e4bfd 100644 --- a/packages/SystemUI/res/values-tr-xlarge/strings.xml +++ b/packages/SystemUI/res/values-tr-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Tümünü temizle"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"İnternet bağlnts yok"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Kablosuz bağlandı"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 68d5e8587657..4c3f8187f384 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Bildirimler"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"En Son Görevler"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Hiçbir yeni uygulama yok."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Uygulamalar"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk-xlarge/strings.xml b/packages/SystemUI/res/values-uk-xlarge/strings.xml index 864cb0c14d6e..47242a688f7c 100644 --- a/packages/SystemUI/res/values-uk-xlarge/strings.xml +++ b/packages/SystemUI/res/values-uk-xlarge/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Очист. все"</string> + <string name="status_bar_clear_all_button" msgid="4722520806446512408">"Очистити все"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"Інтернет не під\'єдн."</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi під\'єднано"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 8c47d4858dd4..85ead1c9255c 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Сповіщення"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Останні"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Немає останніх програм."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Служби"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 248626a2b795..71df0c3cc710 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Thông báo"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"Gần đây"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"Không có ứng dụng nào gần đây."</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"Ứng dụng"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN-land/strings.xml b/packages/SystemUI/res/values-zh-rCN-land/strings.xml deleted file mode 100644 index 52af5287e429..000000000000 --- a/packages/SystemUI/res/values-zh-rCN-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"屏幕的横向浏览模式已锁定。"</string> -</resources> diff --git a/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml b/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml index 9df36e1d786f..59c094e3479f 100644 --- a/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"全部清除"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"未连接至互联网"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi 已连接"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 52585c36b8ad..0cdc38d5ed0c 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"通知"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"近期任务"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"没有最近使用的应用程序。"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"应用程序"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW-land/strings.xml b/packages/SystemUI/res/values-zh-rTW-land/strings.xml deleted file mode 100644 index f18fda111a4c..000000000000 --- a/packages/SystemUI/res/values-zh-rTW-land/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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. - */ - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- outdated translation 2686639138967158852 --> <string name="toast_rotation_locked" msgid="7609673011431556092">"螢幕目前鎖定為橫向瀏覽模式。"</string> -</resources> diff --git a/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml b/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml index 82f757e5fdb6..6a8ef52a61aa 100644 --- a/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW-xlarge/strings.xml @@ -19,7 +19,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="status_bar_clear_all_button" msgid="4722520806446512408">"全部清除"</string> + <!-- no translation found for status_bar_clear_all_button (4722520806446512408) --> + <skip /> <string name="status_bar_settings_signal_meter_disconnected" msgid="4684094636492991496">"沒有網路連線"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="1456658018593445677">"Wi-Fi 已連線"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 879dd44b376a..c85020f1859d 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -40,9 +40,8 @@ <string name="status_bar_settings_notifications" msgid="397146176280905137">"通知"</string> <string name="recent_tasks_title" msgid="3691764623638127888">"最新的"</string> <string name="recent_tasks_empty" msgid="1905484479067697884">"沒有最近用過的應用程式。"</string> - <!-- outdated translation 5550538721034982973 --> <string name="recent_tasks_app_label" msgid="3796483981246752469">"應用程式"</string> - <!-- no translation found for bluetooth_tethered (7094101612161133267) --> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> <skip /> - <!-- no translation found for status_bar_input_method_settings_configure_input_methods (737483394044014246) --> + <!-- no translation found for bluetooth_tethered (7094101612161133267) --> <skip /> </resources> diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index 5e33f0535c49..1f06dcc4c6f2 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -221,7 +221,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac final AlertDialog.Builder ab = new AlertDialog.Builder(mContext); ab.setAdapter(mAdapter, this) - .setInverseBackgroundForced(true); + .setInverseBackgroundForced(true) + .setTitle(R.string.global_actions); final AlertDialog dialog = ab.create(); dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); @@ -248,7 +249,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac } else { mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG); } - mDialog.setTitle(R.string.global_actions); } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 8afb53e1aaca..958a5e20de12 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -1275,6 +1275,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { return mDecor.superDispatchTrackballEvent(event); } + @Override + public boolean superDispatchGenericMotionEvent(MotionEvent event) { + return mDecor.superDispatchGenericMotionEvent(event); + } + /** * A key was pressed down and not handled by anything else in the window. * @@ -1688,6 +1693,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { .dispatchTrackballEvent(ev); } + @Override + public boolean dispatchGenericMotionEvent(MotionEvent ev) { + final Callback cb = getCallback(); + return cb != null && mFeatureId < 0 ? cb.dispatchGenericMotionEvent(ev) : super + .dispatchGenericMotionEvent(ev); + } + public boolean superDispatchKeyEvent(KeyEvent event) { return super.dispatchKeyEvent(event); } @@ -1704,6 +1716,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { return super.dispatchTrackballEvent(event); } + public boolean superDispatchGenericMotionEvent(MotionEvent event) { + return super.dispatchGenericMotionEvent(event); + } + @Override public boolean onTouchEvent(MotionEvent event) { return onInterceptTouchEvent(event); diff --git a/services/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp index 2c81c34d94c2..e84d13609e46 100644 --- a/services/audioflinger/AudioPolicyManagerBase.cpp +++ b/services/audioflinger/AudioPolicyManagerBase.cpp @@ -19,6 +19,7 @@ #include <utils/Log.h> #include <hardware_legacy/AudioPolicyManagerBase.h> #include <media/mediarecorder.h> +#include <math.h> namespace android { @@ -1019,6 +1020,8 @@ AudioPolicyManagerBase::AudioPolicyManagerBase(AudioPolicyClientInterface *clien mForceUse[i] = AudioSystem::FORCE_NONE; } + initializeVolumeCurves(); + // devices available by default are speaker, ear piece and microphone mAvailableOutputDevices = AudioSystem::DEVICE_OUT_EARPIECE | AudioSystem::DEVICE_OUT_SPEAKER; @@ -1810,6 +1813,62 @@ audio_io_handle_t AudioPolicyManagerBase::getActiveInput() return 0; } +float AudioPolicyManagerBase::volIndexToAmpl(uint32_t device, const StreamDescriptor& streamDesc, + int indexInUi) { + // the volume index in the UI is relative to the min and max volume indices for this stream type + int nbSteps = 1 + streamDesc.mVolIndex[StreamDescriptor::VOLMAX] - + streamDesc.mVolIndex[StreamDescriptor::VOLMIN]; + int volIdx = (nbSteps * (indexInUi - streamDesc.mIndexMin)) / + (streamDesc.mIndexMax - streamDesc.mIndexMin); + + // find what part of the curve this index volume belongs to, or if it's out of bounds + int segment = 0; + if (volIdx < streamDesc.mVolIndex[StreamDescriptor::VOLMIN]) { // out of bounds + return 0.0f; + } else if (volIdx < streamDesc.mVolIndex[StreamDescriptor::VOLKNEE1]) { + segment = 0; + } else if (volIdx < streamDesc.mVolIndex[StreamDescriptor::VOLKNEE2]) { + segment = 1; + } else if (volIdx <= streamDesc.mVolIndex[StreamDescriptor::VOLMAX]) { + segment = 2; + } else { // out of bounds + return 1.0f; + } + + // linear interpolation in the attenuation table in dB + float decibels = streamDesc.mVolDbAtt[segment] + + ((float)(volIdx - streamDesc.mVolIndex[segment])) * + ( (streamDesc.mVolDbAtt[segment+1] - streamDesc.mVolDbAtt[segment]) / + ((float)(streamDesc.mVolIndex[segment+1] - streamDesc.mVolIndex[segment])) ); + + float amplification = exp( decibels * 0.115129f); // exp( dB * ln(10) / 20 ) + + LOGV("VOLUME vol index=[%d %d %d], dB=[%.1f %.1f %.1f] ampl=%.5f", + streamDesc.mVolIndex[segment], volIdx, streamDesc.mVolIndex[segment+1], + streamDesc.mVolDbAtt[segment], decibels, streamDesc.mVolDbAtt[segment+1], + amplification); + + return amplification; +} + +void AudioPolicyManagerBase::initializeVolumeCurves() { + // initialize the volume curves to a (-49.5 - 0 dB) attenuation in 0.5dB steps + for (int i=0 ; i< AudioSystem::NUM_STREAM_TYPES ; i++) { + mStreams[i].mVolIndex[StreamDescriptor::VOLMIN] = 1; + mStreams[i].mVolDbAtt[StreamDescriptor::VOLMIN] = -49.5f; + mStreams[i].mVolIndex[StreamDescriptor::VOLKNEE1] = 33; + mStreams[i].mVolDbAtt[StreamDescriptor::VOLKNEE1] = -33.5f; + mStreams[i].mVolIndex[StreamDescriptor::VOLKNEE2] = 66; + mStreams[i].mVolDbAtt[StreamDescriptor::VOLKNEE2] = -17.0f; + // here we use 100 steps to avoid rounding errors + // when computing the volume in volIndexToAmpl() + mStreams[i].mVolIndex[StreamDescriptor::VOLMAX] = 100; + mStreams[i].mVolDbAtt[StreamDescriptor::VOLMAX] = 0.0f; + } + + // TODO add modifications for music to have finer steps below knee1 and above knee2 +} + float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_handle_t output, uint32_t device) { float volume = 1.0; @@ -1820,8 +1879,7 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand device = outputDesc->device(); } - int volInt = (100 * (index - streamDesc.mIndexMin)) / (streamDesc.mIndexMax - streamDesc.mIndexMin); - volume = AudioSystem::linearToLog(volInt); + volume = volIndexToAmpl(device, streamDesc, index); // if a headset is connected, apply the following rules to ring tones and notifications // to avoid sound level bursts in user's ears: diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp index 41dbe2fb1980..38a896fa4029 100644 --- a/services/input/EventHub.cpp +++ b/services/input/EventHub.cpp @@ -624,7 +624,11 @@ static const int32_t GAMEPAD_KEYCODES[] = { AKEYCODE_BUTTON_L1, AKEYCODE_BUTTON_R1, AKEYCODE_BUTTON_L2, AKEYCODE_BUTTON_R2, AKEYCODE_BUTTON_THUMBL, AKEYCODE_BUTTON_THUMBR, - AKEYCODE_BUTTON_START, AKEYCODE_BUTTON_SELECT, AKEYCODE_BUTTON_MODE + AKEYCODE_BUTTON_START, AKEYCODE_BUTTON_SELECT, AKEYCODE_BUTTON_MODE, + AKEYCODE_BUTTON_1, AKEYCODE_BUTTON_2, AKEYCODE_BUTTON_3, AKEYCODE_BUTTON_4, + AKEYCODE_BUTTON_5, AKEYCODE_BUTTON_6, AKEYCODE_BUTTON_7, AKEYCODE_BUTTON_8, + AKEYCODE_BUTTON_9, AKEYCODE_BUTTON_10, AKEYCODE_BUTTON_11, AKEYCODE_BUTTON_12, + AKEYCODE_BUTTON_13, AKEYCODE_BUTTON_14, AKEYCODE_BUTTON_15, AKEYCODE_BUTTON_16, }; int EventHub::openDevice(const char *devicePath) { @@ -739,9 +743,9 @@ int EventHub::openDevice(const char *devicePath) { //} // See if this is a keyboard. Ignore everything in the button range except for - // gamepads which are also considered keyboards. + // joystick and gamepad buttons which are also considered keyboards. if (containsNonZeroByte(key_bitmask, 0, sizeof_bit_array(BTN_MISC)) - || containsNonZeroByte(key_bitmask, sizeof_bit_array(BTN_GAMEPAD), + || containsNonZeroByte(key_bitmask, sizeof_bit_array(BTN_JOYSTICK), sizeof_bit_array(BTN_DIGI)) || containsNonZeroByte(key_bitmask, sizeof_bit_array(KEY_OK), sizeof_bit_array(KEY_MAX + 1))) { @@ -856,6 +860,18 @@ int EventHub::openDevice(const char *devicePath) { } } + // See if this device is a joystick. + // Ignore touchscreens because they use the same absolute axes for other purposes. + if (device->classes & INPUT_DEVICE_CLASS_GAMEPAD + && !(device->classes & INPUT_DEVICE_CLASS_TOUCH)) { + if (test_bit(ABS_X, abs_bitmask) + || test_bit(ABS_Y, abs_bitmask) + || test_bit(ABS_HAT0X, abs_bitmask) + || test_bit(ABS_HAT0Y, abs_bitmask)) { + device->classes |= INPUT_DEVICE_CLASS_JOYSTICK; + } + } + // If the device isn't recognized as something we handle, don't monitor it. if (device->classes == 0) { LOGV("Dropping device: id=%d, path='%s', name='%s'", diff --git a/services/input/EventHub.h b/services/input/EventHub.h index 0ee0b9b853bc..52993f705f2e 100644 --- a/services/input/EventHub.h +++ b/services/input/EventHub.h @@ -85,7 +85,7 @@ struct RawAbsoluteAxisInfo { int32_t flat; // center flat position, eg. flat == 8 means center is between -8 and 8 int32_t fuzz; // error tolerance, eg. fuzz == 4 means value is +/- 4 due to noise - inline int32_t getRange() { return maxValue - minValue; } + inline int32_t getRange() const { return maxValue - minValue; } inline void clear() { valid = false; @@ -100,7 +100,7 @@ struct RawAbsoluteAxisInfo { * Input device classes. */ enum { - /* The input device is a keyboard. */ + /* The input device is a keyboard or has buttons. */ INPUT_DEVICE_CLASS_KEYBOARD = 0x00000001, /* The input device is an alpha-numeric keyboard (not just a dial pad). */ @@ -123,6 +123,9 @@ enum { /* The input device has switches. */ INPUT_DEVICE_CLASS_SWITCH = 0x00000080, + + /* The input device is a joystick (implies gamepad, has joystick absolute axes). */ + INPUT_DEVICE_CLASS_JOYSTICK = 0x00000100, }; /* diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index 46d374d7203e..a4d5f35b2517 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -250,6 +250,9 @@ InputDevice* InputReader::createDevice(int32_t deviceId, const String8& name, ui if (classes & INPUT_DEVICE_CLASS_DPAD) { keyboardSources |= AINPUT_SOURCE_DPAD; } + if (classes & INPUT_DEVICE_CLASS_GAMEPAD) { + keyboardSources |= AINPUT_SOURCE_GAMEPAD; + } if (keyboardSources != 0) { device->addMapper(new KeyboardInputMapper(device, keyboardSources, keyboardType)); @@ -267,6 +270,11 @@ InputDevice* InputReader::createDevice(int32_t deviceId, const String8& name, ui device->addMapper(new SingleTouchInputMapper(device)); } + // Joystick-like devices. + if (classes & INPUT_DEVICE_CLASS_JOYSTICK) { + device->addMapper(new JoystickInputMapper(device)); + } + return device; } @@ -605,19 +613,11 @@ void InputDevice::configure() { mSources = 0; - for (size_t i = 0; i < mMappers.size(); i++) { + size_t numMappers = mMappers.size(); + for (size_t i = 0; i < numMappers; i++) { InputMapper* mapper = mMappers[i]; mapper->configure(); - - uint32_t sources = mapper->getSources(); - if (sources) { - mSources |= sources; - } else { - // The input mapper does not provide any sources. Remove it from the list. - mMappers.removeAt(i); - delete mapper; - i -= 1; - } + mSources |= mapper->getSources(); } } @@ -741,6 +741,16 @@ int32_t InputMapper::getMetaState() { return 0; } +void InputMapper::dumpRawAbsoluteAxisInfo(String8& dump, + const RawAbsoluteAxisInfo& axis, const char* name) { + if (axis.valid) { + dump.appendFormat(INDENT4 "%s: min=%d, max=%d, flat=%d, fuzz=%d\n", + name, axis.minValue, axis.maxValue, axis.flat, axis.fuzz); + } else { + dump.appendFormat(INDENT4 "%s: unknown range\n", name); + } +} + // --- SwitchInputMapper --- @@ -883,7 +893,7 @@ void KeyboardInputMapper::process(const RawEvent* rawEvent) { bool KeyboardInputMapper::isKeyboardOrGamepadKey(int32_t scanCode) { return scanCode < BTN_MOUSE || scanCode >= KEY_OK - || (scanCode >= BTN_GAMEPAD && scanCode < BTN_DIGI); + || (scanCode >= BTN_JOYSTICK && scanCode < BTN_DIGI); } void KeyboardInputMapper::processKey(nsecs_t when, bool down, int32_t keyCode, @@ -1082,7 +1092,7 @@ void CursorInputMapper::configure() { // Configure device mode. switch (mParameters.mode) { case Parameters::MODE_POINTER: - mSources = 0; // AINPUT_SOURCE_MOUSE; disable mouse support + mSources = AINPUT_SOURCE_MOUSE; mXPrecision = 1.0f; mYPrecision = 1.0f; mXScale = 1.0f; @@ -1519,25 +1529,16 @@ void TouchInputMapper::configureRawAxes() { mRawAxes.orientation.clear(); } -static void dumpAxisInfo(String8& dump, RawAbsoluteAxisInfo axis, const char* name) { - if (axis.valid) { - dump.appendFormat(INDENT4 "%s: min=%d, max=%d, flat=%d, fuzz=%d\n", - name, axis.minValue, axis.maxValue, axis.flat, axis.fuzz); - } else { - dump.appendFormat(INDENT4 "%s: unknown range\n", name); - } -} - void TouchInputMapper::dumpRawAxes(String8& dump) { dump.append(INDENT3 "Raw Axes:\n"); - dumpAxisInfo(dump, mRawAxes.x, "X"); - dumpAxisInfo(dump, mRawAxes.y, "Y"); - dumpAxisInfo(dump, mRawAxes.pressure, "Pressure"); - dumpAxisInfo(dump, mRawAxes.touchMajor, "TouchMajor"); - dumpAxisInfo(dump, mRawAxes.touchMinor, "TouchMinor"); - dumpAxisInfo(dump, mRawAxes.toolMajor, "ToolMajor"); - dumpAxisInfo(dump, mRawAxes.toolMinor, "ToolMinor"); - dumpAxisInfo(dump, mRawAxes.orientation, "Orientation"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.x, "X"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.y, "Y"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.pressure, "Pressure"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.touchMajor, "TouchMajor"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.touchMinor, "TouchMinor"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.toolMajor, "ToolMajor"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.toolMinor, "ToolMinor"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.orientation, "Orientation"); } bool TouchInputMapper::configureSurfaceLocked() { @@ -3705,4 +3706,199 @@ void MultiTouchInputMapper::configureRawAxes() { } +// --- JoystickInputMapper --- + +JoystickInputMapper::JoystickInputMapper(InputDevice* device) : + InputMapper(device) { + initialize(); +} + +JoystickInputMapper::~JoystickInputMapper() { +} + +uint32_t JoystickInputMapper::getSources() { + return AINPUT_SOURCE_JOYSTICK; +} + +void JoystickInputMapper::populateDeviceInfo(InputDeviceInfo* info) { + InputMapper::populateDeviceInfo(info); + + if (mAxes.x.valid) { + info->addMotionRange(AINPUT_MOTION_RANGE_X, + mAxes.x.min, mAxes.x.max, mAxes.x.flat, mAxes.x.fuzz); + } + if (mAxes.y.valid) { + info->addMotionRange(AINPUT_MOTION_RANGE_Y, + mAxes.y.min, mAxes.y.max, mAxes.y.flat, mAxes.y.fuzz); + } +} + +void JoystickInputMapper::dump(String8& dump) { + dump.append(INDENT2 "Joystick Input Mapper:\n"); + + dump.append(INDENT3 "Raw Axes:\n"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.x, "X"); + dumpRawAbsoluteAxisInfo(dump, mRawAxes.y, "Y"); + + dump.append(INDENT3 "Normalized Axes:\n"); + dumpNormalizedAxis(dump, mAxes.x, "X"); + dumpNormalizedAxis(dump, mAxes.y, "Y"); + dumpNormalizedAxis(dump, mAxes.hat0X, "Hat0X"); + dumpNormalizedAxis(dump, mAxes.hat0Y, "Hat0Y"); +} + +void JoystickInputMapper::dumpNormalizedAxis(String8& dump, + const NormalizedAxis& axis, const char* name) { + if (axis.valid) { + dump.appendFormat(INDENT4 "%s: min=%0.3f, max=%0.3f, flat=%0.3f, fuzz=%0.3f, " + "scale=%0.3f, center=%0.3f, precision=%0.3f, value=%0.3f\n", + name, axis.min, axis.max, axis.flat, axis.fuzz, + axis.scale, axis.center, axis.precision, axis.value); + } else { + dump.appendFormat(INDENT4 "%s: unknown range\n", name); + } +} + +void JoystickInputMapper::configure() { + InputMapper::configure(); + + getEventHub()->getAbsoluteAxisInfo(getDeviceId(), ABS_X, & mRawAxes.x); + getEventHub()->getAbsoluteAxisInfo(getDeviceId(), ABS_Y, & mRawAxes.y); + getEventHub()->getAbsoluteAxisInfo(getDeviceId(), ABS_HAT0X, & mRawAxes.hat0X); + getEventHub()->getAbsoluteAxisInfo(getDeviceId(), ABS_HAT0Y, & mRawAxes.hat0Y); + + mAxes.x.configure(mRawAxes.x); + mAxes.y.configure(mRawAxes.y); + mAxes.hat0X.configure(mRawAxes.hat0X); + mAxes.hat0Y.configure(mRawAxes.hat0Y); +} + +void JoystickInputMapper::initialize() { + mAccumulator.clear(); + + mAxes.x.resetState(); + mAxes.y.resetState(); + mAxes.hat0X.resetState(); + mAxes.hat0Y.resetState(); +} + +void JoystickInputMapper::reset() { + // Recenter all axes. + nsecs_t when = systemTime(SYSTEM_TIME_MONOTONIC); + mAccumulator.clear(); + mAccumulator.fields = Accumulator::FIELD_ALL; + sync(when); + + // Reinitialize state. + initialize(); + + InputMapper::reset(); +} + +void JoystickInputMapper::process(const RawEvent* rawEvent) { + switch (rawEvent->type) { + case EV_ABS: + switch (rawEvent->scanCode) { + case ABS_X: + mAccumulator.fields |= Accumulator::FIELD_ABS_X; + mAccumulator.absX = rawEvent->value; + break; + case ABS_Y: + mAccumulator.fields |= Accumulator::FIELD_ABS_Y; + mAccumulator.absY = rawEvent->value; + break; + case ABS_HAT0X: + mAccumulator.fields |= Accumulator::FIELD_ABS_HAT0X; + mAccumulator.absHat0X = rawEvent->value; + break; + case ABS_HAT0Y: + mAccumulator.fields |= Accumulator::FIELD_ABS_HAT0Y; + mAccumulator.absHat0Y = rawEvent->value; + break; + } + break; + + case EV_SYN: + switch (rawEvent->scanCode) { + case SYN_REPORT: + sync(rawEvent->when); + break; + } + break; + } +} + +void JoystickInputMapper::sync(nsecs_t when) { + uint32_t fields = mAccumulator.fields; + if (fields == 0) { + return; // no new state changes, so nothing to do + } + + int32_t metaState = mContext->getGlobalMetaState(); + + bool motionAxisChanged = false; + if (fields & Accumulator::FIELD_ABS_X) { + if (mAxes.x.updateValue(mAccumulator.absX)) { + motionAxisChanged = true; + } + } + + if (fields & Accumulator::FIELD_ABS_Y) { + if (mAxes.y.updateValue(mAccumulator.absY)) { + motionAxisChanged = true; + } + } + + if (motionAxisChanged) { + PointerCoords pointerCoords; + pointerCoords.x = mAxes.x.value; + pointerCoords.y = mAxes.y.value; + pointerCoords.touchMajor = 0; + pointerCoords.touchMinor = 0; + pointerCoords.toolMajor = 0; + pointerCoords.toolMinor = 0; + pointerCoords.pressure = 0; + pointerCoords.size = 0; + pointerCoords.orientation = 0; + + int32_t pointerId = 0; + getDispatcher()->notifyMotion(when, getDeviceId(), AINPUT_SOURCE_JOYSTICK, 0, + AMOTION_EVENT_ACTION_MOVE, 0, metaState, AMOTION_EVENT_EDGE_FLAG_NONE, + 1, &pointerId, &pointerCoords, mAxes.x.precision, mAxes.y.precision, 0); + } + + if (fields & Accumulator::FIELD_ABS_HAT0X) { + if (mAxes.hat0X.updateValueAndDirection(mAccumulator.absHat0X)) { + notifyDirectionalAxis(mAxes.hat0X, when, metaState, + AKEYCODE_DPAD_LEFT, AKEYCODE_DPAD_RIGHT); + } + } + + if (fields & Accumulator::FIELD_ABS_HAT0Y) { + if (mAxes.hat0Y.updateValueAndDirection(mAccumulator.absHat0Y)) { + notifyDirectionalAxis(mAxes.hat0Y, when, metaState, + AKEYCODE_DPAD_UP, AKEYCODE_DPAD_DOWN); + } + } + + mAccumulator.clear(); +} + +void JoystickInputMapper::notifyDirectionalAxis(DirectionalAxis& axis, + nsecs_t when, int32_t metaState, int32_t lowKeyCode, int32_t highKeyCode) { + if (axis.lastKeyCode) { + getDispatcher()->notifyKey(when, getDeviceId(), AINPUT_SOURCE_JOYSTICK, 0, + AKEY_EVENT_ACTION_UP, AKEY_EVENT_FLAG_FROM_SYSTEM, + axis.lastKeyCode, 0, metaState, when); + axis.lastKeyCode = 0; + } + if (axis.direction) { + axis.lastKeyCode = axis.direction > 0 ? highKeyCode : lowKeyCode; + getDispatcher()->notifyKey(when, getDeviceId(), AINPUT_SOURCE_JOYSTICK, 0, + AKEY_EVENT_ACTION_DOWN, AKEY_EVENT_FLAG_FROM_SYSTEM, + axis.lastKeyCode, 0, metaState, when); + } +} + + } // namespace android diff --git a/services/input/InputReader.h b/services/input/InputReader.h index 7619682a0116..27cb8e1e685c 100644 --- a/services/input/InputReader.h +++ b/services/input/InputReader.h @@ -354,6 +354,9 @@ public: protected: InputDevice* mDevice; InputReaderContext* mContext; + + static void dumpRawAbsoluteAxisInfo(String8& dump, + const RawAbsoluteAxisInfo& axis, const char* name); }; @@ -968,6 +971,139 @@ private: void sync(nsecs_t when); }; + +class JoystickInputMapper : public InputMapper { +public: + JoystickInputMapper(InputDevice* device); + virtual ~JoystickInputMapper(); + + virtual uint32_t getSources(); + virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo); + virtual void dump(String8& dump); + virtual void configure(); + virtual void reset(); + virtual void process(const RawEvent* rawEvent); + +private: + struct RawAxes { + RawAbsoluteAxisInfo x; + RawAbsoluteAxisInfo y; + RawAbsoluteAxisInfo hat0X; + RawAbsoluteAxisInfo hat0Y; + } mRawAxes; + + struct NormalizedAxis { + bool valid; + + static const float min = -1.0f; + static const float max = -1.0f; + + float scale; // scale factor + float center; // center offset after scaling + float precision; // precision + float flat; // size of flat region + float fuzz; // error tolerance + + float value; // most recent value + + NormalizedAxis() : valid(false), scale(0), center(0), precision(0), + flat(0), fuzz(0), value(0) { + } + + void configure(const RawAbsoluteAxisInfo& rawAxis) { + if (rawAxis.valid && rawAxis.getRange() != 0) { + valid = true; + scale = 2.0f / rawAxis.getRange(); + precision = rawAxis.getRange(); + flat = rawAxis.flat * scale; + fuzz = rawAxis.fuzz * scale; + center = float(rawAxis.minValue + rawAxis.maxValue) / rawAxis.getRange(); + } + } + + void resetState() { + value = 0; + } + + bool updateValue(int32_t rawValue) { + float newValue = rawValue * scale - center; + if (value == newValue) { + return false; + } + value = newValue; + return true; + } + }; + + struct DirectionalAxis : NormalizedAxis { + int32_t direction; // most recent direction vector: value is one of -1, 0, 1. + + int32_t lastKeyCode; // most recent key code produced + + DirectionalAxis() : lastKeyCode(0) { + } + + void resetState() { + NormalizedAxis::resetState(); + direction = 0; + lastKeyCode = 0; + } + + bool updateValueAndDirection(int32_t rawValue) { + if (!updateValue(rawValue)) { + return false; + } + if (value > flat) { + direction = 1; + } else if (value < -flat) { + direction = -1; + } else { + direction = 0; + } + return true; + } + }; + + struct Axes { + NormalizedAxis x; + NormalizedAxis y; + DirectionalAxis hat0X; + DirectionalAxis hat0Y; + } mAxes; + + struct Accumulator { + enum { + FIELD_ABS_X = 1, + FIELD_ABS_Y = 2, + FIELD_ABS_HAT0X = 4, + FIELD_ABS_HAT0Y = 8, + + FIELD_ALL = FIELD_ABS_X | FIELD_ABS_Y | FIELD_ABS_HAT0X | FIELD_ABS_HAT0Y, + }; + + uint32_t fields; + + int32_t absX; + int32_t absY; + int32_t absHat0X; + int32_t absHat0Y; + + inline void clear() { + fields = 0; + } + } mAccumulator; + + void initialize(); + + void sync(nsecs_t when); + + void notifyDirectionalAxis(DirectionalAxis& axis, + nsecs_t when, int32_t metaState, int32_t lowKeyCode, int32_t highKeyCode); + + static void dumpNormalizedAxis(String8& dump, + const NormalizedAxis& axis, const char* name); +}; + } // namespace android #endif // _UI_INPUT_READER_H diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index e689654110b6..26397bbd81c5 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -2142,7 +2142,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (proxy == null) proxy = new ProxyProperties("", 0, ""); log("sending Proxy Broadcast for " + proxy); Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); + intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING | + Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxy); mContext.sendStickyBroadcast(intent); } diff --git a/services/java/com/android/server/IntentResolver.java b/services/java/com/android/server/IntentResolver.java index a8b28403ee1a..e9ee12ca2b8b 100644 --- a/services/java/com/android/server/IntentResolver.java +++ b/services/java/com/android/server/IntentResolver.java @@ -27,6 +27,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import android.net.Uri; +import android.util.FastImmutableArraySet; import android.util.Log; import android.util.PrintWriterPrinter; import android.util.Slog; @@ -207,10 +209,11 @@ public class IntentResolver<F extends IntentFilter, R extends Object> { final boolean debug = localLOGV || ((intent.getFlags() & Intent.FLAG_DEBUG_LOG_RESOLUTION) != 0); + FastImmutableArraySet<String> categories = getFastIntentCategories(intent); final String scheme = intent.getScheme(); int N = listCut.size(); for (int i = 0; i < N; ++i) { - buildResolveList(intent, debug, defaultOnly, + buildResolveList(intent, categories, debug, defaultOnly, resolvedType, scheme, listCut.get(i), resultList); } sortResults(resultList); @@ -286,20 +289,21 @@ public class IntentResolver<F extends IntentFilter, R extends Object> { if (debug) Slog.v(TAG, "Action list: " + firstTypeCut); } + FastImmutableArraySet<String> categories = getFastIntentCategories(intent); if (firstTypeCut != null) { - buildResolveList(intent, debug, defaultOnly, + buildResolveList(intent, categories, debug, defaultOnly, resolvedType, scheme, firstTypeCut, finalList); } if (secondTypeCut != null) { - buildResolveList(intent, debug, defaultOnly, + buildResolveList(intent, categories, debug, defaultOnly, resolvedType, scheme, secondTypeCut, finalList); } if (thirdTypeCut != null) { - buildResolveList(intent, debug, defaultOnly, + buildResolveList(intent, categories, debug, defaultOnly, resolvedType, scheme, thirdTypeCut, finalList); } if (schemeCut != null) { - buildResolveList(intent, debug, defaultOnly, + buildResolveList(intent, categories, debug, defaultOnly, resolvedType, scheme, schemeCut, finalList); } sortResults(finalList); @@ -478,9 +482,19 @@ public class IntentResolver<F extends IntentFilter, R extends Object> { return false; } - private void buildResolveList(Intent intent, boolean debug, boolean defaultOnly, + private static FastImmutableArraySet<String> getFastIntentCategories(Intent intent) { + final Set<String> categories = intent.getCategories(); + if (categories == null) { + return null; + } + return new FastImmutableArraySet<String>(categories.toArray(new String[categories.size()])); + } + + private void buildResolveList(Intent intent, FastImmutableArraySet<String> categories, + boolean debug, boolean defaultOnly, String resolvedType, String scheme, List<F> src, List<R> dest) { - Set<String> categories = intent.getCategories(); + final String action = intent.getAction(); + final Uri data = intent.getData(); final int N = src != null ? src.size() : 0; boolean hasNonDefaults = false; @@ -498,8 +512,7 @@ public class IntentResolver<F extends IntentFilter, R extends Object> { continue; } - match = filter.match( - intent.getAction(), resolvedType, scheme, intent.getData(), categories, TAG); + match = filter.match(action, resolvedType, scheme, data, categories, TAG); if (match >= 0) { if (debug) Slog.v(TAG, " Filter matched! match=0x" + Integer.toHexString(match)); diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 92ec1da7f955..683c2c005e11 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -405,6 +405,7 @@ class ServerThread extends Thread { Slog.i(TAG, "USB Observer"); // Listen for USB changes usb = new UsbService(context); + ServiceManager.addService(Context.USB_SERVICE, usb); } catch (Throwable e) { Slog.e(TAG, "Failure starting UsbService", e); } diff --git a/services/java/com/android/server/UsbService.java b/services/java/com/android/server/UsbService.java index 8ef03d436ad2..5c03fb2a76e4 100644 --- a/services/java/com/android/server/UsbService.java +++ b/services/java/com/android/server/UsbService.java @@ -19,10 +19,18 @@ package com.android.server; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.hardware.IUsbManager; +import android.hardware.UsbConstants; +import android.hardware.UsbDevice; +import android.hardware.UsbEndpoint; +import android.hardware.UsbInterface; import android.hardware.UsbManager; import android.net.Uri; +import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.os.Parcelable; +import android.os.ParcelFileDescriptor; import android.os.UEventObserver; import android.provider.Settings; import android.util.Log; @@ -32,11 +40,12 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.util.ArrayList; +import java.util.HashMap; /** * <p>UsbService monitors for changes to USB state. */ -class UsbService { +class UsbService extends IUsbManager.Stub { private static final String TAG = UsbService.class.getSimpleName(); private static final boolean LOG = false; @@ -68,10 +77,12 @@ class UsbService { private int mLastConnected = -1; private int mLastConfiguration = -1; - // lists of enabled and disabled USB functions + // lists of enabled and disabled USB functions (for USB device mode) private final ArrayList<String> mEnabledFunctions = new ArrayList<String>(); private final ArrayList<String> mDisabledFunctions = new ArrayList<String>(); + private final HashMap<String,UsbDevice> mDevices = new HashMap<String,UsbDevice>(); + private boolean mSystemReady; private final Context mContext; @@ -186,8 +197,106 @@ class UsbService { } } + // called from JNI in monitorUsbHostBus() + private void usbDeviceAdded(String deviceName, int vendorID, int productID, + int deviceClass, int deviceSubclass, int deviceProtocol, + /* array of quintuples containing id, class, subclass, protocol + and number of endpoints for each interface */ + int[] interfaceValues, + /* array of quadruples containing address, attributes, max packet size + and interval for each endpoint */ + int[] endpointValues) { + + // ignore hubs + if (deviceClass == UsbConstants.USB_CLASS_HUB) { + return; + } + + synchronized (mDevices) { + if (mDevices.get(deviceName) != null) { + Log.w(TAG, "device already on mDevices list: " + deviceName); + return; + } + + int numInterfaces = interfaceValues.length / 5; + Parcelable[] interfaces = new UsbInterface[numInterfaces]; + try { + // repackage interfaceValues as an array of UsbInterface + int intf, endp, ival = 0, eval = 0; + boolean hasGoodInterface = false; + for (intf = 0; intf < numInterfaces; intf++) { + int interfaceId = interfaceValues[ival++]; + int interfaceClass = interfaceValues[ival++]; + int interfaceSubclass = interfaceValues[ival++]; + int interfaceProtocol = interfaceValues[ival++]; + int numEndpoints = interfaceValues[ival++]; + + Parcelable[] endpoints = new UsbEndpoint[numEndpoints]; + for (endp = 0; endp < numEndpoints; endp++) { + int address = endpointValues[eval++]; + int attributes = endpointValues[eval++]; + int maxPacketSize = endpointValues[eval++]; + int interval = endpointValues[eval++]; + endpoints[endp] = new UsbEndpoint(address, attributes, + maxPacketSize, interval); + } + + if (interfaceClass != UsbConstants.USB_CLASS_HUB) { + hasGoodInterface = true; + } + interfaces[intf] = new UsbInterface(interfaceId, interfaceClass, + interfaceSubclass, interfaceProtocol, endpoints); + } + + if (!hasGoodInterface) { + return; + } + } catch (Exception e) { + // beware of index out of bound exceptions, which might happen if + // a device does not set bNumEndpoints correctly + Log.e(TAG, "error parsing USB descriptors", e); + return; + } + + UsbDevice device = new UsbDevice(deviceName, vendorID, productID, + deviceClass, deviceSubclass, deviceProtocol, interfaces); + mDevices.put(deviceName, device); + + Intent intent = new Intent(UsbManager.ACTION_USB_DEVICE_ATTACHED); + intent.putExtra(UsbManager.EXTRA_DEVICE_NAME, deviceName); + intent.putExtra(UsbManager.EXTRA_VENDOR_ID, vendorID); + intent.putExtra(UsbManager.EXTRA_PRODUCT_ID, productID); + intent.putExtra(UsbManager.EXTRA_DEVICE_CLASS, deviceClass); + intent.putExtra(UsbManager.EXTRA_DEVICE_SUBCLASS, deviceSubclass); + intent.putExtra(UsbManager.EXTRA_DEVICE_PROTOCOL, deviceProtocol); + intent.putExtra(UsbManager.EXTRA_DEVICE, device); + Log.d(TAG, "usbDeviceAdded, sending " + intent); + mContext.sendBroadcast(intent); + } + } + + // called from JNI in monitorUsbHostBus() + private void usbDeviceRemoved(String deviceName) { + synchronized (mDevices) { + UsbDevice device = mDevices.remove(deviceName); + if (device != null) { + Intent intent = new Intent(UsbManager.ACTION_USB_DEVICE_DETACHED); + intent.putExtra(UsbManager.EXTRA_DEVICE_NAME, deviceName); + Log.d(TAG, "usbDeviceRemoved, sending " + intent); + mContext.sendBroadcast(intent); + } + } + } + private void initHostSupport() { - // temporarily disabled + // Create a thread to call into native code to wait for USB host events. + // This thread will call us back on usbDeviceAdded and usbDeviceRemoved. + Runnable runnable = new Runnable() { + public void run() { + monitorUsbHostBus(); + } + }; + new Thread(null, runnable, "UsbService host thread").start(); } void systemReady() { @@ -208,6 +317,21 @@ class UsbService { mHandler.sendEmptyMessageDelayed(MSG_UPDATE, delayed ? UPDATE_DELAY : 0); } + /* Returns a list of all currently attached USB devices */ + public void getDeviceList(Bundle devices) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.ACCESS_USB, null); + synchronized (mDevices) { + for (String name : mDevices.keySet()) { + devices.putParcelable(name, mDevices.get(name)); + } + } + } + + public ParcelFileDescriptor openDevice(String deviceName) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.ACCESS_USB, null); + return nativeOpenDevice(deviceName); + } + private final Handler mHandler = new Handler() { private void addEnabledFunctions(Intent intent) { // include state of all USB functions in our extras @@ -249,4 +373,7 @@ class UsbService { } } }; + + private native void monitorUsbHostBus(); + private native ParcelFileDescriptor nativeOpenDevice(String deviceName); } diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index d2f2ec701910..5e78353d36d5 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -39,7 +39,6 @@ import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WpsConfiguration; import android.net.wifi.WpsResult; import android.net.ConnectivityManager; -import android.net.InterfaceConfiguration; import android.net.DhcpInfo; import android.net.NetworkInfo; import android.net.NetworkInfo.State; @@ -56,7 +55,6 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.Slog; -import java.net.InetAddress; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -113,9 +111,6 @@ public class WifiService extends IWifiManager.Stub { private final IBatteryStats mBatteryStats; - ConnectivityManager mCm; - private String[] mWifiRegexs; - /** * See {@link Settings.Secure#WIFI_IDLE_MS}. This is the default value if a * Settings.Secure value is not present. This timeout value is chosen as @@ -256,20 +251,6 @@ public class WifiService extends IWifiManager.Stub { }, new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED)); - mContext.registerReceiver( - new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - - ArrayList<String> available = intent.getStringArrayListExtra( - ConnectivityManager.EXTRA_AVAILABLE_TETHER); - ArrayList<String> active = intent.getStringArrayListExtra( - ConnectivityManager.EXTRA_ACTIVE_TETHER); - updateTetherState(available, active); - - } - },new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)); - IntentFilter filter = new IntentFilter(); filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); @@ -322,52 +303,6 @@ public class WifiService extends IWifiManager.Stub { setWifiEnabled(wifiEnabled); } - private void updateTetherState(ArrayList<String> available, ArrayList<String> tethered) { - - boolean wifiTethered = false; - boolean wifiAvailable = false; - - IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE); - INetworkManagementService service = INetworkManagementService.Stub.asInterface(b); - - if (mCm == null) { - mCm = (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE); - } - - mWifiRegexs = mCm.getTetherableWifiRegexs(); - - for (String intf : available) { - for (String regex : mWifiRegexs) { - if (intf.matches(regex)) { - - InterfaceConfiguration ifcg = null; - try { - ifcg = service.getInterfaceConfig(intf); - if (ifcg != null) { - /* IP/netmask: 192.168.43.1/255.255.255.0 */ - ifcg.addr = InetAddress.getByName("192.168.43.1"); - ifcg.mask = InetAddress.getByName("255.255.255.0"); - ifcg.interfaceFlags = "[up]"; - - service.setInterfaceConfig(intf, ifcg); - } - } catch (Exception e) { - Slog.e(TAG, "Error configuring interface " + intf + ", :" + e); - setWifiApEnabled(null, false); - return; - } - - if(mCm.tether(intf) != ConnectivityManager.TETHER_ERROR_NO_ERROR) { - Slog.e(TAG, "Error tethering on " + intf); - setWifiApEnabled(null, false); - return; - } - break; - } - } - } - } - private boolean testAndClearWifiSavedState() { final ContentResolver cr = mContext.getContentResolver(); int wifiSavedState = 0; diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 7c79b8a05453..2806774d4e78 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -5873,8 +5873,7 @@ public class WindowManagerService extends IWindowManager.Stub outSurface.copyFrom(surface); final IBinder winBinder = window.asBinder(); token = new Binder(); - // TODO: preserve flags param in DragState - mDragState = new DragState(token, surface, 0, winBinder); + mDragState = new DragState(token, surface, flags, winBinder); mDragState.mSurface = surface; token = mDragState.mToken = new Binder(); diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index c24fe8ee0da6..9e3b9c6dd62a 100755..100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -9637,7 +9637,7 @@ public final class ActivityManagerService extends ActivityManagerNative // r.record is null if findServiceLocked() failed the caller permission check if (r.record == null) { throw new SecurityException( - "Permission Denial: Accessing service " + "Permission Denial: Accessing service " + r.record.name + " from pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + " requires " + r.permission); diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 26c7e711c393..4bc3b06bd0c0 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -1188,8 +1188,13 @@ public class Tethering extends INetworkManagementEventObserver.Stub { try { service.startTethering(mDhcpRange); } catch (Exception e) { - transitionTo(mStartTetheringErrorState); - return false; + try { + service.stopTethering(); + service.startTethering(mDhcpRange); + } catch (Exception ee) { + transitionTo(mStartTetheringErrorState); + return false; + } } try { service.setDnsForwarders(mDnsServers); diff --git a/services/jni/Android.mk b/services/jni/Android.mk index f5a5b4da5e80..be37d5d56d9b 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -12,6 +12,7 @@ LOCAL_SRC_FILES:= \ com_android_server_LightsService.cpp \ com_android_server_PowerManagerService.cpp \ com_android_server_SystemServer.cpp \ + com_android_server_UsbService.cpp \ com_android_server_VibratorService.cpp \ com_android_server_location_GpsLocationProvider.cpp \ onload.cpp diff --git a/services/jni/com_android_server_UsbService.cpp b/services/jni/com_android_server_UsbService.cpp new file mode 100644 index 000000000000..ef22111d4b2a --- /dev/null +++ b/services/jni/com_android_server_UsbService.cpp @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2009 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. + */ + +#define LOG_TAG "UsbService" +#include "utils/Log.h" + +#include "jni.h" +#include "JNIHelp.h" +#include "android_runtime/AndroidRuntime.h" +#include "utils/Vector.h" + +#include <usbhost/usbhost.h> + +#include <stdio.h> +#include <asm/byteorder.h> + +namespace android +{ + +static struct file_descriptor_offsets_t +{ + jclass mClass; + jmethodID mConstructor; + jfieldID mDescriptor; +} gFileDescriptorOffsets; + +static struct parcel_file_descriptor_offsets_t +{ + jclass mClass; + jmethodID mConstructor; +} gParcelFileDescriptorOffsets; + +static jmethodID method_usbDeviceAdded; +static jmethodID method_usbDeviceRemoved; + +static void checkAndClearExceptionFromCallback(JNIEnv* env, const char* methodName) { + if (env->ExceptionCheck()) { + LOGE("An exception was thrown by callback '%s'.", methodName); + LOGE_EX(env); + env->ExceptionClear(); + } +} + +static int usb_device_added(const char *devname, void* client_data) { + struct usb_descriptor_header* desc; + struct usb_descriptor_iter iter; + + struct usb_device *device = usb_device_open(devname); + if (!device) { + LOGE("usb_device_open failed\n"); + return 0; + } + + JNIEnv* env = AndroidRuntime::getJNIEnv(); + jobject thiz = (jobject)client_data; + Vector<int> interfaceValues; + Vector<int> endpointValues; + const usb_device_descriptor* deviceDesc = usb_device_get_device_descriptor(device); + + uint16_t vendorId = usb_device_get_vendor_id(device); + uint16_t productId = usb_device_get_product_id(device); + uint8_t deviceClass = deviceDesc->bDeviceClass; + uint8_t deviceSubClass = deviceDesc->bDeviceSubClass; + uint8_t protocol = deviceDesc->bDeviceProtocol; + + usb_descriptor_iter_init(device, &iter); + + while ((desc = usb_descriptor_iter_next(&iter)) != NULL) { + if (desc->bDescriptorType == USB_DT_INTERFACE) { + struct usb_interface_descriptor *interface = (struct usb_interface_descriptor *)desc; + + // push class, subclass, protocol and number of endpoints into interfaceValues vector + interfaceValues.add(interface->bInterfaceNumber); + interfaceValues.add(interface->bInterfaceClass); + interfaceValues.add(interface->bInterfaceSubClass); + interfaceValues.add(interface->bInterfaceProtocol); + interfaceValues.add(interface->bNumEndpoints); + } else if (desc->bDescriptorType == USB_DT_ENDPOINT) { + struct usb_endpoint_descriptor *endpoint = (struct usb_endpoint_descriptor *)desc; + + // push address, attributes, max packet size and interval into endpointValues vector + endpointValues.add(endpoint->bEndpointAddress); + endpointValues.add(endpoint->bmAttributes); + endpointValues.add(__le16_to_cpu(endpoint->wMaxPacketSize)); + endpointValues.add(endpoint->bInterval); + } + } + + usb_device_close(device); + + // handle generic device notification + int length = interfaceValues.size(); + jintArray interfaceArray = env->NewIntArray(length); + env->SetIntArrayRegion(interfaceArray, 0, length, interfaceValues.array()); + + length = endpointValues.size(); + jintArray endpointArray = env->NewIntArray(length); + env->SetIntArrayRegion(endpointArray, 0, length, endpointValues.array()); + + env->CallVoidMethod(thiz, method_usbDeviceAdded, + env->NewStringUTF(devname), vendorId, productId, deviceClass, + deviceSubClass, protocol, interfaceArray, endpointArray); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + + return 0; +} + +static int usb_device_removed(const char *devname, void* client_data) { + JNIEnv* env = AndroidRuntime::getJNIEnv(); + jobject thiz = (jobject)client_data; + + env->CallVoidMethod(thiz, method_usbDeviceRemoved, env->NewStringUTF(devname)); + checkAndClearExceptionFromCallback(env, __FUNCTION__); + return 0; +} + +static void android_server_UsbService_monitorUsbHostBus(JNIEnv *env, jobject thiz) +{ + struct usb_host_context* context = usb_host_init(); + if (!context) { + LOGE("usb_host_init failed"); + return; + } + // this will never return so it is safe to pass thiz directly + usb_host_run(context, usb_device_added, usb_device_removed, NULL, (void *)thiz); +} + +static jobject android_server_UsbService_openDevice(JNIEnv *env, jobject thiz, jstring deviceName) +{ + const char *deviceNameStr = env->GetStringUTFChars(deviceName, NULL); + struct usb_device* device = usb_device_open(deviceNameStr); + env->ReleaseStringUTFChars(deviceName, deviceNameStr); + + if (!device) + return NULL; + + int fd = usb_device_get_fd(device); + if (fd < 0) + return NULL; + int newFD = dup(fd); + usb_device_close(device); + + jobject fileDescriptor = env->NewObject(gFileDescriptorOffsets.mClass, + gFileDescriptorOffsets.mConstructor); + if (fileDescriptor != NULL) { + env->SetIntField(fileDescriptor, gFileDescriptorOffsets.mDescriptor, newFD); + } else { + return NULL; + } + return env->NewObject(gParcelFileDescriptorOffsets.mClass, + gParcelFileDescriptorOffsets.mConstructor, fileDescriptor); +} + +static JNINativeMethod method_table[] = { + { "monitorUsbHostBus", "()V", (void*)android_server_UsbService_monitorUsbHostBus }, + { "nativeOpenDevice", "(Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;", + (void*)android_server_UsbService_openDevice }, +}; + +int register_android_server_UsbService(JNIEnv *env) +{ + jclass clazz = env->FindClass("com/android/server/UsbService"); + if (clazz == NULL) { + LOGE("Can't find com/android/server/UsbService"); + return -1; + } + method_usbDeviceAdded = env->GetMethodID(clazz, "usbDeviceAdded", "(Ljava/lang/String;IIIII[I[I)V"); + if (method_usbDeviceAdded == NULL) { + LOGE("Can't find usbDeviceAdded"); + return -1; + } + method_usbDeviceRemoved = env->GetMethodID(clazz, "usbDeviceRemoved", "(Ljava/lang/String;)V"); + if (method_usbDeviceRemoved == NULL) { + LOGE("Can't find usbDeviceRemoved"); + return -1; + } + + clazz = env->FindClass("java/io/FileDescriptor"); + LOG_FATAL_IF(clazz == NULL, "Unable to find class java.io.FileDescriptor"); + gFileDescriptorOffsets.mClass = (jclass) env->NewGlobalRef(clazz); + gFileDescriptorOffsets.mConstructor = env->GetMethodID(clazz, "<init>", "()V"); + gFileDescriptorOffsets.mDescriptor = env->GetFieldID(clazz, "descriptor", "I"); + LOG_FATAL_IF(gFileDescriptorOffsets.mDescriptor == NULL, + "Unable to find descriptor field in java.io.FileDescriptor"); + + clazz = env->FindClass("android/os/ParcelFileDescriptor"); + LOG_FATAL_IF(clazz == NULL, "Unable to find class android.os.ParcelFileDescriptor"); + gParcelFileDescriptorOffsets.mClass = (jclass) env->NewGlobalRef(clazz); + gParcelFileDescriptorOffsets.mConstructor = env->GetMethodID(clazz, "<init>", "(Ljava/io/FileDescriptor;)V"); + LOG_FATAL_IF(gParcelFileDescriptorOffsets.mConstructor == NULL, + "Unable to find constructor for android.os.ParcelFileDescriptor"); + + return jniRegisterNativeMethods(env, "com/android/server/UsbService", + method_table, NELEM(method_table)); +} + +}; diff --git a/services/jni/onload.cpp b/services/jni/onload.cpp index bdd6d808ac42..37b520bf8d8d 100644 --- a/services/jni/onload.cpp +++ b/services/jni/onload.cpp @@ -13,6 +13,7 @@ int register_android_server_InputWindowHandle(JNIEnv* env); int register_android_server_InputManager(JNIEnv* env); int register_android_server_LightsService(JNIEnv* env); int register_android_server_PowerManagerService(JNIEnv* env); +int register_android_server_UsbService(JNIEnv* env); int register_android_server_VibratorService(JNIEnv* env); int register_android_server_SystemServer(JNIEnv* env); int register_android_server_location_GpsLocationProvider(JNIEnv* env); @@ -40,6 +41,7 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) register_android_server_LightsService(env); register_android_server_AlarmManagerService(env); register_android_server_BatteryService(env); + register_android_server_UsbService(env); register_android_server_VibratorService(env); register_android_server_SystemServer(env); register_android_server_location_GpsLocationProvider(env); diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index f64fd7b59bbe..fde8e677dfcf 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -56,6 +56,8 @@ Layer::Layer(SurfaceFlinger* flinger, mNeedsBlending(true), mNeedsDithering(false), mSecure(false), + mProtectedByApp(false), + mProtectedByDRM(false), mTextureManager(), mBufferManager(mTextureManager), mWidth(0), mHeight(0), mNeedsScaling(false), mFixedSize(false) @@ -190,6 +192,8 @@ status_t Layer::setBuffers( uint32_t w, uint32_t h, mReqHeight = h; mSecure = (flags & ISurfaceComposer::eSecure) ? true : false; + mProtectedByApp = (flags & ISurfaceComposer::eProtectedByApp) ? true : false; + mProtectedByDRM = (flags & ISurfaceComposer::eProtectedByDRM) ? true : false; mNeedsBlending = (info.h_alpha - info.l_alpha) > 0 && (flags & ISurfaceComposer::eOpaque) == 0; @@ -475,6 +479,10 @@ uint32_t Layer::getEffectiveUsage(uint32_t usage) const // request EGLImage for all buffers usage |= GraphicBuffer::USAGE_HW_TEXTURE; } + if (mProtectedByApp || mProtectedByDRM) { + // need a hardware-protected path to external video sink + usage |= GraphicBuffer::USAGE_PROTECTED; + } return usage; } diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 290811982eac..d9a8be334fc4 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -79,6 +79,8 @@ public: virtual bool needsDithering() const { return mNeedsDithering; } virtual bool needsFiltering() const; virtual bool isSecure() const { return mSecure; } + virtual bool isProtectedByApp() const { return mProtectedByApp; } + virtual bool isProtectedByDRM() const { return mProtectedByDRM; } virtual sp<Surface> createSurface() const; virtual status_t ditch(); virtual void onRemoved(); @@ -218,7 +220,9 @@ private: bool mNeedsDithering; // page-flip thread (currently main thread) - bool mSecure; + bool mSecure; // no screenshots + bool mProtectedByApp; // application requires protected path to external sink + bool mProtectedByDRM; // DRM agent requires protected path to external sink Region mPostedDirtyRegion; // page-flip thread and transaction thread (currently main thread) diff --git a/services/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h index 8ed474972b94..184edd779cff 100644 --- a/services/surfaceflinger/LayerBase.h +++ b/services/surfaceflinger/LayerBase.h @@ -196,6 +196,18 @@ public: */ virtual bool isSecure() const { return false; } + /** + * isProtectedByApp - true if application says this surface is protected, that + * is if it requires a hardware-protected data path to an external sink. + */ + virtual bool isProtectedByApp() const { return false; } + + /** + * isProtectedByDRM - true if DRM agent says this surface is protected, that + * is if it requires a hardware-protected data path to an external sink. + */ + virtual bool isProtectedByDRM() const { return false; } + /** Called from the main thread, when the surface is removed from the * draw list */ virtual status_t ditch() { return NO_ERROR; } diff --git a/services/surfaceflinger/LayerDim.h b/services/surfaceflinger/LayerDim.h index f0323149ac25..a04a0c009cc5 100644 --- a/services/surfaceflinger/LayerDim.h +++ b/services/surfaceflinger/LayerDim.h @@ -42,8 +42,10 @@ public: virtual ~LayerDim(); virtual void onDraw(const Region& clip) const; - virtual bool needsBlending() const { return true; } - virtual bool isSecure() const { return false; } + virtual bool needsBlending() const { return true; } + virtual bool isSecure() const { return false; } + virtual bool isProtectedByApp() const { return false; } + virtual bool isProtectedByDRM() const { return false; } virtual const char* getTypeId() const { return "LayerDim"; } static void initDimmer(SurfaceFlinger* flinger, uint32_t w, uint32_t h); diff --git a/telephony/java/com/android/internal/telephony/DataCallState.java b/telephony/java/com/android/internal/telephony/DataCallState.java index d0f3d24f53b3..df12153eba75 100644 --- a/telephony/java/com/android/internal/telephony/DataCallState.java +++ b/telephony/java/com/android/internal/telephony/DataCallState.java @@ -17,16 +17,43 @@ package com.android.internal.telephony; +/** + * This is RIL_Data_Call_Response_v5 from ril.h + * TODO: Rename to DataCallResponse. + */ public class DataCallState { - public int cid; - public int active; - public String type; - public String apn; - public String address; + public int version = 0; + public int status = 0; + public int cid = 0; + public int active = 0; + public String type = ""; + public String ifname = ""; + public String [] addresses = new String[0]; + public String [] dnses = new String[0]; @Override public String toString() { - return "DataCallState: {" + " cid: " + cid + ", active: " + active + ", type: " + type - + ", apn: " + apn + ", address: " + address + " }"; + StringBuffer sb = new StringBuffer(); + sb.append("DataCallState: {") + .append("version=").append(version) + .append(" status=").append(status) + .append(" cid=").append(cid) + .append(" active=").append(active) + .append(" type=").append(type) + .append("' ifname='").append(ifname); + sb.append("' addresses=["); + for (String addr : addresses) { + sb.append(addr); + sb.append(","); + } + if (addresses.length > 0) sb.deleteCharAt(sb.length()-1); + sb.append("] dnses=["); + for (String addr : dnses) { + sb.append(addr); + sb.append(","); + } + if (dnses.length > 0) sb.deleteCharAt(sb.length()-1); + sb.append("]}"); + return sb.toString(); } } diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index a3d3781d085a..31c89d079efb 100644 --- a/telephony/java/com/android/internal/telephony/DataConnection.java +++ b/telephony/java/com/android/internal/telephony/DataConnection.java @@ -27,14 +27,11 @@ import android.os.AsyncResult; import android.os.Message; import android.os.SystemProperties; import android.text.TextUtils; -import android.util.EventLog; import java.net.InetAddress; import java.net.Inet4Address; -import java.net.InterfaceAddress; -import java.net.NetworkInterface; -import java.net.SocketException; import java.net.UnknownHostException; +import java.util.HashMap; /** * {@hide} @@ -56,48 +53,6 @@ import java.net.UnknownHostException; * <code>AsyncResult.exception = new Exception()</code>. * * The other public methods are provided for debugging. - * - * Below is the state machine description for this class. - * - * DataConnection { - * + mDefaultState { - * EVENT_RESET { clearSettings, notifiyDisconnectCompleted, >mInactiveState }. - * EVENT_CONNECT { notifyConnectCompleted(FailCause.UNKNOWN) }. - * EVENT_DISCONNECT { notifyDisconnectCompleted }. - * - * // Ignored messages - * EVENT_SETUP_DATA_CONNECTION_DONE, - * EVENT_GET_LAST_FAIL_DONE, - * EVENT_DEACTIVATE_DONE. - * } - * ++ # mInactiveState - * e(doNotifications) - * x(clearNotifications) { - * EVENT_RESET { notifiyDisconnectCompleted }. - * EVENT_CONNECT {startConnecting, >mActivatingState }. - * } - * ++ mActivatingState { - * EVENT_DISCONNECT { %EVENT_DISCONNECT }. - * EVENT_SETUP_DATA_CONNECTION_DONE { - * if (SUCCESS) { notifyConnectCompleted(FailCause.NONE), >mActiveState }. - * if (ERR_BadCommand) { - * notifyConnectCompleted(FailCause.UNKNOWN), >mInactiveState }. - * if (ERR_BadDns) { tearDownData($DEACTIVATE_DONE), >mDisconnectingBadDnsState }. - * if (ERR_Other) { getLastDataCallFailCause($EVENT_GET_LAST_FAIL_DONE) }. - * if (ERR_Stale) {}. - * } - * EVENT_GET_LAST_FAIL_DONE { notifyConnectCompleted(result), >mInactive }. - * } - * ++ mActiveState { - * EVENT_DISCONNECT { tearDownData($EVENT_DEACTIVATE_DONE), >mDisconnecting }. - * } - * ++ mDisconnectingState { - * EVENT_DEACTIVATE_DONE { notifyDisconnectCompleted, >mInactiveState }. - * } - * ++ mDisconnectingBadDnsState { - * EVENT_DEACTIVATE_DONE { notifyConnectComplete(FailCause.UNKNOWN), >mInactiveState }. - * } - * } */ public abstract class DataConnection extends HierarchicalStateMachine { protected static final boolean DBG = true; @@ -109,24 +64,22 @@ public abstract class DataConnection extends HierarchicalStateMachine { * Class returned by onSetupConnectionCompleted. */ protected enum SetupResult { + SUCCESS, ERR_BadCommand, - ERR_BadDns, - ERR_Other, + ERR_UnacceptableParameter, + ERR_GetLastErrorFromRil, ERR_Stale, - SUCCESS; + ERR_RilError; public FailCause mFailCause; + SetupResult() { + mFailCause = FailCause.fromInt(0); + } + @Override public String toString() { - switch (this) { - case ERR_BadCommand: return "Bad Command"; - case ERR_BadDns: return "Bad DNS"; - case ERR_Other: return "Other error"; - case ERR_Stale: return "Stale command"; - case SUCCESS: return "SUCCESS"; - default: return "unknown"; - } + return name() + " SetupResult.mFailCause=" + mFailCause; } } @@ -168,31 +121,66 @@ public abstract class DataConnection extends HierarchicalStateMachine { } /** - * Returned as the reason for a connection failure. + * Returned as the reason for a connection failure as defined + * by RIL_DataCallFailCause in ril.h and some local errors. */ public enum FailCause { - NONE, - OPERATOR_BARRED, - INSUFFICIENT_RESOURCES, - MISSING_UNKNOWN_APN, - UNKNOWN_PDP_ADDRESS, - USER_AUTHENTICATION, - ACTIVATION_REJECT_GGSN, - ACTIVATION_REJECT_UNSPECIFIED, - SERVICE_OPTION_NOT_SUPPORTED, - SERVICE_OPTION_NOT_SUBSCRIBED, - SERVICE_OPTION_OUT_OF_ORDER, - NSAPI_IN_USE, - PROTOCOL_ERRORS, - REGISTRATION_FAIL, - GPRS_REGISTRATION_FAIL, - UNKNOWN, - - RADIO_NOT_AVAILABLE; + NONE(0), + + // This series of errors as specified by the standards + // specified in ril.h + OPERATOR_BARRED(0x08), + INSUFFICIENT_RESOURCES(0x1A), + MISSING_UNKNOWN_APN(0x1B), + UNKNOWN_PDP_ADDRESS_TYPE(0x1C), + USER_AUTHENTICATION(0x1D), + ACTIVATION_REJECT_GGSN(0x1E), + ACTIVATION_REJECT_UNSPECIFIED(0x1F), + SERVICE_OPTION_NOT_SUPPORTED(0x20), + SERVICE_OPTION_NOT_SUBSCRIBED(0x21), + SERVICE_OPTION_OUT_OF_ORDER(0x22), + NSAPI_IN_USE(0x23), + ONLY_IPV4_ALLOWED(0x32), + ONLY_IPV6_ALLOWED(0x33), + ONLY_SINGLE_BEARER_ALLOWED(0x34), + PROTOCOL_ERRORS(0x6F), + + // Local errors generated by Vendor RIL + // specified in ril.h + REGISTRATION_FAIL(-1), + GPRS_REGISTRATION_FAIL(-2), + SIGNAL_LOST(-3), + PREF_RADIO_TECH_CHANGED(-4), + RADIO_POWER_OFF(-5), + TETHERED_CALL_ACTIVE(-6), + ERROR_UNSPECIFIED(0xFFFF), + + // Errors generated by the Framework + // specified here + UNKNOWN(0x10000), + RADIO_NOT_AVAILABLE(0x10001), + UNACCEPTABLE_NETWORK_PARAMETER(0x10002); + + private final int mErrorCode; + private static final HashMap<Integer, FailCause> sErrorCodeToFailCauseMap; + static { + sErrorCodeToFailCauseMap = new HashMap<Integer, FailCause>(); + for (FailCause fc : values()) { + sErrorCodeToFailCauseMap.put(fc.ordinal(), fc); + } + } + + FailCause(int errorCode) { + mErrorCode = errorCode; + } + + int getErrorCode() { + return mErrorCode; + } public boolean isPermanentFail() { return (this == OPERATOR_BARRED) || (this == MISSING_UNKNOWN_APN) || - (this == UNKNOWN_PDP_ADDRESS) || (this == USER_AUTHENTICATION) || + (this == UNKNOWN_PDP_ADDRESS_TYPE) || (this == USER_AUTHENTICATION) || (this == SERVICE_OPTION_NOT_SUPPORTED) || (this == SERVICE_OPTION_NOT_SUBSCRIBED) || (this == NSAPI_IN_USE) || (this == PROTOCOL_ERRORS); @@ -200,52 +188,21 @@ public abstract class DataConnection extends HierarchicalStateMachine { public boolean isEventLoggable() { return (this == OPERATOR_BARRED) || (this == INSUFFICIENT_RESOURCES) || - (this == UNKNOWN_PDP_ADDRESS) || (this == USER_AUTHENTICATION) || + (this == UNKNOWN_PDP_ADDRESS_TYPE) || (this == USER_AUTHENTICATION) || (this == ACTIVATION_REJECT_GGSN) || (this == ACTIVATION_REJECT_UNSPECIFIED) || (this == SERVICE_OPTION_NOT_SUBSCRIBED) || (this == SERVICE_OPTION_NOT_SUPPORTED) || (this == SERVICE_OPTION_OUT_OF_ORDER) || (this == NSAPI_IN_USE) || - (this == PROTOCOL_ERRORS); + (this == PROTOCOL_ERRORS) || + (this == UNACCEPTABLE_NETWORK_PARAMETER); } - @Override - public String toString() { - switch (this) { - case NONE: - return "No Error"; - case OPERATOR_BARRED: - return "Operator Barred"; - case INSUFFICIENT_RESOURCES: - return "Insufficient Resources"; - case MISSING_UNKNOWN_APN: - return "Missing / Unknown APN"; - case UNKNOWN_PDP_ADDRESS: - return "Unknown PDP Address"; - case USER_AUTHENTICATION: - return "Error User Authentication"; - case ACTIVATION_REJECT_GGSN: - return "Activation Reject GGSN"; - case ACTIVATION_REJECT_UNSPECIFIED: - return "Activation Reject unspecified"; - case SERVICE_OPTION_NOT_SUPPORTED: - return "Data Not Supported"; - case SERVICE_OPTION_NOT_SUBSCRIBED: - return "Data Not subscribed"; - case SERVICE_OPTION_OUT_OF_ORDER: - return "Data Services Out of Order"; - case NSAPI_IN_USE: - return "NSAPI in use"; - case PROTOCOL_ERRORS: - return "Protocol Errors"; - case REGISTRATION_FAIL: - return "Network Registration Failure"; - case GPRS_REGISTRATION_FAIL: - return "Data Network Registration Failure"; - case RADIO_NOT_AVAILABLE: - return "Radio Not Available"; - default: - return "Unknown Data Error"; + public static FailCause fromInt(int errorCode) { + FailCause fc = sErrorCodeToFailCauseMap.get(errorCode); + if (fc == null) { + fc = UNKNOWN; } + return fc; } } @@ -275,12 +232,11 @@ public abstract class DataConnection extends HierarchicalStateMachine { Object userData; //***** Abstract methods + @Override public abstract String toString(); protected abstract void onConnect(ConnectionParams cp); - protected abstract FailCause getFailCauseFromRequest(int rilCause); - protected abstract boolean isDnsOk(String[] domainNameServers); protected abstract void log(String s); @@ -301,7 +257,7 @@ public abstract class DataConnection extends HierarchicalStateMachine { addState(mActivatingState, mDefaultState); addState(mActiveState, mDefaultState); addState(mDisconnectingState, mDefaultState); - addState(mDisconnectingBadDnsState, mDefaultState); + addState(mDisconnectingErrorCreatingConnection, mDefaultState); setInitialState(mInactiveState); if (DBG) log("DataConnection constructor X"); } @@ -409,20 +365,26 @@ public abstract class DataConnection extends HierarchicalStateMachine { * @return SetupResult. */ private SetupResult onSetupConnectionCompleted(AsyncResult ar) { - SetupResult result; - String[] response = ((String[]) ar.result); + DataCallState response = (DataCallState) ar.result; ConnectionParams cp = (ConnectionParams) ar.userObj; + SetupResult result; if (ar.exception != null) { - if (DBG) log("DataConnection Init failed " + ar.exception); + if (DBG) { + log("onSetupConnectionCompleted failed, ar.exception=" + ar.exception + + " response=" + response); + } if (ar.exception instanceof CommandException && ((CommandException) (ar.exception)).getCommandError() == CommandException.Error.RADIO_NOT_AVAILABLE) { result = SetupResult.ERR_BadCommand; result.mFailCause = FailCause.RADIO_NOT_AVAILABLE; + } else if ((response == null) || (response.version < 4)) { + result = SetupResult.ERR_GetLastErrorFromRil; } else { - result = SetupResult.ERR_Other; + result = SetupResult.ERR_RilError; + result.mFailCause = FailCause.fromInt(response.status); } } else if (cp.tag != mTag) { if (DBG) { @@ -430,112 +392,93 @@ public abstract class DataConnection extends HierarchicalStateMachine { } result = SetupResult.ERR_Stale; } else { -// log("onSetupConnectionCompleted received " + response.length + " response strings:"); -// for (int i = 0; i < response.length; i++) { -// log(" response[" + i + "]='" + response[i] + "'"); -// } + log("onSetupConnectionCompleted received DataCallState: " + response); // Start with clean network properties and if we have // a failure we'll clear again at the bottom of this code. LinkProperties linkProperties = new LinkProperties(); - if (response.length >= 2) { - cid = Integer.parseInt(response[0]); - String interfaceName = response[1]; - result = SetupResult.SUCCESS; - + if (response.status == FailCause.NONE.getErrorCode()) { try { - String prefix = "net." + interfaceName + "."; - - NetworkInterface networkInterface = NetworkInterface.getByName(interfaceName); - linkProperties.setInterfaceName(interfaceName); - - if (response.length >= 5) { - log("response.length >=5 using response for ip='" + response[2] + - "' dns='" + response[3] + "' gateway='" + response[4] + "'"); - String [] addresses = response[2].split(" "); - String [] dnses = response[3].split(" "); - String gateway = response[4]; - for (String addr : addresses) { - LinkAddress la; - if (!InetAddress.isNumeric(addr)) { - throw new RuntimeException( - "Vendor ril bug: Non-numeric ip addr=" + addr); - } - InetAddress ia = InetAddress.getByName(addr); - if (ia instanceof Inet4Address) { - la = new LinkAddress(ia, 32); - } else { - la = new LinkAddress(ia, 128); - } - linkProperties.addLinkAddress(la); + cid = response.cid; + linkProperties.setInterfaceName(response.ifname); + for (String addr : response.addresses) { + LinkAddress la; + if (!InetAddress.isNumeric(addr)) { + EventLogTags.writeBadIpAddress(addr); + throw new UnknownHostException("Non-numeric ip addr=" + addr); } - - if (dnses.length != 0) { - for (String addr : dnses) { - if (!InetAddress.isNumeric(addr)) { - throw new RuntimeException( - "Vendor ril bug: Non-numeric dns addr=" + addr); - } - InetAddress ia = InetAddress.getByName(addr); - linkProperties.addDns(ia); - } - result = SetupResult.SUCCESS; + InetAddress ia = InetAddress.getByName(addr); + if (ia instanceof Inet4Address) { + la = new LinkAddress(ia, 32); } else { - result = SetupResult.ERR_BadDns; + la = new LinkAddress(ia, 128); } + linkProperties.addLinkAddress(la); + } - if (!InetAddress.isNumeric(gateway)) { - throw new RuntimeException( - "Vendor ril bug: Non-numeric gateway addr=" + gateway); + if (response.dnses.length != 0) { + for (String addr : response.dnses) { + if (!InetAddress.isNumeric(addr)) { + EventLogTags.writePdpBadDnsAddress("dns=" + addr); + throw new UnknownHostException("Non-numeric dns addr=" + addr); + } + InetAddress ia = InetAddress.getByName(addr); + linkProperties.addDns(ia); } - linkProperties.setGateway(InetAddress.getByName(gateway)); - + result = SetupResult.SUCCESS; } else { - log("response.length < 5 using properties for dns and gateway"); - for (InterfaceAddress addr : networkInterface.getInterfaceAddresses()) { - linkProperties.addLinkAddress(new LinkAddress(addr)); - } - - String gatewayAddress = SystemProperties.get(prefix + "gw"); - linkProperties.setGateway(InetAddress.getByName(gatewayAddress)); + String prefix = "net." + response.ifname + "."; String dnsServers[] = new String[2]; dnsServers[0] = SystemProperties.get(prefix + "dns1"); dnsServers[1] = SystemProperties.get(prefix + "dns2"); if (isDnsOk(dnsServers)) { - linkProperties.addDns(InetAddress.getByName(dnsServers[0])); - linkProperties.addDns(InetAddress.getByName(dnsServers[1])); + for (String dnsAddr : dnsServers) { + if (!InetAddress.isNumeric(dnsAddr)) { + EventLogTags.writePdpBadDnsAddress("dnsAddr=" + dnsAddr); + throw new UnknownHostException("Non-numeric dns addr=" + + dnsAddr); + } + InetAddress ia = InetAddress.getByName(dnsAddr); + linkProperties.addDns(ia); + } + result = SetupResult.SUCCESS; } else { - result = SetupResult.ERR_BadDns; + StringBuilder sb = new StringBuilder(); + for (String dnsAddr : dnsServers) { + sb.append(dnsAddr); + sb.append(" "); + } + EventLogTags.writePdpBadDnsAddress("Unacceptable dns addresses=" + sb); + throw new UnknownHostException("Unacceptable dns addresses=" + sb); } } - } catch (UnknownHostException e1) { - log("onSetupCompleted: UnknowHostException " + e1); - e1.printStackTrace(); - result = SetupResult.ERR_Other; - } catch (SocketException e2) { - log("onSetupCompleted: SocketException " + e2); - e2.printStackTrace(); - result = SetupResult.ERR_Other; + } catch (UnknownHostException e) { + log("onSetupCompleted: UnknownHostException " + e); + e.printStackTrace(); + result = SetupResult.ERR_UnacceptableParameter; } } else { - log("onSetupCompleted: error; expected number of responses >= 2 was " + - response.length); - result = SetupResult.ERR_Other; + if (response.version < 4) { + result = SetupResult.ERR_GetLastErrorFromRil; + } else { + result = SetupResult.ERR_RilError; + } } // An error occurred so clear properties if (result != SetupResult.SUCCESS) { - log("onSetupCompleted with an error clearing LinkProperties"); + log("onSetupConnectionCompleted with an error, clearing LinkProperties"); linkProperties.clear(); } mLinkProperties = linkProperties; } if (DBG) { - log("DataConnection setup result='" + result + "' on cid=" + cid); + log("onSetupConnectionCompleted: DataConnection setup result='" + + result + "' on cid=" + cid); if (result == SetupResult.SUCCESS) { - log("LinkProperties: " + mLinkProperties.toString()); + log("onSetupConnectionCompleted: LinkProperties: " + mLinkProperties.toString()); } } return result; @@ -684,6 +627,7 @@ public abstract class DataConnection extends HierarchicalStateMachine { cp = (ConnectionParams) ar.userObj; SetupResult result = onSetupConnectionCompleted(ar); + if (DBG) log("DcActivatingState onSetupConnectionCompleted result=" + result); switch (result) { case SUCCESS: // All is well @@ -697,26 +641,21 @@ public abstract class DataConnection extends HierarchicalStateMachine { mInactiveState.setEnterNotificationParams(cp, result.mFailCause); transitionTo(mInactiveState); break; - case ERR_BadDns: - // Connection succeeded but DNS info is bad so disconnect - StringBuilder dnsAddressesSb = new StringBuilder(); - for (InetAddress addr : mLinkProperties.getDnses()) { - if (dnsAddressesSb.length() != 0) dnsAddressesSb.append(" "); - dnsAddressesSb.append(addr.toString()); - } - if (dnsAddressesSb.length() == 0) { - dnsAddressesSb.append("no-dns-addresses"); - } - EventLog.writeEvent(EventLogTags.PDP_BAD_DNS_ADDRESS, - dnsAddressesSb.toString()); + case ERR_UnacceptableParameter: + // The addresses given from the RIL are bad tearDownData(cp); - transitionTo(mDisconnectingBadDnsState); + transitionTo(mDisconnectingErrorCreatingConnection); break; - case ERR_Other: - // Request the failure cause and process in this state + case ERR_GetLastErrorFromRil: + // Request failed and this is an old RIL phone.mCM.getLastDataCallFailCause( obtainMessage(EVENT_GET_LAST_FAIL_DONE, cp)); break; + case ERR_RilError: + // Request failed and mFailCause has the reason + mInactiveState.setEnterNotificationParams(cp, result.mFailCause); + transitionTo(mInactiveState); + break; case ERR_Stale: // Request is stale, ignore. break; @@ -735,7 +674,7 @@ public abstract class DataConnection extends HierarchicalStateMachine { if (DBG) log("DcActivatingState msg.what=EVENT_GET_LAST_FAIL_DONE"); if (ar.exception == null) { int rilFailCause = ((int[]) (ar.result))[0]; - cause = getFailCauseFromRequest(rilFailCause); + cause = FailCause.fromInt(rilFailCause); } // Transition to inactive but send notifications after // we've entered the mInactive state. @@ -852,10 +791,9 @@ public abstract class DataConnection extends HierarchicalStateMachine { private DcDisconnectingState mDisconnectingState = new DcDisconnectingState(); /** - * The state machine is disconnecting after a bad dns setup - * was found in mInactivatingState. + * The state machine is disconnecting after an creating a connection. */ - private class DcDisconnectingBadDnsState extends HierarchicalState { + private class DcDisconnectionErrorCreatingConnection extends HierarchicalState { @Override protected boolean processMessage(Message msg) { boolean retVal; @@ -864,27 +802,38 @@ public abstract class DataConnection extends HierarchicalStateMachine { AsyncResult ar = (AsyncResult) msg.obj; ConnectionParams cp = (ConnectionParams) ar.userObj; if (cp.tag == mTag) { - if (DBG) log("DcDisconnectingBadDnsState msg.what=EVENT_DEACTIVATE_DONE"); + if (DBG) { + log("DcDisconnectionErrorCreatingConnection" + + " msg.what=EVENT_DEACTIVATE_DONE"); + } + // Transition to inactive but send notifications after // we've entered the mInactive state. - mInactiveState.setEnterNotificationParams(cp, FailCause.UNKNOWN); + mInactiveState.setEnterNotificationParams(cp, + FailCause.UNACCEPTABLE_NETWORK_PARAMETER); transitionTo(mInactiveState); } else { - if (DBG) log("DcDisconnectingBadDnsState EVENT_DEACTIVE_DONE stale dp.tag=" - + cp.tag + ", mTag=" + mTag); + if (DBG) { + log("DcDisconnectionErrorCreatingConnection EVENT_DEACTIVATE_DONE" + + " stale dp.tag=" + cp.tag + ", mTag=" + mTag); + } } retVal = true; break; default: - if (DBG) log("DcDisconnectingBadDnsState not handled msg.what=" + msg.what); + if (DBG) { + log("DcDisconnectionErrorCreatingConnection not handled msg.what=" + + msg.what); + } retVal = false; break; } return retVal; } } - private DcDisconnectingBadDnsState mDisconnectingBadDnsState = new DcDisconnectingBadDnsState(); + private DcDisconnectionErrorCreatingConnection mDisconnectingErrorCreatingConnection = + new DcDisconnectionErrorCreatingConnection(); // ******* public interface diff --git a/telephony/java/com/android/internal/telephony/EventLogTags.logtags b/telephony/java/com/android/internal/telephony/EventLogTags.logtags index b06c27d215f8..9be7b800cf69 100644 --- a/telephony/java/com/android/internal/telephony/EventLogTags.logtags +++ b/telephony/java/com/android/internal/telephony/EventLogTags.logtags @@ -53,3 +53,6 @@ option java_package com.android.internal.telephony; # CDMA service state transition 50116 cdma_service_state_change (oldState|1|5), (oldDataState|1|5), (newState|1|5), (newDataState|1|5) + +# Bad IP address +50117 bad_ip_address (ip_address|3) diff --git a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.aidl b/telephony/java/com/android/internal/telephony/OperatorInfo.aidl index d88d0b721f47..3ded8dd3bcd7 100644 --- a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.aidl +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.aidl @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.internal.telephony.gsm; +package com.android.internal.telephony; /** - * Used to indicate that the NetworkInfo object is parcelable to aidl. - * This is a simple effort to make NetworkInfo parcelable rather than + * Used to indicate that the OperatorInfo object is parcelable to aidl. + * This is a simple effort to make OperatorInfo parcelable rather than * trying to make the conventional containing object (AsyncResult), * implement parcelable. This functionality is needed for the * NetworkQueryService to fix 1128695 */ -parcelable NetworkInfo; +parcelable OperatorInfo; diff --git a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java index 04fd13e715a7..1999cb3ada4f 100644 --- a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.telephony.gsm; +package com.android.internal.telephony; import android.os.Parcel; import android.os.Parcelable; @@ -22,7 +22,7 @@ import android.os.Parcelable; /** * {@hide} */ -public class NetworkInfo implements Parcelable { +public class OperatorInfo implements Parcelable { public enum State { UNKNOWN, AVAILABLE, @@ -30,11 +30,11 @@ public class NetworkInfo implements Parcelable { FORBIDDEN; } - String operatorAlphaLong; - String operatorAlphaShort; - String operatorNumeric; + private String operatorAlphaLong; + private String operatorAlphaShort; + private String operatorNumeric; - State state = State.UNKNOWN; + private State state = State.UNKNOWN; public String @@ -57,7 +57,7 @@ public class NetworkInfo implements Parcelable { return state; } - NetworkInfo(String operatorAlphaLong, + OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, State state) { @@ -70,7 +70,7 @@ public class NetworkInfo implements Parcelable { } - public NetworkInfo(String operatorAlphaLong, + public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, String stateString) { @@ -98,7 +98,7 @@ public class NetworkInfo implements Parcelable { public String toString() { - return "NetworkInfo " + operatorAlphaLong + return "OperatorInfo " + operatorAlphaLong + "/" + operatorAlphaShort + "/" + operatorNumeric + "/" + state; @@ -106,7 +106,7 @@ public class NetworkInfo implements Parcelable { /** * Parcelable interface implemented below. - * This is a simple effort to make NetworkInfo parcelable rather than + * This is a simple effort to make OperatorInfo parcelable rather than * trying to make the conventional containing object (AsyncResult), * implement parcelable. This functionality is needed for the * NetworkQueryService to fix 1128695. @@ -118,7 +118,7 @@ public class NetworkInfo implements Parcelable { /** * Implement the Parcelable interface. - * Method to serialize a NetworkInfo object. + * Method to serialize a OperatorInfo object. */ public void writeToParcel(Parcel dest, int flags) { dest.writeString(operatorAlphaLong); @@ -129,21 +129,21 @@ public class NetworkInfo implements Parcelable { /** * Implement the Parcelable interface - * Method to deserialize a NetworkInfo object, or an array thereof. + * Method to deserialize a OperatorInfo object, or an array thereof. */ - public static final Creator<NetworkInfo> CREATOR = - new Creator<NetworkInfo>() { - public NetworkInfo createFromParcel(Parcel in) { - NetworkInfo netInfo = new NetworkInfo( + public static final Creator<OperatorInfo> CREATOR = + new Creator<OperatorInfo>() { + public OperatorInfo createFromParcel(Parcel in) { + OperatorInfo opInfo = new OperatorInfo( in.readString(), /*operatorAlphaLong*/ in.readString(), /*operatorAlphaShort*/ in.readString(), /*operatorNumeric*/ (State) in.readSerializable()); /*state*/ - return netInfo; + return opInfo; } - public NetworkInfo[] newArray(int size) { - return new NetworkInfo[size]; + public OperatorInfo[] newArray(int size) { + return new OperatorInfo[size]; } }; } diff --git a/telephony/java/com/android/internal/telephony/Phone.java b/telephony/java/com/android/internal/telephony/Phone.java index d0b5540f494d..e2896d9bcd26 100644 --- a/telephony/java/com/android/internal/telephony/Phone.java +++ b/telephony/java/com/android/internal/telephony/Phone.java @@ -27,7 +27,6 @@ import android.telephony.ServiceState; import android.telephony.SignalStrength; import com.android.internal.telephony.DataConnection; -import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.test.SimulatedRadioControl; import java.util.List; @@ -1056,7 +1055,7 @@ public interface Phone { * one of the following members:.<p> *<ul> * <li><code>response.obj.result</code> will be a <code>List</code> of - * <code>com.android.internal.telephony.gsm.NetworkInfo</code> objects, or</li> + * <code>OperatorInfo</code> objects, or</li> * <li><code>response.obj.exception</code> will be set with an exception * on failure.</li> * </ul> @@ -1070,8 +1069,7 @@ public interface Phone { * @param response The message to dispatch when the network selection * is complete. * - * @see #selectNetworkManually(com.android.internal.telephony.gsm.NetworkInfo, - * android.os.Message ) + * @see #selectNetworkManually(OperatorInfo, android.os.Message ) */ void setNetworkSelectionModeAutomatic(Message response); @@ -1083,7 +1081,7 @@ public interface Phone { * * @see #setNetworkSelectionModeAutomatic(Message) */ - void selectNetworkManually(NetworkInfo network, + void selectNetworkManually(OperatorInfo network, Message response); /** diff --git a/telephony/java/com/android/internal/telephony/PhoneProxy.java b/telephony/java/com/android/internal/telephony/PhoneProxy.java index 219efbb9e50e..15b23bbe3d2a 100644 --- a/telephony/java/com/android/internal/telephony/PhoneProxy.java +++ b/telephony/java/com/android/internal/telephony/PhoneProxy.java @@ -32,7 +32,6 @@ import android.util.Log; import com.android.internal.telephony.cdma.CDMAPhone; import com.android.internal.telephony.gsm.GSMPhone; -import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.test.SimulatedRadioControl; import java.util.List; @@ -550,7 +549,7 @@ public class PhoneProxy extends Handler implements Phone { mActivePhone.setNetworkSelectionModeAutomatic(response); } - public void selectNetworkManually(NetworkInfo network, Message response) { + public void selectNetworkManually(OperatorInfo network, Message response) { mActivePhone.selectNetworkManually(network, response); } diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 91b19a97f17a..dbc489a08ebe 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -50,12 +50,12 @@ import android.util.Log; import com.android.internal.telephony.CallForwardInfo; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.DataCallState; -import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo; import com.android.internal.telephony.gsm.SuppServiceNotification; import com.android.internal.telephony.IccCardApplication; import com.android.internal.telephony.IccCardStatus; import com.android.internal.telephony.IccUtils; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.SmsResponse; import com.android.internal.telephony.cdma.CdmaCallWaitingNotification; @@ -2177,7 +2177,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { case RIL_REQUEST_DTMF: ret = responseVoid(p); break; case RIL_REQUEST_SEND_SMS: ret = responseSMS(p); break; case RIL_REQUEST_SEND_SMS_EXPECT_MORE: ret = responseSMS(p); break; - case RIL_REQUEST_SETUP_DATA_CALL: ret = responseStrings(p); break; + case RIL_REQUEST_SETUP_DATA_CALL: ret = responseSetupDataCall(p); break; case RIL_REQUEST_SIM_IO: ret = responseICC_IO(p); break; case RIL_REQUEST_SEND_USSD: ret = responseVoid(p); break; case RIL_REQUEST_CANCEL_USSD: ret = responseVoid(p); break; @@ -2198,7 +2198,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { case RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE: ret = responseInts(p); break; case RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC: ret = responseVoid(p); break; case RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret = responseNetworkInfos(p); break; + case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret = responseOperatorInfos(p); break; case RIL_REQUEST_DTMF_START: ret = responseVoid(p); break; case RIL_REQUEST_DTMF_STOP: ret = responseVoid(p); break; case RIL_REQUEST_BASEBAND_VERSION: ret = responseString(p); break; @@ -2935,37 +2935,95 @@ public final class RIL extends BaseCommands implements CommandsInterface { return response; } + private DataCallState getDataCallState(Parcel p, int version) { + DataCallState dataCall = new DataCallState(); + + dataCall.version = version; + if (version < 5) { + dataCall.cid = p.readInt(); + dataCall.active = p.readInt(); + dataCall.type = p.readString(); + p.readString(); // Ignore apn + String addresses = p.readString(); + if (addresses != null) { + dataCall.addresses = addresses.split(" "); + } + } else { + dataCall.status = p.readInt(); + dataCall.cid = p.readInt(); + dataCall.active = p.readInt(); + dataCall.type = p.readString(); + dataCall.ifname = p.readString(); + String addresses = p.readString(); + if (addresses != null) { + dataCall.addresses = addresses.split(" "); + } + String dnses = p.readString(); + if (addresses != null) { + dataCall.dnses = dnses.split(" "); + } + } + return dataCall; + } + private Object responseDataCallList(Parcel p) { - int num; ArrayList<DataCallState> response; - num = p.readInt(); - response = new ArrayList<DataCallState>(num); + int ver = p.readInt(); + int num = p.readInt(); + Log.d(LOG_TAG, "responseDataCallList ver=" + ver + " num=" + num); + response = new ArrayList<DataCallState>(num); for (int i = 0; i < num; i++) { - DataCallState dataCall = new DataCallState(); + response.add(getDataCallState(p, ver)); + } - dataCall.cid = p.readInt(); - dataCall.active = p.readInt(); - dataCall.type = p.readString(); - dataCall.apn = p.readString(); - String address = p.readString(); - if (address != null) { - address = address.split(" ")[0]; - } - dataCall.address = address; + return response; + } + + private Object + responseSetupDataCall(Parcel p) { + int ver = p.readInt(); + int num = p.readInt(); + Log.d(LOG_TAG, "responseSetupDataCall ver=" + ver + " num=" + num); - response.add(dataCall); + DataCallState dataCall; + + if (ver < 5) { + if (num != 3) { + throw new RuntimeException( + "RIL_REQUEST_SETUP_DATA_CALL response expecting 3 strings got " + num); + } + dataCall = new DataCallState(); + dataCall.cid = Integer.parseInt(p.readString()); + dataCall.ifname = p.readString(); + if (dataCall.ifname == null) { + throw new RuntimeException( + "RIL_REQUEST_SETUP_DATA_CALL response ifname"); + } + String addresses = p.readString(); + if (addresses == null) { + throw new RuntimeException( + "RIL_REQUEST_SETUP_DATA_CALL response no addresses"); + } + dataCall.addresses = addresses.split(" "); + } else { + if (num != 1) { + throw new RuntimeException( + "RIL_REQUEST_SETUP_DATA_CALL response expecting 1 RIL_Data_Call_response_v5" + + " got " + num); + } + dataCall = getDataCallState(p, ver); } - return response; + return dataCall; } private Object - responseNetworkInfos(Parcel p) { + responseOperatorInfos(Parcel p) { String strings[] = (String [])responseStrings(p); - ArrayList<NetworkInfo> ret; + ArrayList<OperatorInfo> ret; if (strings.length % 4 != 0) { throw new RuntimeException( @@ -2973,11 +3031,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { + strings.length + " strings, expected multible of 4"); } - ret = new ArrayList<NetworkInfo>(strings.length / 4); + ret = new ArrayList<OperatorInfo>(strings.length / 4); for (int i = 0 ; i < strings.length ; i += 4) { ret.add ( - new NetworkInfo( + new OperatorInfo( strings[i+0], strings[i+1], strings[i+2], diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index a1d512100625..3131ebebc6ad 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -56,6 +56,7 @@ import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; import com.android.internal.telephony.IccSmsInterfaceManager; import com.android.internal.telephony.MmiCode; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; import com.android.internal.telephony.PhoneNotifier; @@ -483,7 +484,7 @@ public class CDMAPhone extends PhoneBase { } public void - selectNetworkManually(com.android.internal.telephony.gsm.NetworkInfo network, + selectNetworkManually(OperatorInfo network, Message response) { Log.e(LOG_TAG, "selectNetworkManually: not possible in CDMA"); } diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java index 1b2c9183daef..1a0dbc2f0ca3 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java @@ -20,6 +20,7 @@ import android.os.Message; import android.util.Log; import com.android.internal.telephony.DataConnection; +import com.android.internal.telephony.DataConnection.FailCause; import com.android.internal.telephony.Phone; import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.RetryManager; @@ -31,13 +32,6 @@ public class CdmaDataConnection extends DataConnection { private static final String LOG_TAG = "CDMA"; - /** Fail cause of last Data Call activate from RIL_LastDataCallActivateFailCause */ - private final static int PS_NET_DOWN_REASON_OPERATOR_DETERMINED_BARRING = 8; - private final static int PS_NET_DOWN_REASON_AUTH_FAILED = 29; - private final static int PS_NET_DOWN_REASON_OPTION_NOT_SUPPORTED = 32; - private final static int PS_NET_DOWN_REASON_OPTION_UNSUBSCRIBED = 33; - - // ***** Constructor private CdmaDataConnection(CDMAPhone phone, String name, RetryManager rm) { super(phone, name, rm); @@ -104,29 +98,6 @@ public class CdmaDataConnection extends DataConnection { } @Override - protected FailCause getFailCauseFromRequest(int rilCause) { - FailCause cause; - - switch (rilCause) { - case PS_NET_DOWN_REASON_OPERATOR_DETERMINED_BARRING: - cause = FailCause.OPERATOR_BARRED; - break; - case PS_NET_DOWN_REASON_AUTH_FAILED: - cause = FailCause.USER_AUTHENTICATION; - break; - case PS_NET_DOWN_REASON_OPTION_NOT_SUPPORTED: - cause = FailCause.SERVICE_OPTION_NOT_SUPPORTED; - break; - case PS_NET_DOWN_REASON_OPTION_UNSUBSCRIBED: - cause = FailCause.SERVICE_OPTION_NOT_SUBSCRIBED; - break; - default: - cause = FailCause.UNKNOWN; - } - return cause; - } - - @Override protected boolean isDnsOk(String[] domainNameServers) { if ((NULL_IP.equals(domainNameServers[0]) && NULL_IP.equals(domainNameServers[1]) diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java index e8ad0f21cf02..c17197e46f79 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -62,6 +62,7 @@ import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; import com.android.internal.telephony.IccSmsInterfaceManager; import com.android.internal.telephony.MmiCode; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; import com.android.internal.telephony.PhoneNotifier; @@ -1025,19 +1026,19 @@ public class GSMPhone extends PhoneBase { } public void - selectNetworkManually(com.android.internal.telephony.gsm.NetworkInfo network, + selectNetworkManually(OperatorInfo network, Message response) { // wrap the response message in our own message along with // the operator's id. NetworkSelectMessage nsm = new NetworkSelectMessage(); nsm.message = response; - nsm.operatorNumeric = network.operatorNumeric; - nsm.operatorAlphaLong = network.operatorAlphaLong; + nsm.operatorNumeric = network.getOperatorNumeric(); + nsm.operatorAlphaLong = network.getOperatorAlphaLong(); // get the message Message msg = obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm); - mCM.setNetworkSelectionModeManual(network.operatorNumeric, msg); + mCM.setNetworkSelectionModeManual(network.getOperatorNumeric(), msg); } public void diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java index b94702060387..1d60bdae1e69 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -33,24 +33,6 @@ public class GsmDataConnection extends DataConnection { private static final String LOG_TAG = "GSM"; - /** Fail cause of last PDP activate, from RIL_LastPDPActivateFailCause */ - private static final int PDP_FAIL_OPERATOR_BARRED = 0x08; - private static final int PDP_FAIL_INSUFFICIENT_RESOURCES = 0x1A; - private static final int PDP_FAIL_MISSING_UKNOWN_APN = 0x1B; - private static final int PDP_FAIL_UNKNOWN_PDP_ADDRESS_TYPE = 0x1C; - private static final int PDP_FAIL_USER_AUTHENTICATION = 0x1D; - private static final int PDP_FAIL_ACTIVATION_REJECT_GGSN = 0x1E; - private static final int PDP_FAIL_ACTIVATION_REJECT_UNSPECIFIED = 0x1F; - private static final int PDP_FAIL_SERVICE_OPTION_NOT_SUPPORTED = 0x20; - private static final int PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED = 0x21; - private static final int PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER = 0x22; - private static final int PDP_FAIL_NSAPI_IN_USE = 0x23; - private static final int PDP_FAIL_PROTOCOL_ERRORS = 0x6F; - private static final int PDP_FAIL_ERROR_UNSPECIFIED = 0xffff; - - private static final int PDP_FAIL_REGISTRATION_FAIL = -1; - private static final int PDP_FAIL_GPRS_REGISTRATION_FAIL = -2; - //***** Instance Variables private ApnSetting apn; @@ -132,62 +114,6 @@ public class GsmDataConnection extends DataConnection { } @Override - protected FailCause getFailCauseFromRequest(int rilCause) { - FailCause cause; - - switch (rilCause) { - case PDP_FAIL_OPERATOR_BARRED: - cause = FailCause.OPERATOR_BARRED; - break; - case PDP_FAIL_INSUFFICIENT_RESOURCES: - cause = FailCause.INSUFFICIENT_RESOURCES; - break; - case PDP_FAIL_MISSING_UKNOWN_APN: - cause = FailCause.MISSING_UNKNOWN_APN; - break; - case PDP_FAIL_UNKNOWN_PDP_ADDRESS_TYPE: - cause = FailCause.UNKNOWN_PDP_ADDRESS; - break; - case PDP_FAIL_USER_AUTHENTICATION: - cause = FailCause.USER_AUTHENTICATION; - break; - case PDP_FAIL_ACTIVATION_REJECT_GGSN: - cause = FailCause.ACTIVATION_REJECT_GGSN; - break; - case PDP_FAIL_ACTIVATION_REJECT_UNSPECIFIED: - cause = FailCause.ACTIVATION_REJECT_UNSPECIFIED; - break; - case PDP_FAIL_SERVICE_OPTION_OUT_OF_ORDER: - cause = FailCause.SERVICE_OPTION_OUT_OF_ORDER; - break; - case PDP_FAIL_SERVICE_OPTION_NOT_SUPPORTED: - cause = FailCause.SERVICE_OPTION_NOT_SUPPORTED; - break; - case PDP_FAIL_SERVICE_OPTION_NOT_SUBSCRIBED: - cause = FailCause.SERVICE_OPTION_NOT_SUBSCRIBED; - break; - case PDP_FAIL_NSAPI_IN_USE: - cause = FailCause.NSAPI_IN_USE; - break; - case PDP_FAIL_PROTOCOL_ERRORS: - cause = FailCause.PROTOCOL_ERRORS; - break; - case PDP_FAIL_ERROR_UNSPECIFIED: - cause = FailCause.UNKNOWN; - break; - case PDP_FAIL_REGISTRATION_FAIL: - cause = FailCause.REGISTRATION_FAIL; - break; - case PDP_FAIL_GPRS_REGISTRATION_FAIL: - cause = FailCause.GPRS_REGISTRATION_FAIL; - break; - default: - cause = FailCause.UNKNOWN; - } - return cause; - } - - @Override protected boolean isDnsOk(String[] domainNameServers) { if (NULL_IP.equals(domainNameServers[0]) && NULL_IP.equals(domainNameServers[1]) && !((GSMPhone) phone).isDnsCheckDisabled()) { diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java index db9e35ab678c..9dfc0158a26a 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java @@ -38,6 +38,7 @@ import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; import com.android.internal.telephony.IccSmsInterfaceManager; import com.android.internal.telephony.MmiCode; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; import com.android.internal.telephony.PhoneNotifier; @@ -347,7 +348,7 @@ abstract class SipPhoneBase extends PhoneBase { } public void selectNetworkManually( - com.android.internal.telephony.gsm.NetworkInfo network, + OperatorInfo network, Message response) { } diff --git a/wifi/java/android/net/wifi/WifiConfigStore.java b/wifi/java/android/net/wifi/WifiConfigStore.java index 73c24cf02397..55d18443ad82 100644 --- a/wifi/java/android/net/wifi/WifiConfigStore.java +++ b/wifi/java/android/net/wifi/WifiConfigStore.java @@ -18,7 +18,7 @@ package android.net.wifi; import android.content.Context; import android.content.Intent; -import android.net.DhcpInfo; +import android.net.DhcpInfoInternal; import android.net.LinkAddress; import android.net.LinkProperties; import android.net.NetworkUtils; @@ -436,35 +436,25 @@ class WifiConfigStore { * that, we should remove handling DhcpInfo and move * to using LinkProperties */ - static DhcpInfo getIpConfiguration(int netId) { - DhcpInfo dhcpInfo = new DhcpInfo(); + static DhcpInfoInternal getIpConfiguration(int netId) { + DhcpInfoInternal dhcpInfoInternal = new DhcpInfoInternal(); LinkProperties linkProperties = getLinkProperties(netId); if (linkProperties != null) { Iterator<LinkAddress> iter = linkProperties.getLinkAddresses().iterator(); if (iter.hasNext()) { - try { - LinkAddress linkAddress = iter.next(); - dhcpInfo.ipAddress = NetworkUtils.inetAddressToInt( - linkAddress.getAddress()); - dhcpInfo.gateway = NetworkUtils.inetAddressToInt( - linkProperties.getGateway()); - dhcpInfo.netmask = NetworkUtils.prefixLengthToNetmaskInt( - linkAddress.getNetworkPrefixLength()); - Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator(); - dhcpInfo.dns1 = NetworkUtils.inetAddressToInt(dnsIterator.next()); - if (dnsIterator.hasNext()) { - dhcpInfo.dns2 = NetworkUtils.inetAddressToInt(dnsIterator.next()); - } - } catch (IllegalArgumentException e1) { - Log.e(TAG, "IPv6 address cannot be handled " + e1); - } catch (NullPointerException e2) { - /* Should not happen since a stored static config should be valid */ - Log.e(TAG, "Invalid partial IP configuration " + e2); + LinkAddress linkAddress = iter.next(); + dhcpInfoInternal.ipAddress = linkAddress.getAddress().getHostAddress(); + dhcpInfoInternal.gateway = linkProperties.getGateway().getHostAddress(); + dhcpInfoInternal.prefixLength = linkAddress.getNetworkPrefixLength(); + Iterator<InetAddress> dnsIterator = linkProperties.getDnses().iterator(); + dhcpInfoInternal.dns1 = dnsIterator.next().getHostAddress(); + if (dnsIterator.hasNext()) { + dhcpInfoInternal.dns2 = dnsIterator.next().getHostAddress(); } } } - return dhcpInfo; + return dhcpInfoInternal; } /** diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 4d0acdd7044c..f0d26d11325f 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -42,12 +42,16 @@ import android.app.PendingIntent; import android.net.LinkAddress; import android.net.NetworkInfo; import android.net.DhcpInfo; +import android.net.DhcpInfoInternal; import android.net.NetworkUtils; import android.net.ConnectivityManager; +import android.net.InterfaceConfiguration; import android.net.NetworkInfo.DetailedState; +import android.net.NetworkUtils; import android.net.LinkProperties; import android.net.wifi.NetworkUpdateResult; import android.net.wifi.WpsResult.Status; +import android.net.InterfaceConfiguration; import android.os.Binder; import android.os.Message; import android.os.IBinder; @@ -73,7 +77,7 @@ import com.android.internal.util.AsyncChannel; import com.android.internal.util.HierarchicalState; import com.android.internal.util.HierarchicalStateMachine; - +import java.net.InetAddress; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -143,7 +147,7 @@ public class WifiStateMachine extends HierarchicalStateMachine { private Context mContext; - private DhcpInfo mDhcpInfo; + private DhcpInfoInternal mDhcpInfoInternal; private WifiInfo mWifiInfo; private NetworkInfo mNetworkInfo; private SupplicantStateTracker mSupplicantStateTracker; @@ -447,7 +451,7 @@ public class WifiStateMachine extends HierarchicalStateMachine { nwService = INetworkManagementService.Stub.asInterface(b); mWifiMonitor = new WifiMonitor(this); - mDhcpInfo = new DhcpInfo(); + mDhcpInfoInternal = new DhcpInfoInternal(); mWifiInfo = new WifiInfo(); mInterfaceName = SystemProperties.get("wifi.interface", "tiwlan0"); mSupplicantStateTracker = new SupplicantStateTracker(context, this, getHandler()); @@ -465,6 +469,20 @@ public class WifiStateMachine extends HierarchicalStateMachine { mScanIntent = PendingIntent.getBroadcast(mContext, SCAN_REQUEST, scanIntent, 0); mContext.registerReceiver( + new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + + ArrayList<String> available = intent.getStringArrayListExtra( + ConnectivityManager.EXTRA_AVAILABLE_TETHER); + ArrayList<String> active = intent.getStringArrayListExtra( + ConnectivityManager.EXTRA_ACTIVE_TETHER); + updateTetherState(available, active); + + } + },new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)); + + mContext.registerReceiver( new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -637,8 +655,8 @@ public class WifiStateMachine extends HierarchicalStateMachine { } public DhcpInfo syncGetDhcpInfo() { - synchronized (mDhcpInfo) { - return new DhcpInfo(mDhcpInfo); + synchronized (mDhcpInfoInternal) { + return mDhcpInfoInternal.makeDhcpInfo(); } } @@ -954,7 +972,7 @@ public class WifiStateMachine extends HierarchicalStateMachine { sb.append("current HSM state: ").append(getCurrentState().getName()).append(LS); sb.append("mLinkProperties ").append(mLinkProperties).append(LS); sb.append("mWifiInfo ").append(mWifiInfo).append(LS); - sb.append("mDhcpInfo ").append(mDhcpInfo).append(LS); + sb.append("mDhcpInfoInternal ").append(mDhcpInfoInternal).append(LS); sb.append("mNetworkInfo ").append(mNetworkInfo).append(LS); sb.append("mLastSignalLevel ").append(mLastSignalLevel).append(LS); sb.append("mLastBssid ").append(mLastBssid).append(LS); @@ -972,6 +990,52 @@ public class WifiStateMachine extends HierarchicalStateMachine { * Internal private functions ********************************************************/ + private void updateTetherState(ArrayList<String> available, ArrayList<String> tethered) { + + boolean wifiTethered = false; + boolean wifiAvailable = false; + + IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE); + INetworkManagementService service = INetworkManagementService.Stub.asInterface(b); + + if (mCm == null) { + mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); + } + + String[] wifiRegexs = mCm.getTetherableWifiRegexs(); + + for (String intf : available) { + for (String regex : wifiRegexs) { + if (intf.matches(regex)) { + + InterfaceConfiguration ifcg = null; + try { + ifcg = service.getInterfaceConfig(intf); + if (ifcg != null) { + /* IP/netmask: 192.168.43.1/255.255.255.0 */ + ifcg.addr = InetAddress.getByName("192.168.43.1"); + ifcg.mask = InetAddress.getByName("255.255.255.0"); + ifcg.interfaceFlags = "[up]"; + + service.setInterfaceConfig(intf, ifcg); + } + } catch (Exception e) { + Log.e(TAG, "Error configuring interface " + intf + ", :" + e); + setWifiApEnabled(null, false); + return; + } + + if(mCm.tether(intf) != ConnectivityManager.TETHER_ERROR_NO_ERROR) { + Log.e(TAG, "Error tethering on " + intf); + setWifiApEnabled(null, false); + return; + } + break; + } + } + } + } + /** * Set the country code from the system setting value, if any. */ @@ -1244,14 +1308,8 @@ public class WifiStateMachine extends HierarchicalStateMachine { if (WifiConfigStore.isUsingStaticIp(mLastNetworkId)) { mLinkProperties = WifiConfigStore.getLinkProperties(mLastNetworkId); } else { - // TODO - fix this for v6 - synchronized (mDhcpInfo) { - mLinkProperties.addLinkAddress(new LinkAddress( - NetworkUtils.intToInetAddress(mDhcpInfo.ipAddress), - NetworkUtils.intToInetAddress(mDhcpInfo.netmask))); - mLinkProperties.setGateway(NetworkUtils.intToInetAddress(mDhcpInfo.gateway)); - mLinkProperties.addDns(NetworkUtils.intToInetAddress(mDhcpInfo.dns1)); - mLinkProperties.addDns(NetworkUtils.intToInetAddress(mDhcpInfo.dns2)); + synchronized (mDhcpInfoInternal) { + mLinkProperties = mDhcpInfoInternal.makeLinkProperties(); } mLinkProperties.setHttpProxy(WifiConfigStore.getProxyProperties(mLastNetworkId)); } @@ -2450,11 +2508,11 @@ public class WifiStateMachine extends HierarchicalStateMachine { Log.d(TAG, "DHCP request started"); mDhcpThread = new Thread(new Runnable() { public void run() { - DhcpInfo dhcpInfo = new DhcpInfo(); - if (NetworkUtils.runDhcp(mInterfaceName, dhcpInfo)) { + DhcpInfoInternal dhcpInfoInternal = new DhcpInfoInternal(); + if (NetworkUtils.runDhcp(mInterfaceName, dhcpInfoInternal)) { Log.d(TAG, "DHCP request succeeded"); - synchronized (mDhcpInfo) { - mDhcpInfo = dhcpInfo; + synchronized (mDhcpInfoInternal) { + mDhcpInfoInternal = dhcpInfoInternal; } sendMessage(CMD_IP_CONFIG_SUCCESS); } else { @@ -2466,15 +2524,27 @@ public class WifiStateMachine extends HierarchicalStateMachine { }); mDhcpThread.start(); } else { - DhcpInfo dhcpInfo = WifiConfigStore.getIpConfiguration(mLastNetworkId); - if (NetworkUtils.configureInterface(mInterfaceName, dhcpInfo)) { + DhcpInfoInternal dhcpInfoInternal = WifiConfigStore.getIpConfiguration( + mLastNetworkId); + IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE); + INetworkManagementService netd = INetworkManagementService.Stub.asInterface(b); + InterfaceConfiguration ifcg = new InterfaceConfiguration(); + ifcg.addr = NetworkUtils.numericToInetAddress(dhcpInfoInternal.ipAddress); + ifcg.mask = NetworkUtils.intToInetAddress( + NetworkUtils.prefixLengthToNetmaskInt(dhcpInfoInternal.prefixLength)); + ifcg.interfaceFlags = "[up]"; + try { + netd.setInterfaceConfig(mInterfaceName, ifcg); Log.v(TAG, "Static IP configuration succeeded"); - synchronized (mDhcpInfo) { - mDhcpInfo = dhcpInfo; + synchronized (mDhcpInfoInternal) { + mDhcpInfoInternal = dhcpInfoInternal; } sendMessage(CMD_IP_CONFIG_SUCCESS); - } else { - Log.v(TAG, "Static IP configuration failed"); + } catch (RemoteException re) { + Log.v(TAG, "Static IP configuration failed: " + re); + sendMessage(CMD_IP_CONFIG_FAILURE); + } catch (IllegalStateException e) { + Log.v(TAG, "Static IP configuration failed: " + e); sendMessage(CMD_IP_CONFIG_FAILURE); } } @@ -2486,9 +2556,11 @@ public class WifiStateMachine extends HierarchicalStateMachine { switch(message.what) { case CMD_IP_CONFIG_SUCCESS: mLastSignalLevel = -1; // force update of signal strength - synchronized (mDhcpInfo) { - mWifiInfo.setIpAddress(mDhcpInfo.ipAddress); + InetAddress addr; + synchronized (mDhcpInfoInternal) { + addr = NetworkUtils.numericToInetAddress(mDhcpInfoInternal.ipAddress); } + mWifiInfo.setIpAddress(NetworkUtils.inetAddressToInt(addr)); configureLinkProperties(); if (getNetworkDetailedState() == DetailedState.CONNECTED) { sendLinkConfigurationChangedBroadcast(); @@ -2818,6 +2890,14 @@ public class WifiStateMachine extends HierarchicalStateMachine { case CMD_STOP_AP: Log.d(TAG,"Stopping Soft AP"); setWifiApState(WIFI_AP_STATE_DISABLING); + + if (mCm == null) { + mCm = (ConnectivityManager) mContext.getSystemService( + Context.CONNECTIVITY_SERVICE); + } + if (mCm.untether(SOFTAP_IFACE) != ConnectivityManager.TETHER_ERROR_NO_ERROR) { + Log.e(TAG, "Untether initiate failed!"); + } try { nwService.stopAccessPoint(); } catch(Exception e) { |