17790 Commits

Author SHA1 Message Date
Romain Guy
6f7d9394ec Take advantage of EGL_BUFFER_PRESERVED on IMG.
The IMG architecture does not support the EGL_SWAP_BEHAVIOR_PRESERVED_BIT
in EGL configurations. This bit is used only to be able to change the
EGL_SWAP_BEHAVIOR, which matters when the default behavior is not the
one we want. However on IMG, the default swap behavior is the one we
desire.

Change-Id: Iff5980c97df9e41bc837e424baf83b8eadbb7161
2011-06-02 14:30:06 -07:00
Fabrice Di Meglio
c78416fdce Merge "Fix View default horizontal direction" 2011-06-01 15:16:41 -07:00
Christopher Tate
1a536e642f Merge "Restore from a previous full backup's tarfile" 2011-06-01 15:14:36 -07:00
Christopher Tate
75a99709ac Restore from a previous full backup's tarfile
Usage:  adb restore [tarfilename]

Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'.  The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.

Known issues:

* The settings databases and wallpaper are saved/restored, but lots
  of other system state is not yet captured in the full backup.  This
  means that for practical purposes this is usable for 3rd party
  apps at present but not for full-system cloning/imaging.

Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
2011-06-01 15:09:55 -07:00
Brian Carlstrom
7ae03cda10 Merge "Integrating keystore with keyguard (Part 1 of 4)" 2011-06-01 14:33:31 -07:00
Brian Carlstrom
5cfee3fabb Integrating keystore with keyguard (Part 1 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: Ic141fb5d4b43d12fe62cb1e29c7cbd891b4be35d
2011-06-01 14:29:59 -07:00
Shimeng (Simon) Wang
19e6a16f68 Merge "Fix overview scale setting for mobile sites." 2011-06-01 14:28:54 -07:00
Amith Yamasani
23a5996b2b Merge "Keep track of USER_QUERY to pass to the intent." 2011-06-01 14:15:09 -07:00
Shimeng (Simon) Wang
73bb5734f0 Fix overview scale setting for mobile sites.
This fix will only set the overview scale in case the screen
is rotated from landscape to protrait, since in this case
the overview scale will be smaller and need explicit setting.
For the other way around, there's no need to set and it has wrong
effect for mobile sites.

issue: 4343683
Change-Id: I92cbf848bc2ed4184bd0c6b67992ff5cbc633c9f
2011-06-01 13:57:43 -07:00
Teng-Hui Zhu
3fafd39d07 The screen shot support for inline video on Java side
Basically, the GL texture bound with Surface Texture is not a singleton any
more. And the Surface Texture will be recreated every time a new video starts.
This can help to recycle the decoder's memory while using the GL texture to
show the screen shot.

The corresponding webkit change is: 112500

Change-Id: I3c35f6a0abc70b9039c316ca82b236c797d81c7e
2011-06-01 13:42:46 -07:00
Fabrice Di Meglio
4f5aa91ba5 Fix View default horizontal direction
- set default value to View.HORIZONTAL_DIRECTION_INHERIT
- code refactoring

Change-Id: Ib5b49c8f8ebd6461992bff87603fdbb4b261218e
2011-06-01 11:32:25 -07:00
Gilles Debunne
829de65b9a Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
703d3279e8 Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Dianne Hackborn
4d710ad53e Merge "resolved conflicts for merge of 590ec479 to master" 2011-05-31 23:34:46 -07:00
Dianne Hackborn
36f80f3a5a resolved conflicts for merge of 590ec479 to master
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
2011-05-31 23:11:16 -07:00
Matthew Xie
646590ef0a Merge "Add public api BluetoothSocket.isConnected." 2011-05-31 18:04:36 -07:00
Gilles Debunne
c619e74cc6 ActionBar makes room for icons when no title is provided
Change-Id: I5bd09e00b50496032deda40ea22367d727230611
2011-05-31 17:15:09 -07:00
Gilles Debunne
5e9af2ddf0 Select all for text shown as an icon on smaller screens
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.

Note: requires a definitive selectAll icon from designers.

Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
2011-05-31 17:05:33 -07:00
Fabrice Di Meglio
38fd7cde0b Merge "Fix TextView potential NPE in isLayoutRtl()" 2011-05-31 16:57:55 -07:00
RoboErik
85284fbca7 Merge "Work on changing syncx to cal_syncx" 2011-05-31 16:44:04 -07:00
Fabrice Di Meglio
83fa41b06e Fix TextView potential NPE in isLayoutRtl()
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)

Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
2011-05-31 16:35:18 -07:00
Mike Lockwood
b0aee3ee43 Merge "Move stringToFile utility from ConnectivityService to FileUtils" 2011-05-31 16:14:08 -07:00
Jeff Hamilton
e00ef00873 am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
  Swap Mifare for MIFARE.
2011-05-31 16:00:46 -07:00
RoboErik
be01039a7f Work on changing syncx to cal_syncx
Change-Id: I756ff09c43f39ad52a8793011d3192d59eb574eb
2011-05-31 13:25:10 -07:00
Joe Onorato
e36364ce0f Merge "Reduce log spew." 2011-05-31 12:44:13 -07:00
Svetoslav Ganov
b1af3a2d1f Merge "Accessibility serviceconfiguration via meta-data" 2011-05-31 12:05:54 -07:00
Svetoslav Ganov
cc4053e031 Accessibility serviceconfiguration via meta-data
Note: This is a part of two CL change and contains the
      system changes without updates to the settings.

1. Added a mechanism for configuring an accessibility service via
   XML file specified in a meta-data tag (similar to IMEs).

2. Added property for specifying a settings activity for an
   accessibility service.

3. Refactored the APIs in AccessibilityManager to return
   lists of AccessiblityServiceInfo instead ServiceInfo
   since the former describes an AccessibilityService in
   particular (similar to IMEs).

Change-Id: Ie8781bb7e0cdb329e583b6702a612a507367ad7b
2011-05-31 12:04:18 -07:00
Fabrice Di Meglio
798a3fe167 Merge "Fix default for getAbsoluteGravity()" 2011-05-31 11:56:59 -07:00
Gilles Debunne
da188fbe4b Merge "Fix for bug 4499752 - Detect nulled layouts in HandleViews" 2011-05-31 10:41:58 -07:00
Martijn Coenen
fe6dfd504b Implement Mifare Ultralight-C detection (API).
Bug: 3398465
Change-Id: Ieb60deedfde5af4494a14b3e322c5a61ae75aaf9
2011-05-31 10:30:56 -07:00
Kristian Monsen
2032eee0c1 Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
This is the WebView part, passing the bypass list to
the native side.

Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.

Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,112401

Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111832

Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-31 14:54:51 +01:00
Tadashi G. Takaoka
d555e5dccc Fix input type judgment of WebTextView
Bug: 4490948
Cherry-pick: I232b8f13
Change-Id: I09a7e829edd7ca8d54fa109dc14b4a3946de0f1b
2011-05-31 16:27:28 +09:00
Mike Lockwood
da8bb74b9d Move stringToFile utility from ConnectivityService to FileUtils
Change-Id: I59a2dc649d59677f6b5e7ade252587c7c151ec06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-28 13:28:12 -04:00
Adam Powell
39a8dc4aaf Fix bug 4499292 - ActionBar tabs don't show the first time
Fix an order of operations issue with actionbar tab initialization.

Change-Id: Ie1b1c76614eafc68e0069985b93683b44699b958
2011-05-27 18:44:00 -07:00
Fabrice Di Meglio
c05aace48a Fix default for getAbsoluteGravity()
- remove LEFT as default, keep it as it is given (because apply() is doing CENTER_HORIZONTAL)
- update unit tests

Change-Id: I294621c5d5c7d675a715c15cb10947d026539b21
2011-05-27 17:52:37 -07:00
Svetoslav Ganov
ed9a34d54b Merge "Refatoring a bit of accessibility code" 2011-05-27 16:40:17 -07:00
Svetoslav Ganov
bad9d97693 Refatoring a bit of accessibility code
Change-Id: I4df1741b622b21176c10311da0dc6347ca6fb390
2011-05-27 16:39:18 -07:00
Gilles Debunne
e8e833fbe8 Merge "Replacement spans correctly measured in TextView" 2011-05-27 16:12:19 -07:00
Gilles Debunne
d4bb0b01c6 Fix for bug 4499752 - Detect nulled layouts in HandleViews
Change-Id: I6a7289150bf461cdf4cca0aff4aa4a0400e0d553
2011-05-27 16:02:40 -07:00
Amith Yamasani
068d73cf51 Keep track of USER_QUERY to pass to the intent.
Fixes bug: 3144023

Change-Id: Ib1f04119c7c0b5aa8ceaf7b15ccec70c76b2dff1
2011-05-27 15:53:36 -07:00
Fabrice Di Meglio
6e10b08ba9 Merge "Fix overrides of isLayoutRtl(Drawable dr)" 2011-05-27 15:35:12 -07:00
Adam Powell
3526556135 Fix bug 4399686 - missing menu after returning from fullscreen video
playback in browser

Change-Id: I992c6b1b4db738f937646e0dcac1c83fa5ab4e35
2011-05-27 15:29:41 -07:00
Fabrice Di Meglio
a98eef8601 Fix overrides of isLayoutRtl(Drawable dr)
Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
2011-05-27 14:54:59 -07:00
Adam Powell
098f5bd427 Merge "Action bar tab layout tweaks." 2011-05-27 13:44:33 -07:00
Adam Powell
d21aa12e8e Action bar tab layout tweaks.
Let tabs consume the full action bar when the menu is empty and other
elements are disabled when the tab bar would normally split onto a
second row..

Fix bug 4489724 - bug in ActionBarImpl#cleanupTabs.

Change-Id: I28a235d339137add0b106c6e733a6767fa547810
2011-05-27 13:12:53 -07:00
Fabrice Di Meglio
5ff0f99b23 Merge "Add support for Gravity BEFORE and AFTER" 2011-05-27 11:28:43 -07:00
Fabrice Di Meglio
6a03640539 Add support for Gravity BEFORE and AFTER
- update layouts
- add Callback2 for RTL aware Drawable
- add unit tests

Change-Id: Ic64d0291e262170aff7297c6580b0b422eaa8d89
2011-05-27 11:23:15 -07:00
Martijn Coenen
0a266a186d Merge "Fix NdefRecord flags handling." 2011-05-27 10:55:13 -07:00
Amith Yamasani
a4fa2cd1c0 Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones." 2011-05-27 10:24:59 -07:00
Brian Carlstrom
4fdf396219 Merge "Tracking merge of dalvik-dev to master" 2011-05-27 10:12:34 -07:00