Commit Graph

4498 Commits

Author SHA1 Message Date
Jeff Brown
d82487b0ff Add a preference panel for mouse speed.
Bug: 4124987

Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
2011-06-02 15:13:27 -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
Ben Komalo
a1d57709c2 Fix cryptkeeper UI for 7" tablets.
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered

Bug: 4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
2011-06-02 13:59:03 -07:00
Amith Yamasani
1334d7fc3a am 300c4f61: am 3a5b3494: Make the BT class icon visible.
* commit '300c4f61d823936e4a34fcece25c14c73877c994':
  Make the BT class icon visible.
2011-06-02 13:17:05 -07:00
Amith Yamasani
300c4f61d8 am 3a5b3494: Make the BT class icon visible.
* commit '3a5b3494a7543c1ddb66c6f630856c3aace03f0a':
  Make the BT class icon visible.
2011-06-02 13:13:38 -07:00
Amith Yamasani
3a5b3494a7 Make the BT class icon visible.
This change is required due to a change in the framework to accomodate smaller screen sizes.

Bug: 4519989
Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
2011-06-02 11:48:55 -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
Amith Yamasani
6c82fe07cc 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.
2011-06-01 19:06:55 -07:00
Amith Yamasani
672ad8d66f 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.
2011-06-01 18:37:38 -07:00
Jeff Sharkey
9302986035 Replace INetStatService with TrafficStats.
Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
2011-06-01 17:48:21 -07:00
Amith Yamasani
8ac8456491 Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2 2011-06-01 15:43:42 -07:00
Amith Yamasani
12f55852c0 Move assets to default location, instead of xlarge only.
Bug: 4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
2011-06-01 15:29:55 -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
Jaikumar Ganesh
a6daa21db8 am 015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '015788ca9228312dfca30785b1801f33a3a32e9a':
  Import translations for cherry-picked Bluetooth changes.
2011-05-27 13:47:08 -07:00
Jaikumar Ganesh
bd34e568bf am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit 'eddb21a2ebd39900893da63749a00570f37e5038':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE
2011-05-27 13:47:01 -07:00
Jaikumar Ganesh
aeca185107 am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058':
  Allow users to change the length of BT disoverability. DO NOT MERGE
2011-05-27 13:46:59 -07:00
Jaikumar Ganesh
015788ca92 Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 2011-05-27 13:28:57 -07:00
Jaikumar Ganesh
eddb21a2eb Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:49 -07:00
Jaikumar Ganesh
c955d8ee1d Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:41 -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
Eric Fischer
afe7b0466a Import translations for cherry-picked Bluetooth changes.
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
2011-05-27 12:46:07 -07:00
Jaikumar Ganesh
32c7a774f5 Changes for API of Bluetooth Discoverability. DO NOT MERGE
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.

Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
2011-05-27 10:32:18 -07:00
Chris Wren
cdd9d033b0 Allow users to change the length of BT disoverability. DO NOT MERGE
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
2011-05-27 10:27:14 -07:00
The Android Automerger
5f15f45d76 merge in gingerbread-release history after reset to gingerbread 2011-05-26 21:28:34 -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
sy310.choi
531bed610c am 95364e4a: Allow alternate string to be used for min_number
* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
  Allow alternate string to be used for min_number
2011-05-26 13:47: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