Commit Graph

2998 Commits

Author SHA1 Message Date
Gilles Debunne
4f734d9d59 Used space visible in SD Card bar graph
Bug 4544470

Change-Id: Iccae9bb568f1f7baf81c702f29f7a9e238d39d2b
2011-06-03 14:30:39 -07:00
Brian Carlstrom
5a137f7f34 Merge "Bulletproof CredentialStorage state handling" 2011-06-02 21:06:56 -07:00
Brian Carlstrom
0e88f4dd19 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
2011-06-02 21:06:21 -07:00
Amith Yamasani
51a1bb15ea am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit 'ad4662223210827df1e62ba4c7ec24dba80a47df':
  Fix account type dialog re-creation on orientation change.
2011-06-02 18:29:49 -07:00
Amith Yamasani
ad46622232 am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit '51a9d15722b3c94ac92e05b19048b678247b034e':
  Fix account type dialog re-creation on orientation change.
2011-06-02 18:27:54 -07:00
Amith Yamasani
51a9d15722 Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2 2011-06-02 18:26:28 -07:00
Amith Yamasani
7bb8f7288e Fix account type dialog re-creation on orientation change.
Bug: 4499512

Dummy activity that launches ChooseAccountActivity was re-launching it on orientation
changes. Make sure that it only launches it one time.

Change-Id: I764a59eaefc3ce4546330ed1b994d88b8703ce80
2011-06-02 18:23:55 -07:00
Jeff Brown
a3a96d180f am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
  Add a preference panel for mouse speed.
2011-06-02 17:31:11 -07:00
Jeff Brown
bb8fc4a4ea am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
  Add a preference panel for mouse speed.
2011-06-02 17:27:39 -07:00
Jeff Brown
9fc039e7bc Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:13 -07:00
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
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
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
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
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
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
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
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
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
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
sy310.choi
95364e4af3 Allow alternate string to be used for min_number
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
2011-05-26 10:45:07 -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
Yongwei Cai
22135ea773 Fix wrong behavior when changing pin code in settings
In security setting, if user change orientation during entering
pin code, the change will not apply successfully, it is because
the entered pin codes has not been saved and restored when
application was re-create after changed orientation. So we save
entered pin codes and restore them in onCreate when application
is re-created.

Change-Id: Ia8a3fb3ee75185ce028104487377e47f272905ce
2011-05-26 09:31:35 +02: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
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
Gilles Debunne
ecb43e5e67 am 5d48be98: Merge "Storage stats on external SD card in Settings." into honeycomb-mr2
* commit '5d48be9845eea3c4539f78f06ed24c592803e10c':
  Storage stats on external SD card in Settings.
2011-05-25 14:28:34 -07:00
Gilles Debunne
5d48be9845 Merge "Storage stats on external SD card in Settings." into honeycomb-mr2 2011-05-25 14:26:25 -07:00