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

76381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
f3df8789f7 am b05b158b: Merge "report a Sensor\'s version from the HAL" into jb-dev 
* commit 'b05b158b84b620e46d736dcaf038fa6268cbcb00':
  report a Sensor's version from the HAL
 2012-05-04 16:34:05 -07:00
Mathias Agopian
b05b158b84 Merge "report a Sensor's version from the HAL" into jb-dev 2012-05-04 16:30:32 -07:00
Gilles Debunne
e244868053 Final fix in SpannableStringBuilder. 
Bug 6448052

The empty EXCLUSIVE removal condition was incorrect.
Also changed the unit test the didn't catch this problem.

Change-Id: I5576d830cdfa6cc3716c878fb698695a2978b296
 2012-05-04 16:24:49 -07:00
Nick Pelly
6e4cb6a93b Log PID of apps requesting location updates. 
BUG=6444765

Change-Id: Ib948b8fddb99f95f63486fbc096a26609c1a6c21
 2012-05-04 16:18:09 -07:00
Dianne Hackborn
967b361cd3 am 6ad5b4f6: Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 
* commit '6ad5b4f637e64cb07a17079424cff66c867c7f27':
  Fix issue #6426645: API REVIEW: android.app.ActivityOptions
 2012-05-04 16:12:37 -07:00
Dianne Hackborn
6ad5b4f637 Merge "Fix issue #6426645: API REVIEW: android.app.ActivityOptions" into jb-dev 2012-05-04 16:10:16 -07:00
Michael Jurka
a6b863a44d am c9c23196: Merge "Fix NPE for real" into jb-dev 
* commit 'c9c23196a11bda6fbc1c44f6d170b3626b036474':
  Fix NPE for real
 2012-05-04 16:01:21 -07:00
Michael Jurka
d7683d748d Make recents thumbnails look a bit better on Nakasi 
Bug: 6405276

Change-Id: I9faea28b027de2ef1ee45a65eed2f7a43eee901b
 2012-05-04 15:59:20 -07:00
Michael Jurka
c9c23196a1 Merge "Fix NPE for real" into jb-dev 2012-05-04 15:58:02 -07:00
Fabrice Di Meglio
fe76fa41da am ebbd247d: Merge "Update Arabic font for SystemUI" into jb-dev 
* commit 'ebbd247d83270df7c9f3c2f68d3ee9856c86a0b9':
  Update Arabic font for SystemUI
 2012-05-04 15:55:58 -07:00
Fabrice Di Meglio
ebbd247d83 Merge "Update Arabic font for SystemUI" into jb-dev 2012-05-04 15:53:49 -07:00
Svetoslav Ganov
9878a04b3c am 5fd72a2c: Merge "Finding focus for from rectangle now working." into jb-dev 
* commit '5fd72a2cceae9955af316f32e17a84515c317738':
  Finding focus for from rectangle now working.
 2012-05-04 15:52:45 -07:00
Mathias Agopian
277d1b2f49 report a Sensor's version from the HAL 
Bug: 6447433
Change-Id: I0f46cb378de9bde20876608d5459689cc108c592
 2012-05-04 15:51:29 -07:00
Svetoslav Ganov
5fd72a2cce Merge "Finding focus for from rectangle now working." into jb-dev 2012-05-04 15:49:44 -07:00
Michael Jurka
9d69b4463f Fix NPE for real 
Bug: 6444814
 2012-05-04 15:46:32 -07:00
John Reck
e666b10dff Drain any pending touch events immediately if possible 
Bug: 6317798

Change-Id: Id343801cf80817f587414224cc67c13d34efed04
 2012-05-04 15:30:42 -07:00
Jeff Sharkey
084c71ebad am 8c58677e: Merge "Fix network stats and policy tests." into jb-dev 
* commit '8c58677e28bf6c546a0a91aa85032e8c9658ff8b':
  Fix network stats and policy tests.
 2012-05-04 15:27:33 -07:00
Jeff Sharkey
8c58677e28 Merge "Fix network stats and policy tests." into jb-dev 2012-05-04 15:24:53 -07:00
Jeff Sharkey
0cf6de0c93 Fix network stats and policy tests. 
Bug: 6299195
Change-Id: I1941b5f7329940cc7469bd3fda17c3dc3a656250
 2012-05-04 15:15:42 -07:00
Fabrice Di Meglio
cf4284bce1 Update Arabic font for SystemUI 
- bug #5987379 Need an Arabic font with metrics "compatible" with Roboto
- use the Alt version with GSUB optimizations

Change-Id: I4d8c62cab37a7b010abab602c39899084d347fdc
 2012-05-04 15:14:58 -07:00
Adam Powell
da6f2b54ca am 9c982340: Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev 
* commit '9c98234095a6894621d1c71e1c9e523c70f0f067':
  Fix LinearLayout measureWithLargestChild for wrap_content views
 2012-05-04 15:03:36 -07:00
Adam Powell
9c98234095 Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev 2012-05-04 15:01:14 -07:00
Jeff Sharkey
eb279868ce am b7095284: Merge "Disable policy when bandwidth module missing." into jb-dev 
* commit 'b709528407614642b2384063426d60ea12490607':
  Disable policy when bandwidth module missing.
 2012-05-04 14:57:38 -07:00
Selim Gurun
275fce8a2c Use private key context when necessary 
Bug: 6249185

Due to recent changes to keystore, we cannot rely on encoded key
format anymore. Rather we receive the key context (a pointer to
private key really) and pass it to native openssl. We also keep
the original logic however.

Change-Id: Iefe9f0336dd5f47eec4222fcb6fec58807e7cac0
 2012-05-04 14:57:34 -07:00
Jeff Sharkey
b709528407 Merge "Disable policy when bandwidth module missing." into jb-dev 2012-05-04 14:55:45 -07:00
Adam Powell
eabc919844 Fix LinearLayout measureWithLargestChild for wrap_content views 
Bug 6442795

When the measureWithLargestChild setting is enabled, LL used to
measure the full container taking the largest child rule into account,
but the child views were not properly remeasured for AT_MOST
measurespecs. Correct this.

Fix measureWithLargestChild for height

Change-Id: Ieb91114bc2ae65f9104337bd6d16a7d9e559571d
 2012-05-04 14:54:14 -07:00
Jeff Sharkey
8c1dc72b14 Disable policy when bandwidth module missing. 
Bug: 6447017
Change-Id: I705a223dac15fc41e231bb9c81a96a287caaf094
 2012-05-04 14:49:37 -07:00
Andy Stadler
1f1aed5e76 am c4be1b7e: Merge "Add System Tracing capability to Sync Manager" into jb-dev 
* commit 'c4be1b7e963413c110d8a6ee9fdd4fd7443fb2e0':
  Add System Tracing capability to Sync Manager
 2012-05-04 14:49:00 -07:00
Andy Stadler
c4be1b7e96 Merge "Add System Tracing capability to Sync Manager" into jb-dev 2012-05-04 14:46:00 -07:00
Fabrice Di Meglio
ed1c345f5e am 2b20212e: Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev 
* commit '2b20212e16afed91881dfb7483f3c59cf1d0ebc4':
  Hide Paint textLocale APIs - DO NOT MERGE
 2012-05-04 14:41:18 -07:00
Fabrice Di Meglio
2b20212e16 Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev 2012-05-04 14:39:18 -07:00
Eric Fischer
8049479267 am c9c199a5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c9c199a51a537cfc2aad43c06ecdeaceb8f8b698':
  Import translations. DO NOT MERGE
 2012-05-04 14:19:29 -07:00
Fabrice Di Meglio
b0aa2f5368 Hide Paint textLocale APIs - DO NOT MERGE 
- fix bug #6441521 Need to @hide Paint setTextLocale / getTextLocale - CJK support

Change-Id: Ic536989243d7028e6f5fce7d60dfef4467bebffb
 2012-05-04 14:19:19 -07:00
Eric Fischer
c9c199a51a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-04 14:16:23 -07:00
Jim Miller
360ca12bf2 am 516c25b3: Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 
* commit '516c25b38a03decc8f9cbd41f4d9baa4f52f438f':
  Fix 6414061: Add new ACTION_ASSIST intent.
 2012-05-04 14:16:16 -07:00
Jim Miller
516c25b38a Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 2012-05-04 14:12:41 -07:00
John Reck
db2a68f376 am df35aa45: Merge "Verify attached before showing a dialog" into jb-dev 
* commit 'df35aa457ec275422b1695f6a3293aae35f99a22':
  Verify attached before showing a dialog
 2012-05-04 14:06:48 -07:00
John Reck
df35aa457e Merge "Verify attached before showing a dialog" into jb-dev 2012-05-04 14:04:15 -07:00
Jim Miller
0799440ab3 Fix 6414061: Add new ACTION_ASSIST intent. 
Change-Id: I3d334f67723ac89f6001267e0f06ad76190b929f
 2012-05-04 13:52:14 -07:00
Daniel Sandler
d2217f0c32 Restore do-not-disturb mode on tablets. 
Bug: 6195112
Change-Id: Iecb850942df43fb8861cbbf2e2343c2aabfc4263
 2012-05-04 16:44:16 -04:00
Chris Wren
32c513b729 am 3c5f9243: The BigTextStyle should never render mContentText 
* commit '3c5f92432734e1e3b9bdc515628a4c09d7759cd4':
  The BigTextStyle should never render mContentText
 2012-05-04 13:39:13 -07:00
Chris Wren
3c5f924327 The BigTextStyle should never render mContentText 
Change-Id: Ifcbb0868871741bd78c5ebf31408143aaf732b98
 2012-05-04 13:32:18 -07:00
Fabrice Di Meglio
fc6ef88a3d am 8396830d: Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev 
* commit '8396830d8fedc08c0a9de36bcce3c8b65691729f':
  Hide RTL related APIs - DO NOT MERGE
 2012-05-04 13:21:59 -07:00
Fabrice Di Meglio
8396830d8f Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev 2012-05-04 13:19:41 -07:00
Fabrice Di Meglio
797243a719 am e12c5949: Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev 
* commit 'e12c59491ea01417987216e2dc6a12e482982d60':
  Use paint typeface for shaping when it supports the requested script.
 2012-05-04 13:16:55 -07:00
Fabrice Di Meglio
66388dcb09 Hide RTL related APIs - DO NOT MERGE 
- fix bug #6441155 API review: @hide RTL layout APIs

Change-Id: I13c5ea5f579cecffed9d517f06180ab0576cd26a
 2012-05-04 13:15:12 -07:00
Fabrice Di Meglio
527c7c3f07 am e5c67bf7: Merge "Make Arabic script runs longer (for performance) - bug 6426451." into jb-dev 
* commit 'e5c67bf7e14392feb54c26b7576b4d6c36b0068e':
  Make Arabic script runs longer (for performance) - bug 6426451.
 2012-05-04 13:13:45 -07:00
John Reck
d4717b8b6f Verify attached before showing a dialog 
Bug: 6372828

Change-Id: I7f3360ab8a0cdcaf20829e6e2c9181c7af73586e
 2012-05-04 13:13:38 -07:00
Fabrice Di Meglio
e12c59491e Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev 2012-05-04 13:12:23 -07:00
Fabrice Di Meglio
e5c67bf7e1 Merge "Make Arabic script runs longer (for performance) - bug 6426451." into jb-dev 2012-05-04 13:11:24 -07:00