Commit Graph

35060 Commits

Author SHA1 Message Date
Ben Murdoch
e5d1139a82 Merge "Merge WebKit at r80534: Update user agent string." 2011-06-02 03:03:15 -07:00
satok
97c22eec57 Merge "Add an api to get the display name for InputMethodSubtype" 2011-06-02 02:34:32 -07:00
Dianne Hackborn
dde2aa2bde am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
* commit 'a5f8851019605be26dd9a628280092e27f8a5f31':
  Add new supports-screen API to set maximum allowed size.
2011-06-01 22:34:31 -07:00
Dianne Hackborn
0c5ffe9987 am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
* commit '2969b51132b80c873663aa2472b21d3e95845927':
  Add new supports-screen API to set maximum allowed size.
2011-06-01 22:31:26 -07:00
Dianne Hackborn
da86002d17 Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2 2011-06-01 22:28:56 -07:00
Scott Main
57416d878e am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit 'ce214df999cffd7f135ed33008b00f9c5c81ef7b':
  doc typo
2011-06-01 19:09:02 -07:00
Dianne Hackborn
476e004a6d am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
* commit '8b9a2b6cbd9cf37e9f5aa1bfc7106c67a5e89202':
  Work around OpenFeint bug.
2011-06-01 19:08:53 -07:00
Scott Main
5acfb5fa8c am f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit 'f58e6c982267e6e027b8a286ebe2a2e349348ee7':
  doc typo
2011-06-01 18:29:54 -07:00
Dianne Hackborn
f81450c455 am e6676351: Work around OpenFeint bug.
* commit 'e66763516a9c27c192adaba417616371a1c3c9bf':
  Work around OpenFeint bug.
2011-06-01 18:29:50 -07:00
Scott Main
a76b2cdc17 Merge "doc typo" into honeycomb-mr2 2011-06-01 18:19:12 -07:00
Jeff Sharkey
a80c573c55 Merge "Collect historical network stats." 2011-06-01 17:54:37 -07:00
Adam Powell
b4e8071d29 Merge "Implement bug 4500971 - Collapsable action views" 2011-06-01 17:50:13 -07:00
Fabrice Di Meglio
f830e31a66 Merge "Fix bug #4509967 (layout_gravity not always respected)" 2011-06-01 17:40:11 -07:00
Daniel Lehmann
d08487c2b5 Merge "Enable strict mode as a public api to catch sql injections" 2011-06-01 17:30:50 -07:00
Jeff Sharkey
edb4fc5c07 Merge "Policy and rules work for ConnectivityManager." 2011-06-01 17:18:15 -07:00
Yu Shan Emily Lau
defc0b644f Merge "Convert the video editor performance test suite output from float to int." 2011-06-01 17:13:30 -07:00
Christopher Tate
bb44b1a800 Merge "Filter backup/restore confirmation buttons when obscured" 2011-06-01 16:55:31 -07:00
Brett Chabot
7d172f221b Merge "Move bluetooth tests to their own package." 2011-06-01 16:08:20 -07:00
Andy Stadler
cee14799fb Merge "Use unchecked admin lookup for getStorageEncryption()" 2011-06-01 15:59:58 -07:00
Teng-Hui Zhu
60b8629f91 Merge "Correctly detect when switching back from full screen" 2011-06-01 15:53:18 -07:00
Brian Carlstrom
4173e4e251 Merge "Restore ResponseCodes for use with getLastError" 2011-06-01 15:31:46 -07:00
Glenn Kasten
69b1b54ab8 Merge "Revert "Use AudioTrack::event_type not int in callback"" 2011-06-01 15:22:49 -07:00
Fabrice Di Meglio
a91b1b9a08 Merge "Fix View default horizontal direction" 2011-06-01 15:16:41 -07:00
Christopher Tate
27c791b80b Merge "Restore from a previous full backup's tarfile" 2011-06-01 15:14:36 -07:00
Christopher Tate
15e113033b 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
Romain Guy
0ac00a6a05 Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336" 2011-06-01 14:56:19 -07:00
Glenn Kasten
7d760d8890 Merge "Use AudioTrack::event_type not int in callback" 2011-06-01 14:40:45 -07:00
Brian Carlstrom
dd52a45b8f Merge "Integrating keystore with keyguard (Part 1 of 4)" 2011-06-01 14:33:31 -07:00
Brian Carlstrom
0137377289 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
f005b6c9c9 Merge "Fix overview scale setting for mobile sites." 2011-06-01 14:28:54 -07:00
Amith Yamasani
07f259dea9 Merge "Keep track of USER_QUERY to pass to the intent." 2011-06-01 14:15:09 -07:00
Adam Powell
eca8e2deb5 am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
* commit '036c40f443a6d83881bc336a94b5da41bbc0bbcc':
  Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:53:15 -07:00
Dianne Hackborn
663fd59ac8 am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '7cae137ed155f2d311f020bbb3e75730344fd5fc':
  Compatibility mode never needed for normal size screens.
2011-06-01 12:51:08 -07:00
Adam Powell
d6a6bb6f53 am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
* commit 'fa8ee17702a79a2597670374679a0b1952f4630f':
  Framework: bugfix for menu selector not showing up properly.
2011-06-01 12:49:47 -07:00
Adam Powell
c3bab1a4c9 Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 2011-06-01 12:48:03 -07:00
Dianne Hackborn
2083dd1a58 am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
  Compatibility mode never needed for normal size screens.
2011-06-01 12:47:29 -07:00
Dianne Hackborn
9e19c9e4ef Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 2011-06-01 12:43:56 -07:00
Dianne Hackborn
af2c3397ae am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
* commit '13e2bef4f67c5bc5ce93aade1431ae3332d361f0':
  Fix issue #4500511: Holo effect background doesn't reach top of screen anymore
2011-06-01 12:43:35 -07:00
Dianne Hackborn
e593915ba6 am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
* commit '80cf4e79d2acd1f94b6a9866255459c6ab2760be':
  Fix issue #4500511: Holo effect background doesn't reach top of screen anymore
2011-06-01 12:39:36 -07:00
Dianne Hackborn
5717c26845 Merge "Fix issue #4500511: Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2 2011-06-01 12:34:48 -07:00
Jean-Michel Trivi
c507859dd8 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Adam Powell
9018cf8e63 am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
* commit 'ca234a0765e3b43ab202f29caceba68b7c5363df':
  Fix bug 4501658 - adjust toast frame padding
2011-06-01 10:33:46 -07:00
Adam Powell
60888e4a1a am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
* commit '8656ba1298da98dde9ff6517aa06b86317a65bf7':
  Fix bug 4501658 - adjust toast frame padding
2011-06-01 10:29:58 -07:00
Adam Powell
d27a23d661 Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 2011-06-01 10:27:54 -07:00
Gilles Debunne
416a702589 Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
817161087d Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Scott Main
1e1f5288f1 am 2b876a31: am f5992953: docs: fix typos
* commit '2b876a31e2a8a424b6e0c51e7a403cf64fe22f0f':
  docs: fix typos
2011-06-01 09:54:00 -07:00
Scott Main
794992b956 am f5992953: docs: fix typos
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
  docs: fix typos
2011-06-01 09:50:21 -07:00
Robert Greenwalt
725c6e2c78 am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
  Remove redundent getCurrentCdmaDataConnectionState
2011-06-01 09:12:07 -07:00
Robert Greenwalt
d05f356f75 Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 2011-06-01 09:01:22 -07:00