OSDN Git Service
The Android Open Source Project [Fri, 20 May 2011 21:06:22 +0000 (14:06 -0700)]
Reconcile with gingerbread-release honeycomb-release
Change-Id: I9420067355edd5edf92f62fd0024760e14e4fca5
Irfan Sheriff [Fri, 20 May 2011 00:18:12 +0000 (17:18 -0700)]
am
ba46f269: am
a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE
* commit '
ba46f269abf8cbafaf68902a23935a1779aa316d':
Fix enabling of submit button
Irfan Sheriff [Fri, 20 May 2011 00:15:43 +0000 (17:15 -0700)]
am
a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE
* commit '
a6f178a817ec36d5cf6d6a3d9c19c73278f0c3ca':
Fix enabling of submit button
Irfan Sheriff [Thu, 19 May 2011 23:47:04 +0000 (16:47 -0700)]
Merge "Fix enabling of submit button" into honeycomb-LTE
Irfan Sheriff [Thu, 19 May 2011 23:05:02 +0000 (16:05 -0700)]
Fix enabling of submit button
Change I478c915b introduced a regression where the submit
button is enabled even if no password is entered for a secure
network.
This happened because our checks would override a password
check when IP and proxy settings are valid (which is the default
setting)
Bug:
4462439
Change-Id: Icd3fde90759f33fa391ec79ae8075b6d8388d2e9
Eric Fischer [Wed, 18 May 2011 16:21:43 +0000 (09:21 -0700)]
am
be94e211: (-s ours) am
d6e23b9a: am
ce116503: Import revised translations. DO NOT MERGE
* commit '
be94e211d178dbfe539043e053f79a9d9eb61011':
Import revised translations. DO NOT MERGE
Jean Chalard [Thu, 12 May 2011 06:06:16 +0000 (15:06 +0900)]
Change the interface for user dictionary multiple locales.
The user dictionary interface now works the following way:
* Locale gathering
- The current locale is always considered as present, even if
there are no words for it in the user dictionary.
- Any locale for which at least one word is registered is
considered present.
- A null locale is considered a valid locale meaning "all
languages".
- If no words are present at all, since the current locale is
always considered present, the system will consider there is
exactly one locale present - and allow editing this user
dictionary.
* Options display
- If only one locale is present, the interface is the same as
for Honeycomb: display a "User dictionary" PreferenceScreen
that brings up the dictionary editor interface.
- If there are several locales present, then the user
dictionary option will jump to a screen that will display a
list of available locales.
* Word insertion
- Inserting a word will always use the locale of the currently
displayed dictionary. If it is the "all languages" null
pseudo-locale, that will still hold and the word will be added
to this pseudo-locale.
It is worthy to note that the "All languages" locale is only
accessible if for some reason there are already words with a
null locale in the database before this is installed. For
example, if an application has inserted some words that way,
or if the user inserted words with a previous version of the
settings application.
On a freshly flashed device, barring the use of third-party
application that would add such words, it is not possible to
access the "all languages" locale any more because there is
no interface to do it, though it works if such words are
inside.
Bug:
3479738
Change-Id: Iba323e5aeb3f4f575896903a4e8bef6ffb3ea306
Eric Fischer [Wed, 18 May 2011 00:17:33 +0000 (17:17 -0700)]
Merge "Import revised translations."
Eric Fischer [Wed, 18 May 2011 00:04:53 +0000 (17:04 -0700)]
Import revised translations.
Change-Id: I318c3f9ffc38f6a751f31106924915dbfa5a7138
Brian Carlstrom [Tue, 17 May 2011 23:22:06 +0000 (16:22 -0700)]
Move to KeyChain.bind
Change-Id: Ic12e84bdc2e391c4a08a0f854d0e0f7315fc31a3
Eric Fischer [Tue, 17 May 2011 20:33:53 +0000 (13:33 -0700)]
am
d6e23b9a: am
ce116503: Import revised translations. DO NOT MERGE
* commit '
d6e23b9a5ca2f58a7082f7cca9f5eca982403531':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 May 2011 20:29:57 +0000 (13:29 -0700)]
am
ce116503: Import revised translations. DO NOT MERGE
* commit '
ce116503a7ca08302711fc77f6b21f2fbbe3e76e':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 May 2011 20:21:44 +0000 (13:21 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iafedceb5fee433d9a55f8f76e941778c2ace85e7
Brian Carlstrom [Tue, 17 May 2011 17:37:54 +0000 (10:37 -0700)]
Merge "Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 of 6)"
Brian Carlstrom [Fri, 13 May 2011 06:58:39 +0000 (23:58 -0700)]
Make CertInstaller installed CA certs trusted by applications via default TrustManager (5 of 6)
frameworks/base
Adding IKeyChainService APIs for CertInstaller and Settings use
keystore/java/android/security/IKeyChainService.aidl
libcore
Improve exceptions to include more information
luni/src/main/java/javax/security/auth/x500/X500Principal.java
Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods.
Added support for adding user CAs in a separate directory for system.
Added support for removing system CAs by placing a copy in a sytem directory
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java
Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash
to make sure the implementing algorithms doe not change since
TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL
changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to
1.0.0)
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java
Extensive test of new TrustedCertificateStore behavior
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java
TestKeyStore improvements
- Refactored TestKeyStore to provide simpler createCA method (and
internal createCertificate)
- Cleaned up to remove use of BouncyCastle specific X509Principal
in the TestKeyStore API when the public X500Principal would do.
- Cleaned up TestKeyStore support methods to not throw Exception
to remove need for static blocks for catch clauses in tests.
support/src/test/java/libcore/java/security/TestKeyStore.java
luni/src/test/java/libcore/java/security/KeyStoreTest.java
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java
Added private PKIXParameters contructor for use by
IndexedPKIXParameters to avoid wart of having to lookup and pass
a TrustAnchor to satisfy the super-class sanity check.
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
luni/src/main/java/java/security/cert/PKIXParameters.java
packages/apps/CertInstaller
Change CertInstaller to call IKeyChainService.installCertificate
for CA certs to pass them to the KeyChainServiceTest which will
make them available to all apps through the
TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask.
src/com/android/certinstaller/CertInstaller.java
Added installCaCertsToKeyChain and hasCaCerts accessor for use by
CertInstaller. Use hasUserCertificate() internally. Cleanup coding
style.
src/com/android/certinstaller/CredentialHelper.java
packages/apps/KeyChain
Added MANAGE_ACCOUNTS so that IKeyChainService.reset
implementation can remove KeyChain accounts.
AndroidManifest.xml
Implement new IKeyChainService methods:
- Added IKeyChainService.installCaCertificate to install certs
provided by CertInstaller using the TrustedCertificateStore.
- Added IKeyChainService.reset to allow Settings to remove the
KeyChain accounts so that any app granted access to keystore
credentials are revoked when the keystore is reset.
src/com/android/keychain/KeyChainService.java
packages/apps/Settings
Changed com.android.credentials.RESET credential reset action to
also call IKeyChainService.reset to remove any installed user CAs
and remove KeyChain accounts to have AccountManager revoke
credential granted to private keys removed during the RESET.
src/com/android/settings/CredentialStorage.java
Added toast text value for failure case
res/values/strings.xml
system/core
Have init create world readable /data/misc/keychain to allow apps
to access user added CA certificates installed by the CertInstaller.
rootdir/init.rc
Change-Id: Ie329aafe88f6ebe108d25382f587c933f3244e55
Gilles Debunne [Mon, 16 May 2011 18:14:26 +0000 (11:14 -0700)]
Merge "Refactoring in memory storage stats"
The Android Automerger [Fri, 13 May 2011 21:27:44 +0000 (14:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
Gilles Debunne [Fri, 13 May 2011 18:55:07 +0000 (11:55 -0700)]
Refactoring in memory storage stats
Removed hard coded NUM_MEDIA_DIRS_TRACKED - 1 in loops and used actual
constants instead to make it less brittle if we add more categories.
Change-Id: I51ce9e7faca1ee55cf369eedf9422628b9501e13
satok [Fri, 13 May 2011 19:30:45 +0000 (04:30 +0900)]
Fix NPE in InputMethodAndLanguageSettings
Bug:
4422368
Change-Id: I495eb8de9928922b18b37c6658bd8fd8b4ee3e1a
Gilles Debunne [Fri, 13 May 2011 18:17:45 +0000 (11:17 -0700)]
Merge "Fixes in UsageBarPreference"
Eric Fischer [Wed, 11 May 2011 20:09:36 +0000 (13:09 -0700)]
am
e7c82caf: (-s ours) am
d779e5df: am
0bbe27da: am
a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit '
e7c82caf2c062ff47581fd29aed4853371853569':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 11 May 2011 20:08:27 +0000 (13:08 -0700)]
am
c258d997: (-s ours) am
450721fc: am
9766cccb: Import revised translations. DO NOT MERGE
* commit '
c258d9979f9dc574fde266ebf0aae4cfac5d2764':
Import revised translations. DO NOT MERGE
Jean Chalard [Wed, 11 May 2011 11:38:40 +0000 (20:38 +0900)]
Enable showing the user dictionary in several locales.
Bug:
3479738
Change-Id: Ic57a5675c44c36ad255f9927da151ad6a2a8c44c
Eric Fischer [Tue, 10 May 2011 23:05:34 +0000 (16:05 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 10 May 2011 22:43:12 +0000 (15:43 -0700)]
Import revised translations.
Change-Id: Ide1889ee5b663aa0debc30af0249e4708ff7c746
Eric Fischer [Tue, 10 May 2011 22:32:16 +0000 (15:32 -0700)]
am
d779e5df: am
0bbe27da: am
a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit '
d779e5dfbfc23a005b440f5931316d0742fdf3cc':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 22:03:23 +0000 (15:03 -0700)]
am
0bbe27da: am
a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit '
0bbe27dabe8d667133a599dfffa8d7c6715ae7e6':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 22:00:51 +0000 (15:00 -0700)]
am
a9aa8aa3: (-s ours) Import revised translations. DO NOT MERGE
* commit '
a9aa8aa3341b164a54213a3b27fa0a1dd9ef9e70':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 19:23:31 +0000 (12:23 -0700)]
am
450721fc: am
9766cccb: Import revised translations. DO NOT MERGE
* commit '
450721fca317a7c111555ad6650f62b1081eb740':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 19:19:04 +0000 (12:19 -0700)]
am
9766cccb: Import revised translations. DO NOT MERGE
* commit '
9766cccb3969db4564ad4548582685ee7b18e2e6':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 May 2011 00:04:32 +0000 (17:04 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ieed2bec37375bf9dc2504922350c2d8ac3883f97
John Wang [Mon, 9 May 2011 22:11:35 +0000 (15:11 -0700)]
am
71023531: am
22e52793: Update the MEID setting label.
* commit '
710235316507a1ac5f0bd6a750dc60455bc21ca1':
Update the MEID setting label.
John Wang [Mon, 9 May 2011 22:08:24 +0000 (15:08 -0700)]
am
22e52793: Update the MEID setting label.
* commit '
22e5279382db1cbb05dd093a93ab7ddd9efbe2fe':
Update the MEID setting label.
John Wang [Mon, 9 May 2011 18:36:19 +0000 (11:36 -0700)]
Update the MEID setting label.
Currently show MEID for CDMA devices. For LTE devices, this should be IMEI.
Both values are the same for CDMA-LTE devices. Update "MEID" to "IMEI / MEID".
bug:
4356748
Change-Id: I39b1f1c4c776a4acb045aa9ef7d8869ed66a30e4
Gilles Debunne [Fri, 6 May 2011 21:12:13 +0000 (14:12 -0700)]
Fixes in UsageBarPreference
The widget layout that was used resulted in a clipped usage bar.
It also had a 6dip left offset inherited from the default layout
which adds margin after the text (even if the text is empty here).
Used a custom layout for the whole preference to fix this issue.
Other fixes in the drawing code to prevent accumulative rounding
issues.
Change-Id: Ief9bf85260345355615c9670624d86f0893eb2d2
Narayan Kamath [Thu, 5 May 2011 12:41:11 +0000 (13:41 +0100)]
Use the old TTS settings API for now.
Change-Id: I8ca3fcb0aee5572694e573f4ceaa0df261c807c3
Eric Fischer [Tue, 3 May 2011 17:56:31 +0000 (10:56 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 2 May 2011 22:54:52 +0000 (15:54 -0700)]
Import revised translations.
Change-Id: I89ab066cb68227bf5879749ac47c942dcea7339d
Robert Greenwalt [Mon, 2 May 2011 20:32:15 +0000 (13:32 -0700)]
am
d65d1adb: am
3c3490c8: Use new RouteInfo class.
* commit '
d65d1adb5613107583f0cf208d7650c822f581e2':
Use new RouteInfo class.
Robert Greenwalt [Mon, 2 May 2011 20:29:26 +0000 (13:29 -0700)]
am
3c3490c8: Use new RouteInfo class.
* commit '
3c3490c819a1a6ce72468c1d867429ac0f86def8':
Use new RouteInfo class.
Robert Greenwalt [Sat, 30 Apr 2011 00:13:44 +0000 (17:13 -0700)]
Use new RouteInfo class.
Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8
Eric Fischer [Fri, 29 Apr 2011 21:01:54 +0000 (14:01 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ia76f041ab40e27fb76f8f52f2e6e3b036421f910
Eric Fischer [Thu, 28 Apr 2011 18:49:10 +0000 (11:49 -0700)]
am
a9b3463e: (-s ours) am
643e48b7: (-s ours) am
7c284c2c: Import revised translations. DO NOT MERGE
* commit '
a9b3463ea4e5e96ac69d7071ee574f1fc9cdfd13':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 28 Apr 2011 17:26:29 +0000 (10:26 -0700)]
am
643e48b7: (-s ours) am
7c284c2c: Import revised translations. DO NOT MERGE
* commit '
643e48b7fd1f1be62ac4bedc1051c00be129006b':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 22:31:22 +0000 (15:31 -0700)]
am
7c284c2c: Import revised translations. DO NOT MERGE
* commit '
7c284c2c62ce565dacfae641108a2a5033e78721':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 20:53:57 +0000 (13:53 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
Conley Owens [Wed, 27 Apr 2011 19:16:49 +0000 (12:16 -0700)]
am
fc5a1fe0: Ignoring empty list test in favor of commented out code.
* commit '
fc5a1fe0526706ccee48656df55e9f452c305ade':
Avoid crash when switching to 2G/3G network.
Conley Owens [Wed, 27 Apr 2011 17:32:42 +0000 (10:32 -0700)]
Ignoring empty list test in favor of commented out code.
Change-Id: I478980eb6d56be164bbe22a73ff945ae9c57a57a
Conley Owens [Wed, 27 Apr 2011 16:55:23 +0000 (09:55 -0700)]
am
bc20d67f: Merge "Avoid crash when switching to 2G/3G network."
* commit '
bc20d67fedd453eec9dcb127cf9df909a192baf5':
Avoid crash when switching to 2G/3G network.
Conley Owens [Wed, 27 Apr 2011 16:51:22 +0000 (09:51 -0700)]
Merge "Avoid crash when switching to 2G/3G network."
Eric Fischer [Tue, 26 Apr 2011 23:18:00 +0000 (16:18 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 26 Apr 2011 23:08:29 +0000 (16:08 -0700)]
Import revised translations.
Change-Id: I5cbe714a861e64d3198eac2b33fdeeece500e536
Jim Miller [Tue, 26 Apr 2011 22:19:03 +0000 (15:19 -0700)]
Merge "Fix
3402408: Manage "continue" button in ConfirmPassword screen"
Kenneth Westin [Tue, 26 Apr 2011 12:08:45 +0000 (14:08 +0200)]
Avoid crash when switching to 2G/3G network.
Adding test that active APN array is not empty.
Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
Eric Fischer [Fri, 22 Apr 2011 19:19:05 +0000 (12:19 -0700)]
Import revised translations.
Change-Id: Id2b5cf8a5e88621dfb371526db231f9f3bf4d400
Wink Saville [Wed, 20 Apr 2011 18:41:26 +0000 (11:41 -0700)]
am
ac706b98: am
2c3ec092: Remove getCurrentDataConnectionList.
* commit '
ac706b987bad5b46c4f10be0284ae1ed4453261b':
Remove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 18:32:53 +0000 (11:32 -0700)]
am
2c3ec092: Remove getCurrentDataConnectionList.
* commit '
2c3ec09261bf1503e75328175b5286af5676845e':
Remove getCurrentDataConnectionList.
Wink Saville [Wed, 20 Apr 2011 17:24:36 +0000 (10:24 -0700)]
Remove getCurrentDataConnectionList.
I'll add another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.
Change-Id: I71f80bb9fe0496c42ff9b1ddbf4e36a68d3f1592
Dianne Hackborn [Wed, 20 Apr 2011 17:19:05 +0000 (10:19 -0700)]
Fix crash if no external storage.
Change-Id: If5b0386b686d65cf9026a3c00459db371ab81b3a
Bjorn Bringert [Tue, 19 Apr 2011 13:37:49 +0000 (14:37 +0100)]
Fix TTS engine checkbox click handler
Before, the dialog asking whether to really enable
the engine wasn't shown. Also, the Default engine
list was not refreshed until you left the TTS settings
and came back.
Change-Id: I8cbded0fe9eedbfb05c294d831c91a857349b224
Jim Miller [Tue, 19 Apr 2011 01:16:09 +0000 (18:16 -0700)]
Fix
3402408: Manage "continue" button in ConfirmPassword screen
This disables the "continue" button until the user has entered at
least one character.
Change-Id: I3192e1789ba89031ac4cc90f388b32b7af19a445
Irfan Sheriff [Mon, 18 Apr 2011 20:44:36 +0000 (13:44 -0700)]
Merge "Add summary details for add wifi network"
Jim Miller [Sat, 16 Apr 2011 01:52:31 +0000 (18:52 -0700)]
Fix
4283049: Restore continue/cancel buttons in LockScreen Settings
This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.
The change also includes a minor change to enable using the IME enter
key to proceed to the next step.
Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73
Irfan Sheriff [Sat, 16 Apr 2011 00:00:11 +0000 (17:00 -0700)]
Add summary details for add wifi network
Bug:
4266690
Change-Id: I3799fa79c0eab0037f207427f64fe2f95e023796
Eric Fischer [Fri, 15 Apr 2011 21:41:32 +0000 (14:41 -0700)]
Import revised translations.
Change-Id: Ife515a41d11060032922c89eff125abcf0a99f87
Bjorn Bringert [Fri, 11 Mar 2011 16:52:51 +0000 (16:52 +0000)]
Use new TTS engine API in TTS settings
Requires TTS engine API added in
change I7614ff788e11f897e87052f684f1b4938d539fb7
Bug:
4148725
Change-Id: I5f3fa3bbcbf4e62af23bb701bcb6e8e5d8511341
Eric Fischer [Thu, 14 Apr 2011 22:04:38 +0000 (15:04 -0700)]
am
0d3a7592: (-s ours) am
20a44118: am
76aa8fe0: am
4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '
0d3a75923ea78119d58d5c2cbc1fb1ecdf73c5fb':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:27:34 +0000 (14:27 -0700)]
am
20a44118: am
76aa8fe0: am
4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '
20a44118ddce65bcb1a86a38ab17d82083528930':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:24:48 +0000 (14:24 -0700)]
am
76aa8fe0: am
4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '
76aa8fe0663004a7b481a830cca87492bd9c7987':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:20:01 +0000 (14:20 -0700)]
am
4ba98d53: (-s ours) Import revised translations. DO NOT MERGE
* commit '
4ba98d5381d89f5afd83f9ce4a5f1e666e7579e7':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 14 Apr 2011 21:04:03 +0000 (14:04 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I64e7baff852f629d0281352be24fc54eadb48367
Dianne Hackborn [Thu, 14 Apr 2011 01:17:11 +0000 (18:17 -0700)]
A few tweaks to the battery history chart.
Change-Id: Id133267592acf7a979a625704d2d922a24f5ff41
Glenn Kasten [Wed, 13 Apr 2011 18:56:38 +0000 (11:56 -0700)]
Glenn Kasten [Wed, 13 Apr 2011 18:51:59 +0000 (11:51 -0700)]
Glenn Kasten [Wed, 13 Apr 2011 18:47:46 +0000 (11:47 -0700)]
am
4f4ddaa8: Bug
4167061 remove debug code
* commit '
4f4ddaa823bfa7bd2fdff97338ff1839739925dd':
Bug
4167061 remove debug code
Glenn Kasten [Wed, 13 Apr 2011 18:19:58 +0000 (11:19 -0700)]
Bug
4167061 remove debug code
Change-Id: I1a05b820030d503b4ae1a82789ad4607e46b43c0
Simon Wilson [Tue, 12 Apr 2011 00:39:03 +0000 (17:39 -0700)]
am
a5babbb0: (-s ours) am
f927cccd: (-s ours) am
37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '
a5babbb092f7b65ccd78f0b7590a34b22412f2bd':
DO NOT MERGE Clarify additional system update string length/usage
Simon Wilson [Tue, 12 Apr 2011 00:33:20 +0000 (17:33 -0700)]
am
f927cccd: (-s ours) am
37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '
f927cccd795c75247bf6bfba881059d5e9c43fb5':
DO NOT MERGE Clarify additional system update string length/usage
Eric Fischer [Mon, 11 Apr 2011 21:28:21 +0000 (14:28 -0700)]
am
2439b7c0: (-s ours) am
84c90053: (-s ours) am
fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit '
2439b7c00d86fb490b48e2bc0927fd581bf59e0e':
Reimport Settings translations. DO NOT MERGE
Simon Wilson [Mon, 11 Apr 2011 21:28:20 +0000 (14:28 -0700)]
am
719e1e43: (-s ours) am
2ca7add5: (-s ours) am
ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit '
719e1e43173155cbe0d77298c3d1ca05f143048b':
DO NOT MERGE Put additional update package names in config.xml
Eric Fischer [Mon, 11 Apr 2011 21:28:18 +0000 (14:28 -0700)]
am
1985e381: (-s ours) am
6735ae14: (-s ours) am
b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit '
1985e381cbcb817adc26f4f612f96583b692e397':
Revert "Import revised translations. DO NOT MERGE"
Eric Fischer [Mon, 11 Apr 2011 21:24:30 +0000 (14:24 -0700)]
am
84c90053: (-s ours) am
fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit '
84c90053751ae1bcb07a845f5ac9747a808198b1':
Reimport Settings translations. DO NOT MERGE
Simon Wilson [Mon, 11 Apr 2011 21:24:28 +0000 (14:24 -0700)]
am
2ca7add5: (-s ours) am
ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit '
2ca7add59f2437c4584029ba081bd4d222445ff9':
DO NOT MERGE Put additional update package names in config.xml
Eric Fischer [Mon, 11 Apr 2011 21:24:25 +0000 (14:24 -0700)]
am
6735ae14: (-s ours) am
b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit '
6735ae141fee012409a2eaa0310538f3b0173263':
Revert "Import revised translations. DO NOT MERGE"
Simon Wilson [Mon, 11 Apr 2011 21:12:43 +0000 (14:12 -0700)]
am
37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '
37063d6adf9b472a8bb4bd58493517e04aafba95':
DO NOT MERGE Clarify additional system update string length/usage
Glenn Kasten [Mon, 11 Apr 2011 19:49:00 +0000 (12:49 -0700)]
am
fc52971f: am
b72f1b0f: am
858fd9a0: HDCP debugging in setting app part 2 of 2
* commit '
fc52971f7e0e4409d4a78686e23a5e330e559fb8':
HDCP debugging in setting app part 2 of 2
Glenn Kasten [Mon, 11 Apr 2011 19:46:36 +0000 (12:46 -0700)]
am
b72f1b0f: am
858fd9a0: HDCP debugging in setting app part 2 of 2
* commit '
b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
HDCP debugging in setting app part 2 of 2
Glenn Kasten [Mon, 11 Apr 2011 19:43:22 +0000 (12:43 -0700)]
am
858fd9a0: HDCP debugging in setting app part 2 of 2
* commit '
858fd9a0302c6d34781133137a048a9bf668632a':
HDCP debugging in setting app part 2 of 2
Simon Wilson [Mon, 11 Apr 2011 19:38:21 +0000 (12:38 -0700)]
DO NOT MERGE Clarify additional system update string length/usage
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
Glenn Kasten [Mon, 11 Apr 2011 18:11:56 +0000 (11:11 -0700)]
HDCP debugging in setting app part 2 of 2
Change-Id: I931c50938526adce521a7bf02301aba75abaacaf
Brian Carlstrom [Fri, 8 Apr 2011 17:28:37 +0000 (10:28 -0700)]
Merge "Tolerate missing AccountManager resource, not just missing resource name"
Joe Onorato [Fri, 8 Apr 2011 01:41:13 +0000 (18:41 -0700)]
Remove the deprecated things from Config.java. These havent been working since before 1.0.
Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c
Eric Fischer [Thu, 7 Apr 2011 21:08:01 +0000 (14:08 -0700)]
Merge "Import revised translations."
Eric Fischer [Thu, 7 Apr 2011 20:59:28 +0000 (13:59 -0700)]
Import revised translations.
Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747
Brian Carlstrom [Mon, 14 Feb 2011 18:16:39 +0000 (10:16 -0800)]
Tolerate missing AccountManager resource, not just missing resource name
Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae
Joe Onorato [Thu, 7 Apr 2011 01:45:33 +0000 (18:45 -0700)]
Merge "advanced settings"
Joe Onorato [Thu, 7 Apr 2011 01:26:20 +0000 (18:26 -0700)]
advanced settings
Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be
Eric Fischer [Wed, 6 Apr 2011 21:21:43 +0000 (14:21 -0700)]
am
94cdd67d: (-s ours) am
84edd9d5: am
8214c76e: Import revised translations. DO NOT MERGE
* commit '
94cdd67dcf67b5c25bc063d887bdb1e5864cd35d':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:19:10 +0000 (14:19 -0700)]
am
84edd9d5: am
8214c76e: Import revised translations. DO NOT MERGE
* commit '
84edd9d5281cb8e03ea31631aa232b8458136f32':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 6 Apr 2011 21:16:10 +0000 (14:16 -0700)]
am
8214c76e: Import revised translations. DO NOT MERGE
* commit '
8214c76e27de37a663cf8ce7a30091bf23c9be02':
Import revised translations. DO NOT MERGE
OSDN Git Service
