Commit Graph

4078 Commits

Author SHA1 Message Date
Amith Yamasani
4baf23770e 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.
2011-06-02 16:49:31 -07:00
Gilles Debunne
8d055f3270 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.
2011-06-02 15:07:51 -07:00
Eric Fischer
275ffe60eb 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
2011-06-02 03:20:48 -07:00
Jeff Sharkey
9302986035 Replace INetStatService with TrafficStats.
Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
2011-06-01 17:48:21 -07:00
Brian Carlstrom
79e309a9b8 Merge "Integrating keystore with keyguard (Part 4 of 4)" 2011-06-01 14:33:40 -07:00
Dianne Hackborn
2064149e42 am c837756d: am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.
* commit 'c837756d732eb1cc2c26c2d111668ac22a5ff4c6':
  Implement new manage apps UI for compat mode.
2011-06-01 11:26:25 -07:00
Freeman Ng
f75c6e20ad 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"
2011-06-01 11:26:20 -07:00
Brian Carlstrom
d4023b7cca 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
2011-06-01 10:47:42 -07:00
Gilles Debunne
ba3761be18 Merge "Bug 4505185: fix NPE when file list is empty" 2011-06-01 10:11:15 -07:00
Gilles Debunne
6789b56c23 Bug 4505185: fix NPE when file list is empty
Change-Id: Ia120f92f2d907cdfccde5824179ef2e1f0c0d6a6
2011-05-31 17:32:44 -07:00
Adam Powell
f5b25a9eda 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.
2011-05-31 16:02:30 -07:00
Jim Miller
49b20cb5f4 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
2011-05-31 16:01:17 -07:00
Amith Yamasani
be6cb943db 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.
2011-05-27 14:53:12 -07:00
Amith Yamasani
9ef2713f28 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.
2011-05-27 14:51:28 -07:00
Amith Yamasani
1f7014a25a Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2 2011-05-27 14:49:21 -07:00
Amith Yamasani
e7da064e4f 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
2011-05-27 14:31:28 -07:00
Svetoslav Ganov
6f0b4d8143 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
2011-05-27 13:24:31 -07:00
Daniel Sandler
a862f2b14b Merge "Dream (screensaver) settings." 2011-05-26 20:27:55 -07:00
Gilles Debunne
b667422cfd am 41a99004: am 53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '41a99004f1cd758205f728dbbf9bc6a735b262e3':
  Erase SD Card fixed in Settings/Storage.
2011-05-26 18:04:14 -07:00
Gilles Debunne
41a99004f1 am 53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit '5387276950a190944eeeb00c0e3c04501f0dc6a5':
  Erase SD Card fixed in Settings/Storage.
2011-05-26 18:02:41 -07:00
Gilles Debunne
5387276950 Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2 2011-05-26 18:00:34 -07:00
Eric Fischer
3fa3fdc70a Merge "Import revised translations." 2011-05-26 16:03:37 -07:00
Eric Fischer
77f9a9beef Import revised translations.
Change-Id: Ied705b2da99164f4257d2a6b7b4ce95d7bfb0052
2011-05-26 15:47:05 -07:00
Gilles Debunne
6d36fd3a03 Erase SD Card fixed in Settings/Storage.
Adding the StorageVolume to the format intent.

Change-Id: If1a50a2d5c5154e9f00116db536c62324c447e7c
2011-05-26 15:00:17 -07:00
Eric Fischer
3518cdf914 am c3786952: am beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'c3786952ccd726b31165377c18306001a11ad6c1':
  Import revised translations.  DO NOT MERGE
2011-05-26 14:14:20 -07:00
Eric Fischer
c3786952cc am beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'beee8290a23794e0c7d89ce8e6e682564e4d5a52':
  Import revised translations.  DO NOT MERGE
2011-05-26 13:46:20 -07:00
Amith Yamasani
61154c1c86 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.
2011-05-26 11:41:41 -07:00
Eric Fischer
beee8290a2 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:37:50 -07:00
Eric Fischer
6514fd7398 Import revised translations. DO NOT MERGE
Change-Id: I4728d6b761331990b1424fb9a676275648a99bf4
2011-05-26 11:25:33 -07:00
Dianne Hackborn
c837756d73 am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.
* commit 'b4799fc9ee29535bb371da9c04a0f750a77115e1':
  Implement new manage apps UI for compat mode.
2011-05-26 11:05:49 -07:00
Freeman Ng
f0fae7f272 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"
2011-05-26 11:05:47 -07:00
Gilles Debunne
d7928912d4 resolved conflicts for merge of b593a628 to master
Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6
2011-05-26 10:35:38 -07:00
Dianne Hackborn
b4799fc9ee am aef746c4: Implement new manage apps UI for compat mode.
* commit 'aef746c45f14c8a170dba48c4b55f93cae0e24e4':
  Implement new manage apps UI for compat mode.
2011-05-26 10:02:22 -07:00
Freeman Ng
6356b17a53 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"
2011-05-26 10:02:20 -07:00
Daniel Sandler
2943cfa606 Dream (screensaver) settings.
Depends on change Ied691856 for
Settings.Secure.DREAM_TIMEOUT and
Settings.Secure.DREAM_COMPONENT.

Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
2011-05-26 11:32:06 -04:00
Dianne Hackborn
aef746c45f Implement new manage apps UI for compat mode.
Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
2011-05-26 01:06:11 -07:00
Amith Yamasani
ba61aaaaa3 am 0fbaacaa: am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.
* commit '0fbaacaa9b29401a4191ca85dccfe68660928a11':
  Visual adjustments for smaller tablets.
2011-05-25 21:28:22 -07:00
Freeman Ng
d671182d88 Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2 2011-05-25 21:13:03 -07:00
Freeman Ng
edb03bf537 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
2011-05-25 19:06:21 -07:00
Adam Powell
7d4e88b3d4 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.
2011-05-25 18:01:04 -07:00
Adam Powell
57218b5afb 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.
2011-05-25 17:58:34 -07:00
Adam Powell
3c110e500d Fix account type selector for adding accounts to match holo layout
guidelines.

Change-Id: I0cb2f2655e878de65b25c46e2b852bad6e1a99ad
2011-05-25 17:46:30 -07:00
Jim Miller
c78f87694d 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
2011-05-25 16:34:17 -07:00
Jim Miller
fbc72cd601 am fd8f7f12: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit 'fd8f7f120dd04acaa7ac81680dcc058d4a1d20d4':
  Fix 4462497: Make ownerinfo preference layout more dynamic
2011-05-25 16:27:52 -07:00
Jim Miller
fd8f7f120d Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2 2011-05-25 16:06:17 -07:00
Amith Yamasani
f7d58032cd 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.
2011-05-25 14:57:47 -07:00
Amith Yamasani
6246d459a1 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.
2011-05-25 14:56:08 -07:00
Jim Miller
b633cea58b 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
2011-05-25 14:56:00 -07:00
Amith Yamasani
e9f5a2975b Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2 2011-05-25 14:53:39 -07:00
Gilles Debunne
b593a6280f 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.
2011-05-25 14:39:16 -07:00