OSDN Git Service
Amith Yamasani [Fri, 3 Jun 2011 21:34:30 +0000 (14:34 -0700)]
resolved conflicts for merge of
6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
Eric Fischer [Fri, 3 Jun 2011 17:20:35 +0000 (10:20 -0700)]
Merge "Import revised translations."
Brian Carlstrom [Fri, 3 Jun 2011 04:06:56 +0000 (21:06 -0700)]
Merge "Bulletproof CredentialStorage state handling"
Brian Carlstrom [Thu, 2 Jun 2011 23:47:15 +0000 (16:47 -0700)]
Bulletproof CredentialStorage state handling
As noted by the class javadoc, CredentialStorage has seen the number
of cases to cope with grow. This change tries to address those cases.
src/com/android/settings/CredentialStorage.java
Added ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD to coordinate
additional producer and consumer.
constant declaration here, since its used by callers of
ChooseLockSettingsHelper.launchConfirmationActivity
src/com/android/settings/ChooseLockSettingsHelper.java
old producer
src/com/android/settings/ConfirmLockPassword.java
new producer (CredentialStorage wants passwords and patterns)
src/com/android/settings/ConfirmLockPattern.java
new consumer
src/com/android/settings/CredentialStorage.java
old consumer
src/com/android/settings/CryptKeeperSettings.java
Made class final and removed protected from method to make it clear
ChooseLockSettingsHelper is not to be used by subclassing.
src/com/android/settings/ChooseLockSettingsHelper.java
Change-Id: Ib2d65398fe44573168a6267a0376c3b0388b16c8
Eric Fischer [Thu, 2 Jun 2011 23:58:43 +0000 (16:58 -0700)]
Import revised translations.
Change-Id: I5a80f7e38686bd3ac3cbaa41e2eec06f31c065cf
Amith Yamasani [Thu, 2 Jun 2011 23:49:31 +0000 (16:49 -0700)]
am
be6cb943: am
9ef2713f: am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
be6cb943db338e528915ccb6900c1c0afb3af117':
Reduce padding to the left of progress category to match framework changes.
Gilles Debunne [Thu, 2 Jun 2011 22:07:51 +0000 (15:07 -0700)]
am
b667422c: am
41a99004: am
53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '
b667422cfdaf73d693bf79ce6186e082b68862b8':
Erase SD Card fixed in Settings/Storage.
Eric Fischer [Thu, 2 Jun 2011 10:20:48 +0000 (03:20 -0700)]
am
3518cdf9: (-s ours) am
c3786952: am
beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
3518cdf91489264226564898177e7738ff28683c':
Import revised translations. DO NOT MERGE
Amith Yamasani [Thu, 2 Jun 2011 02:06:55 +0000 (19:06 -0700)]
am
672ad8d6: am
8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '
672ad8d66f61db0804fcf4ba9a0db067272a4b50':
Move assets to default location, instead of xlarge only.
Amith Yamasani [Thu, 2 Jun 2011 01:37:38 +0000 (18:37 -0700)]
am
8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '
8ac8456491e1409a071c7cf4e164440aeec7c4dd':
Move assets to default location, instead of xlarge only.
Jeff Sharkey [Sat, 28 May 2011 01:26:15 +0000 (18:26 -0700)]
Replace INetStatService with TrafficStats.
Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
Amith Yamasani [Wed, 1 Jun 2011 22:43:42 +0000 (15:43 -0700)]
Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
Amith Yamasani [Wed, 1 Jun 2011 22:29:55 +0000 (15:29 -0700)]
Move assets to default location, instead of xlarge only.
Bug:
4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
Brian Carlstrom [Wed, 1 Jun 2011 21:33:40 +0000 (14:33 -0700)]
Merge "Integrating keystore with keyguard (Part 4 of 4)"
Dianne Hackborn [Wed, 1 Jun 2011 18:26:25 +0000 (11:26 -0700)]
am
c837756d: am
b4799fc9: am
aef746c4: Implement new manage apps UI for compat mode.
* commit '
c837756d732eb1cc2c26c2d111668ac22a5ff4c6':
Implement new manage apps UI for compat mode.
Freeman Ng [Wed, 1 Jun 2011 18:26:20 +0000 (11:26 -0700)]
am
f0fae7f2: am
6356b17a: am
d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit '
f0fae7f27295df2dff531a6293840479a64f7984':
make setup wizard's wifi and datetime settings look good for 7"
Brian Carlstrom [Wed, 25 May 2011 20:24:20 +0000 (13:24 -0700)]
Integrating keystore with keyguard (Part 4 of 4)
Summary:
frameworks/base
keystore rewrite
keyguard integration with keystore on keyguard entry or keyguard change
KeyStore API simplification
packages/apps/Settings
Removed com.android.credentials.SET_PASSWORD intent support
Added keyguard requirement for keystore use
packages/apps/CertInstaller
Tracking KeyStore API changes
Fix for NPE in CertInstaller when certificate lacks basic constraints
packages/apps/KeyChain
Tracking KeyStore API changes
Details:
frameworks/base
Move keystore from C to C++ while rewriting password
implementation. Removed global variables. Added many comments.
cmds/keystore/Android.mk
cmds/keystore/keystore.h
cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp
Changed saveLockPattern and saveLockPassword to notify the keystore
on changes so that the keystore master key can be reencrypted when
the keyguard changes.
core/java/com/android/internal/widget/LockPatternUtils.java
Changed unlock screens to pass values for keystore unlock or initialization
policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java
KeyStore API changes
- renamed test() to state(), which now return a State enum
- made APIs with byte[] key arguments private
- added new KeyStore.isEmpty used to determine if a keyguard is required
keystore/java/android/security/KeyStore.java
In addition to tracking KeyStore API changes, added new testIsEmpty
and improved some existing tests to validate expect values.
keystore/tests/src/android/security/KeyStoreTest.java
packages/apps/Settings
Removing com.android.credentials.SET_PASSWORD intent with the
removal of the ability to set an explicit keystore password now
that the keyguard value is used. Changed to ensure keyguard is
enabled for keystore install or unlock. Cleaned up interwoven
dialog handing into discrete dialog helper classes.
AndroidManifest.xml
src/com/android/settings/CredentialStorage.java
Remove layout for entering new password
res/layout/credentials_dialog.xml
Remove enable credentials checkbox
res/xml/security_settings_misc.xml
src/com/android/settings/SecuritySettings.java
Added ability to specify minimum quality key to ChooseLockGeneric
Activity. Used by CredentialStorage, but could also be used by
CryptKeeperSettings. Changed ChooseLockGeneric to understand
minimum quality for keystore in addition to DPM and device
encryption.
src/com/android/settings/ChooseLockGeneric.java
Changed to use getActivePasswordQuality from
getKeyguardStoredPasswordQuality based on experience in
CredentialStorage. Removed bogus class javadoc.
src/com/android/settings/CryptKeeperSettings.java
Tracking KeyStore API changes
src/com/android/settings/vpn/VpnSettings.java
src/com/android/settings/wifi/WifiSettings.java
Removing now unused string resources
res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml
res/values/strings.xml
packages/apps/CertInstaller
Tracking KeyStore API changes
src/com/android/certinstaller/CertInstaller.java
Fix for NPE in CertInstaller when certificate lacks basic constraints
src/com/android/certinstaller/CredentialHelper.java
packages/apps/KeyChain
Tracking KeyStore API changes
src/com/android/keychain/KeyChainActivity.java
src/com/android/keychain/KeyChainService.java
support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
tests/src/com/android/keychain/tests/KeyChainServiceTest.java
Change-Id: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8
Gilles Debunne [Wed, 1 Jun 2011 17:11:15 +0000 (10:11 -0700)]
Merge "Bug
4505185: fix NPE when file list is empty"
Gilles Debunne [Wed, 1 Jun 2011 00:32:44 +0000 (17:32 -0700)]
Bug
4505185: fix NPE when file list is empty
Change-Id: Ia120f92f2d907cdfccde5824179ef2e1f0c0d6a6
Adam Powell [Tue, 31 May 2011 23:02:30 +0000 (16:02 -0700)]
am
7d4e88b3: am
57218b5a: am
3c110e50: Fix account type selector for adding accounts to match holo layout guidelines.
* commit '
7d4e88b3d4f4f5b17a93f3be8fe19b65df45b0d7':
Fix account type selector for adding accounts to match holo layout guidelines.
Jim Miller [Tue, 31 May 2011 23:01:17 +0000 (16:01 -0700)]
am
c78f8769: am
fbc72cd6: am
fd8f7f12: Merge "Fix
4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit '
c78f87694ddff4badfc1953821250eb68d237330':
Fix
4462497: Make ownerinfo preference layout more dynamic
Amith Yamasani [Fri, 27 May 2011 21:53:12 +0000 (14:53 -0700)]
am
9ef2713f: am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
9ef2713f2862ca13822a35e316555dda3e264352':
Reduce padding to the left of progress category to match framework changes.
Amith Yamasani [Fri, 27 May 2011 21:51:28 +0000 (14:51 -0700)]
am
1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '
1f7014a25aad4cd3fe5e6f34eb30d936f4da2fd4':
Reduce padding to the left of progress category to match framework changes.
Amith Yamasani [Fri, 27 May 2011 21:49:21 +0000 (14:49 -0700)]
Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
Amith Yamasani [Fri, 27 May 2011 21:31:28 +0000 (14:31 -0700)]
Reduce padding to the left of progress category to match framework changes.
Otherwise the WIFI/BT device names don't align with the header.
Change-Id: Ibd10cb7bb38c80a90ef895e2bdb1083b833a2824
Svetoslav Ganov [Thu, 26 May 2011 23:45:43 +0000 (16:45 -0700)]
Accessibility service specific settings.
This is the settings part of the change for adding
support for accessibility service specific settings.
1. Added the first cut of a SettingsCheckBoxPreference
that is a CheckBoxPreference that optionally takes
an intent to be lauched as settings of the item
represented by the preference.
2. Updated the AccessibilitySettigns to use the
SettingsCheckBoxPreference.
Change-Id: If44262b8965c65620c6b8c252f8ef356eb0d95cf
Daniel Sandler [Fri, 27 May 2011 03:27:55 +0000 (20:27 -0700)]
Merge "Dream (screensaver) settings."
Gilles Debunne [Fri, 27 May 2011 01:04:14 +0000 (18:04 -0700)]
am
41a99004: am
53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '
41a99004f1cd758205f728dbbf9bc6a735b262e3':
Erase SD Card fixed in Settings/Storage.
Gilles Debunne [Fri, 27 May 2011 01:02:41 +0000 (18:02 -0700)]
am
53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '
5387276950a190944eeeb00c0e3c04501f0dc6a5':
Erase SD Card fixed in Settings/Storage.
Gilles Debunne [Fri, 27 May 2011 01:00:34 +0000 (18:00 -0700)]
Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
Eric Fischer [Thu, 26 May 2011 23:03:37 +0000 (16:03 -0700)]
Merge "Import revised translations."
Eric Fischer [Thu, 26 May 2011 22:47:05 +0000 (15:47 -0700)]
Import revised translations.
Change-Id: Ied705b2da99164f4257d2a6b7b4ce95d7bfb0052
Gilles Debunne [Thu, 26 May 2011 01:34:59 +0000 (18:34 -0700)]
Erase SD Card fixed in Settings/Storage.
Adding the StorageVolume to the format intent.
Change-Id: If1a50a2d5c5154e9f00116db536c62324c447e7c
Eric Fischer [Thu, 26 May 2011 21:14:20 +0000 (14:14 -0700)]
am
c3786952: am
beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
c3786952ccd726b31165377c18306001a11ad6c1':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 26 May 2011 20:46:20 +0000 (13:46 -0700)]
am
beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
beee8290a23794e0c7d89ce8e6e682564e4d5a52':
Import revised translations. DO NOT MERGE
Amith Yamasani [Thu, 26 May 2011 18:41:41 +0000 (11:41 -0700)]
am
f7d58032: am
6246d459: am
e9f5a297: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
* commit '
f7d58032cd9dc7bc553ae47cd7a8166c6afc23d0':
Fix blank Battery Use screen due to changes in framework.
Eric Fischer [Thu, 26 May 2011 18:37:50 +0000 (11:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Eric Fischer [Thu, 26 May 2011 18:25:33 +0000 (11:25 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I4728d6b761331990b1424fb9a676275648a99bf4
Dianne Hackborn [Thu, 26 May 2011 18:05:49 +0000 (11:05 -0700)]
am
b4799fc9: am
aef746c4: Implement new manage apps UI for compat mode.
* commit '
b4799fc9ee29535bb371da9c04a0f750a77115e1':
Implement new manage apps UI for compat mode.
Freeman Ng [Thu, 26 May 2011 18:05:47 +0000 (11:05 -0700)]
am
6356b17a: am
d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit '
6356b17a53fc939c145de26dbc258ef7797ba05c':
make setup wizard's wifi and datetime settings look good for 7"
Gilles Debunne [Thu, 26 May 2011 17:35:38 +0000 (10:35 -0700)]
resolved conflicts for merge of
b593a628 to master
Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6
Dianne Hackborn [Thu, 26 May 2011 17:02:22 +0000 (10:02 -0700)]
am
aef746c4: Implement new manage apps UI for compat mode.
* commit '
aef746c45f14c8a170dba48c4b55f93cae0e24e4':
Implement new manage apps UI for compat mode.
Freeman Ng [Thu, 26 May 2011 17:02:20 +0000 (10:02 -0700)]
am
d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit '
d671182d88a193bee25d82a1941a57a84ed0fdc4':
make setup wizard's wifi and datetime settings look good for 7"
Daniel Sandler [Fri, 15 Apr 2011 15:18:57 +0000 (11:18 -0400)]
Dream (screensaver) settings.
Depends on change Ied691856 for
Settings.Secure.DREAM_TIMEOUT and
Settings.Secure.DREAM_COMPONENT.
Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
Dianne Hackborn [Thu, 26 May 2011 08:04:44 +0000 (01:04 -0700)]
Implement new manage apps UI for compat mode.
Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
Amith Yamasani [Thu, 26 May 2011 04:28:22 +0000 (21:28 -0700)]
am
0fbaacaa: am
138a695f: am
cfd524f0: Visual adjustments for smaller tablets.
* commit '
0fbaacaa9b29401a4191ca85dccfe68660928a11':
Visual adjustments for smaller tablets.
Freeman Ng [Thu, 26 May 2011 04:13:03 +0000 (21:13 -0700)]
Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2
Freeman Ng [Thu, 26 May 2011 02:06:21 +0000 (19:06 -0700)]
make setup wizard's wifi and datetime settings look good for 7"
Note: this entailed locking datetime settings not into portrait
like everything else in the setup process, but landscape, because
the existing xlarge layout wasn't rearranging itself into a portrait
alignment very well. I can give it another try later if I can have
some help from UE.
Change-Id: Ia8ce8e8292ed768bd117beedf3d94a287e658f4b
Adam Powell [Thu, 26 May 2011 01:01:04 +0000 (18:01 -0700)]
am
57218b5a: am
3c110e50: Fix account type selector for adding accounts to match holo layout guidelines.
* commit '
57218b5afb696a2e34f11be74041261a44dd51a2':
Fix account type selector for adding accounts to match holo layout guidelines.
Adam Powell [Thu, 26 May 2011 00:58:34 +0000 (17:58 -0700)]
am
3c110e50: Fix account type selector for adding accounts to match holo layout guidelines.
* commit '
3c110e500dad9dc21ae7efa13a73f1876aa38cee':
Fix account type selector for adding accounts to match holo layout guidelines.
Adam Powell [Thu, 26 May 2011 00:46:30 +0000 (17:46 -0700)]
Fix account type selector for adding accounts to match holo layout
guidelines.
Change-Id: I0cb2f2655e878de65b25c46e2b852bad6e1a99ad
Jim Miller [Wed, 25 May 2011 23:34:17 +0000 (16:34 -0700)]
am
fbc72cd6: am
fd8f7f12: Merge "Fix
4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit '
fbc72cd6013e1e7a78cb49f4751cd5729f187556':
Fix
4462497: Make ownerinfo preference layout more dynamic
Jim Miller [Wed, 25 May 2011 23:27:52 +0000 (16:27 -0700)]
am
fd8f7f12: Merge "Fix
4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit '
fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4':
Fix
4462497: Make ownerinfo preference layout more dynamic
Jim Miller [Wed, 25 May 2011 23:06:17 +0000 (16:06 -0700)]
Merge "Fix
4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
Amith Yamasani [Wed, 25 May 2011 21:57:47 +0000 (14:57 -0700)]
am
6246d459: am
e9f5a297: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
* commit '
6246d459a1c5be32994778c080fd7f386e884ce5':
Fix blank Battery Use screen due to changes in framework.
Amith Yamasani [Wed, 25 May 2011 21:56:08 +0000 (14:56 -0700)]
am
e9f5a297: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
* commit '
e9f5a2975b827ad61ab54747b196aed37230bbbe':
Fix blank Battery Use screen due to changes in framework.
Jim Miller [Wed, 25 May 2011 21:52:36 +0000 (14:52 -0700)]
Fix
4462497: Make ownerinfo preference layout more dynamic
This fixes a bug where the EditText of OwnerInfo was partially
off-screen in portrait mode on 7" devices.
Change-Id: I8ba985ac6ce88bb42209a8a7f8acc5b4476fe8f2
Amith Yamasani [Wed, 25 May 2011 21:53:39 +0000 (14:53 -0700)]
Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
Gilles Debunne [Wed, 25 May 2011 21:39:16 +0000 (14:39 -0700)]
am
ecb43e5e: am
5d48be98: Merge "Storage stats on external SD card in Settings." into honeycomb-mr2
* commit '
ecb43e5e67e2cdf7617100b08a3f9dae42c4b5cf':
Storage stats on external SD card in Settings.
Gilles Debunne [Wed, 25 May 2011 21:28:34 +0000 (14:28 -0700)]
am
5d48be98: Merge "Storage stats on external SD card in Settings." into honeycomb-mr2
* commit '
5d48be9845eea3c4539f78f06ed24c592803e10c':
Storage stats on external SD card in Settings.
Gilles Debunne [Wed, 25 May 2011 21:26:25 +0000 (14:26 -0700)]
Merge "Storage stats on external SD card in Settings." into honeycomb-mr2
Amith Yamasani [Wed, 25 May 2011 19:57:04 +0000 (12:57 -0700)]
Fix blank Battery Use screen due to changes in framework.
Changes in the framework to increase horizontal space for preferences
that don't have a "widget" caused BatteryUse preference to go blank.
Removed the widget_frame id from the layout file.
Change-Id: Ib67227eb3a7ae4019b22d9b89040f72aff63b605
Gilles Debunne [Thu, 19 May 2011 17:34:14 +0000 (10:34 -0700)]
Storage stats on external SD card in Settings.
Storage categories are dynamically created from list of StorageVolumes instead
of a static XML.
Unknown files' sizes are part of Misc rather than Apps.
Categories with a size of 0 are removed.
TODO : remove the notion of a "nosdcard" product. Change strings accordingly.
See all TODO in code
Change-Id: I017ac20f5fa50ad9bdeba8e666754ec84acf3858
Amith Yamasani [Wed, 25 May 2011 18:05:56 +0000 (11:05 -0700)]
am
138a695f: am
cfd524f0: Visual adjustments for smaller tablets.
* commit '
138a695f179aa16bff033b873f502161b1be66e0':
Visual adjustments for smaller tablets.
Amith Yamasani [Wed, 25 May 2011 18:01:57 +0000 (11:01 -0700)]
am
cfd524f0: Visual adjustments for smaller tablets.
* commit '
cfd524f07af0820e2e41fd74e7e3c5b7433854f8':
Visual adjustments for smaller tablets.
Jim Miller [Wed, 25 May 2011 16:57:57 +0000 (09:57 -0700)]
am
e3e9561b: am
7505d460: am
d12b9509: Fix
4462497: Make lockscreen preference screen layouts more dynamic
* commit '
e3e9561bbdde3ffbeece9ab3433700db7e5f27e4':
Fix
4462497: Make lockscreen preference screen layouts more dynamic
Amith Yamasani [Tue, 24 May 2011 21:29:47 +0000 (14:29 -0700)]
Visual adjustments for smaller tablets.
Make the Manage Apps tab indicators horizontally scrollable.
Use medium font size for user dictionary.
Bug:
4462313
Change-Id: Iba44e758715c0187ea17ed072794b8596dee0e54
Jim Miller [Tue, 24 May 2011 20:14:54 +0000 (13:14 -0700)]
am
7505d460: am
d12b9509: Fix
4462497: Make lockscreen preference screen layouts more dynamic
* commit '
7505d4607a95e050f4f037ef35982a16dd710e3e':
Fix
4462497: Make lockscreen preference screen layouts more dynamic
Jim Miller [Tue, 24 May 2011 20:10:15 +0000 (13:10 -0700)]
am
d12b9509: Fix
4462497: Make lockscreen preference screen layouts more dynamic
* commit '
d12b95093770f1a71f60f67be9a5e28277b634a1':
Fix
4462497: Make lockscreen preference screen layouts more dynamic
Irfan Sheriff [Tue, 24 May 2011 19:56:26 +0000 (12:56 -0700)]
am
b7c2d5b4: am
7c210ba5: Fix invalid linkspeed display
* commit '
b7c2d5b4e1bafe543d3887d350b3e77d71a0cf34':
Fix invalid linkspeed display
Irfan Sheriff [Tue, 24 May 2011 19:56:23 +0000 (12:56 -0700)]
am
87661736: am
5ee2fb92: Merge "Fix submit button display for WPS" into honeycomb-LTE
* commit '
8766173651668a18b3cf8ea2ce545d5178eddb6c':
Fix submit button display for WPS
Jim Miller [Tue, 24 May 2011 03:48:28 +0000 (20:48 -0700)]
am
9e8b6ba5: am
318f7850: am
360f0603: Fix
4462497: Use new sw600dp resource target for LockScreen settings
* commit '
9e8b6ba54eec4a3c43fd25f8f5d217c54525c4cc':
Fix
4462497: Use new sw600dp resource target for LockScreen settings
Jim Miller [Tue, 24 May 2011 03:48:25 +0000 (20:48 -0700)]
am
6ba50de7: am
d36628a7: am
e8ebec86: Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit '
6ba50de7ac94accbd20428bb3d184e4a24e1fce6':
Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
Jim Miller [Mon, 23 May 2011 23:44:24 +0000 (16:44 -0700)]
Fix
4462497: Make lockscreen preference screen layouts more dynamic
This reduces the dependency of LockScreen preference screens
on a particular device size by using centering logic instead of
absolute offsets/sizes.
Change-Id: I6ff9e71dc122e12493148437dda647820ae0f308
Irfan Sheriff [Mon, 23 May 2011 23:51:38 +0000 (16:51 -0700)]
am
7c210ba5: Fix invalid linkspeed display
* commit '
7c210ba5c18c2720023dd8fc4215cde95a6fe71c':
Fix invalid linkspeed display
Irfan Sheriff [Mon, 23 May 2011 23:48:56 +0000 (16:48 -0700)]
am
5ee2fb92: Merge "Fix submit button display for WPS" into honeycomb-LTE
* commit '
5ee2fb92a9e05dda877a497847c7543daaf5ea69':
Fix submit button display for WPS
Irfan Sheriff [Fri, 20 May 2011 23:29:30 +0000 (16:29 -0700)]
Fix invalid linkspeed display
Bug:
4391449
Change-Id: I8c8efcaa73d09c1e8b523f7798b6c626edc96c1e
Irfan Sheriff [Mon, 23 May 2011 23:46:22 +0000 (16:46 -0700)]
Merge "Fix submit button display for WPS" into honeycomb-LTE
Jim Miller [Fri, 20 May 2011 23:54:35 +0000 (16:54 -0700)]
am
318f7850: am
360f0603: Fix
4462497: Use new sw600dp resource target for LockScreen settings
* commit '
318f7850f6651d5d62df1d5dce05d67dfa5d9188':
Fix
4462497: Use new sw600dp resource target for LockScreen settings
Jim Miller [Fri, 20 May 2011 23:51:46 +0000 (16:51 -0700)]
am
360f0603: Fix
4462497: Use new sw600dp resource target for LockScreen settings
* commit '
360f060334d3be3dbf13f3af770eb4fcccfddfb2':
Fix
4462497: Use new sw600dp resource target for LockScreen settings
Irfan Sheriff [Fri, 20 May 2011 23:10:59 +0000 (16:10 -0700)]
Fix submit button display for WPS
Change Icd3fde90 exposed an existing issue where password validity was
being checked for WPS as well. Fix it.
Bug:
4391449
Change-Id: I60ca8869eee680f5ec71284a1ac6ba956a992312
Jim Miller [Fri, 20 May 2011 22:49:27 +0000 (15:49 -0700)]
Fix
4462497: Use new sw600dp resource target for LockScreen settings
Change-Id: I3156aedff564dbf426fa0421a66c7f491af6a354
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
Jim Miller [Fri, 20 May 2011 20:26:49 +0000 (13:26 -0700)]
am
d36628a7: am
e8ebec86: Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit '
d36628a74e699625e874608a7cb77cffaf0e9b29':
Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
Jim Miller [Fri, 20 May 2011 20:16:38 +0000 (13:16 -0700)]
am
e8ebec86: Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
* commit '
e8ebec86e6ce342b929c96c001b1599d7d84effc':
Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
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
Jim Miller [Fri, 20 May 2011 00:09:10 +0000 (17:09 -0700)]
Fix
4462497: Fixes crash in settings due to using wrong layout on 7" devices.
Change-Id: I674112df2bdcec0bd94c85b1a777c336c037edc5
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