drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,050 Commits 1 Branch 0 Tags
Commit Graph

84050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
1e739c9624 am a4e34ae8: Merge "Properly handle quick switch between Home button and Gallery app" 
* commit 'a4e34ae82f2ccf037875462809be6e5139807b44':
  Properly handle quick switch between Home button and Gallery app
 2012-08-23 08:40:03 -07:00
Jean-Baptiste Queru
a4e34ae82f Merge "Properly handle quick switch between Home button and Gallery app" 2012-08-23 08:04:46 -07:00
The Android Automerger
9f88463513 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-23 06:33:49 -07:00
Michael Jurka
0cee05b4c0 am 03f482c3: Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev 
* commit '03f482c34d7e0d2917e7f53006ee2fc9736e8773':
  Recents: apps scale down to thumbnails now
 2012-08-23 05:05:24 -07:00
Michael Jurka
03f482c34d Merge "Recents: apps scale down to thumbnails now" into jb-mr1-dev 2012-08-23 04:57:55 -07:00
Michael Jurka
cb2522c86d Recents: apps scale down to thumbnails now 
As a part of this change, Recents is now an
activity.

Known issues:
* Jank: jump-cut as app icon appears suddenly
  after the aniamtion
* Preloading recents is broken on phones without
  soft nav bar and on tablets
* Thumbnail window from animation lingers/flashes
  sometimes

Change-Id: Ie6f991f3c2e1e67f9ed84eb6adba9174ed957248
 2012-08-23 04:53:53 -07:00
Johan Rosengren
0dc291eef6 Protecting more views from (bad) MotionEvents 
When handling MotionEvents, the method findPointerIndex can return -1
if the current pointer id can't be translated to a pointer index.
Some views are not handling this, which will lead to an out-of-
index crash. In 2585e9b there were checks added, this change adds
some more.

Change-Id: I93ce2420afd83a06b689a1ed35ead7d170cd68f1
 2012-08-23 13:46:14 +02:00
Ben Murdoch
a6b7bb2131 am ed965a2c: Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 
* commit 'ed965a2cd1e5880e47c40ccc8394fcfa5ef0c153':
  Make HttpAuthHandler ctor public/@hide.
 2012-08-23 02:21:14 -07:00
Ben Murdoch
5385752829 Make SslErrorHandler ctor public/@hide. 
Allow WebViewProvider implementations to subclass SslErrorHandler
but at the same time maintain API compatibility by @hide'ing the
constructor.

Bug: 6238802
Change-Id: I5de268364ed74e59f62439b8612ab682656a7906
 2012-08-23 10:19:59 +01:00
Ben Murdoch
ed965a2cd1 Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 2012-08-23 02:17:34 -07:00
Kenny Root
3d86232256 am 618641f2: Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev 
* commit '618641f26627e1398650e8c1b51e9cd568b13728':
  Add ability to replace chain for PrivateKeyEntry
 2012-08-22 22:58:47 -07:00
Wu-cheng Li
f88320558f Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent. 
The intent is used to launch camera when the device is secured
(e.g. with a pin, password, pattern, or face unlock).

bug:5955016
Change-Id: I5470cf7ee9deab9677665ef0566bac88bdfd80c6
 2012-08-23 13:57:46 +08:00
Kenny Root
618641f266 Merge "Add ability to replace chain for PrivateKeyEntry" into jb-mr1-dev 2012-08-22 22:55:21 -07:00
Masanori Ogino
08bab56f68 fix wrong substring 
The tokenOffsets is the offset from trimed contentLine.
But it is used in substring as the offset from un-trimed contentLine.

How to reproduce bug (ICS and before):
1. Add a contact record with name and a phone number (ex. 090-1111-2222)
2. Search by "0" in Contacts app
3. Contacts shows a wrong number something like "0900111102222"

Change-Id: I1e1cb2f3bd135d98e1573a50aa6ddc021af35b9f
 2012-08-23 14:06:45 +09:00
Baligh Uddin
47bcc6305d am 12850a93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '12850a93cafa755f4d14656f8c6016f37a9a975b':
  Import translations. DO NOT MERGE
 2012-08-22 20:26:38 -07:00
Baligh Uddin
12850a93ca Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-22 20:23:55 -07:00
Baligh Uddin
f20c8ace12 am 48df8729: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '48df87298a072dc94559528f678d952cf66ce5e5':
  Import translations. DO NOT MERGE
 2012-08-22 19:52:34 -07:00
Baligh Uddin
48df87298a Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-22 19:50:06 -07:00
Amith Yamasani
b0363bec92 am 2c1dfa29: Merge "Fix deadlock in removing a user" into jb-mr1-dev 
* commit '2c1dfa29b40a988e3ea8f6922768465743aafddc':
  Fix deadlock in removing a user
 2012-08-22 18:23:07 -07:00
Jeff Sharkey
af29c27976 am 3451dc90: Merge "Iteration on multi-user external storage." into jb-mr1-dev 
* commit '3451dc90648b8bd176030425ce91c019460ba88c':
  Iteration on multi-user external storage.
 2012-08-22 18:20:52 -07:00
Amith Yamasani
2c1dfa29b4 Merge "Fix deadlock in removing a user" into jb-mr1-dev 2012-08-22 18:19:20 -07:00
Jeff Sharkey
3451dc9064 Merge "Iteration on multi-user external storage." into jb-mr1-dev 2012-08-22 18:17:30 -07:00
Amith Yamasani
0cd867c83e Fix deadlock in removing a user 
Cleanup PackageManager settings after the package directories are removed.

Change-Id: I264bc95ea21da653a234d7c81df5b25d4de7aa9e
 2012-08-22 16:45:47 -07:00
Victoria Lease
0203341a0b Set text locale in language settings panel. 
This results in the CJK locales displaying locale-appropriate glyphs
regardless of the device's locale.

Change-Id: I1564b0b63597f068f4680d0a59fc82dea2dbbba3
 2012-08-22 16:27:38 -07:00
Katie McCormick
9447af12e2 am 645eab64: Merge "Doc update: client javadoc fix for @value." into jb-dev 
* commit '645eab640e9c139b7a4e99c6c4d4f3bb2a86f092':
  Doc update: client javadoc fix for @value.
 2012-08-22 16:21:46 -07:00
Roman Nurik
2b4b1afcfa am 6d672214: Merge "Update TabCompat training sample code download." into jb-dev 
* commit '6d672214ae04e7d8d239c322ec4c79f9ee1feea9':
  Update TabCompat training sample code download.
 2012-08-22 16:21:40 -07:00
Irfan Sheriff
86bb22584f Merge "Fix system server restart" into jb-dev 2012-08-22 16:12:30 -07:00
Jean-Baptiste Queru
0a72b3e12c ignore merge of 2e2849a5 to jb-dev-plus-aosp 
Change-Id: Ie13c209a6646a08107ffecc9e63610fd5b9fab55
 2012-08-22 15:36:27 -07:00
The Android Open Source Project
1ac4ba1977 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ic44b998aee206c0a43d1da8cbf35e961745cb6f3
 2012-08-22 15:35:18 -07:00
Ying Wang
510aa89ca3 am 9f814ac5: Merge "Remove obsolete variables." into jb-mr1-dev 
* commit '9f814ac5fc0df77527d69710e8c1efa9d9d6f495':
  Remove obsolete variables.
 2012-08-22 15:23:10 -07:00
Ying Wang
9f814ac5fc Merge "Remove obsolete variables." into jb-mr1-dev 2012-08-22 15:19:44 -07:00
Chet Haase
2a100873ad am 5f9e92f4: Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev 
* commit '5f9e92f46fe06689a3018929590ef5f79688f0bc':
  Fix animation of notification handle bar when panel changes height
 2012-08-22 15:09:19 -07:00
Chet Haase
5f9e92f46f Merge "Fix animation of notification handle bar when panel changes height" into jb-mr1-dev 2012-08-22 15:06:56 -07:00
Jeff Brown
ff97ca85b2 Fix NPE. 
Bug: 7034583
Change-Id: Ie6b436492d12b0dd6bbe1c25d9b7ac35b74095d3
 2012-08-22 14:57:13 -07:00
James Dong
309f099bda am d78fc5b9: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev 
* commit 'd78fc5b94d1bb3dab509ca55d09052821c51412b':
  Let getOriginalMimeType() take a fd passed from drm java applications
 2012-08-22 14:53:46 -07:00
James Dong
d78fc5b94d Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev 2012-08-22 14:50:27 -07:00
Katie McCormick
645eab640e Merge "Doc update: client javadoc fix for @value." into jb-dev 2012-08-22 14:33:27 -07:00
Arik Nemtsov
5770b2dcf6 WifiStateMachine: ignore auth-fail event during WPS connection 
Disregard auth failure events during WPS connection. The EAP sequence is
retried several times, and there might be failures (especially for wps pin).
We will get a WPS_XXX event at the end of the sequence anyway.

Without this change, the SupplicantStateTracker class will disable
the WPS network we are connecting to after 2 failed authentication events.
Then, even if WPS succeeds, we will never connect to the selected network.

Change-Id: I57c8e508bfd738405b7f2c2c2325df7838e1b4af
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
 2012-08-22 16:29:43 -05:00
Stephen Hines
7cb7292f04 am 56c6392f: (-s ours) am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '56c6392fefba53e72c9effb7b5c92c64e03ecfd5':
  DO NOT MERGE - Fix readback lengths
 2012-08-22 14:24:39 -07:00
Stephen Hines
56c6392fef am 9f7fa4c4: (-s ours) Merge "DO NOT MERGE - Fix readback lengths" 
* commit '9f7fa4c4177c405566445760ec7f4c27e812cd7f':
  DO NOT MERGE - Fix readback lengths
 2012-08-22 14:23:01 -07:00
Craig Mautner
c91e00c8b4 am b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev 
* commit 'b9b56954ec5a242f7c4945942539106539f98ffb':
  Eliminate special battery calls by WindowManager
 2012-08-22 14:17:38 -07:00
Craig Mautner
b9b56954ec Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev 2012-08-22 14:14:54 -07:00
Stephen Hines
9f7fa4c417 Merge "DO NOT MERGE - Fix readback lengths" 2012-08-22 14:06:37 -07:00
Jeff Sharkey
2bca868361 Iteration on multi-user external storage. 
Remove single-user bind mounts, since they need to remain as raw
mounts to correctly propagate when remounted.  This means we're back
to using sdcard_r GID to enforce READ_EXTERNAL_STORAGE.

Bug: 6925012
Change-Id: I41b5d7ddc985a5df2e288632a0a80d4724089e00
 2012-08-22 13:59:58 -07:00
Katie McCormick
c44ba477b3 Doc update: client javadoc fix for @value. 
Change-Id: I9e1327a21d0755fc10b4e5cb4aa9ecd30053b6ef
 2012-08-22 13:56:17 -07:00
John Spurlock
1a868b7981 Add framework support for multiple dreams. 
Bug:7028665
Change-Id: I4fba6b8e39dc07af4490c621ac3bc7b3867371b2
 2012-08-22 16:49:20 -04:00
James Dong
0889fdae87 Let getOriginalMimeType() take a fd passed from drm java applications 
At present, we did not actually pass the fd. This patch allows us to
make the changes necessary in the future without worrying too much
about broken build.

related-to-bug: 6426185

Change-Id: I125decff9be621a72f2631fd439994a94a526606
 2012-08-22 13:47:19 -07:00
Jeff Brown
de05397815 am 6cf3b925: Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev 
* commit '6cf3b925ca2640c5c5e7e91ffd91749c0b5b2560':
  Fix auto-brightness adjustment sentinel value.
 2012-08-22 13:32:46 -07:00
Jeff Brown
6cf3b925ca Merge "Fix auto-brightness adjustment sentinel value." into jb-mr1-dev 2012-08-22 13:31:08 -07:00
Jeff Brown
5d03a53681 Fix auto-brightness adjustment sentinel value. 
Change-Id: I1b0da4566eb350333d3c3b09a96266627260baa3
 2012-08-22 13:22:02 -07:00