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

86189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
4110109cd7 Import translations. DO NOT MERGE 
Change-Id: I819f42df4c6909d695e78420670d76919a497c06
Auto-generated-cl: translation import
 2012-09-13 12:10:37 -07:00
Jim Miller
7ff2cadd34 am dc663fa5: am 39de2b0e: Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev 
* commit 'dc663fa5df42bd1e175797e8d91c0f1ed0d275de':
  Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it
 2012-09-13 03:22:27 -07:00
Craig Mautner
c1bfc347ef am a937899f: am 4be29754: Merge "Rename variables and methods for clarity." into jb-mr1-dev 
* commit 'a937899f72d544c338f969b99f05484e228439ff':
  Rename variables and methods for clarity.
 2012-09-13 03:22:23 -07:00
Mike Lockwood
2837e32216 am 0a319011: am 3ddaace1: Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev 
* commit '0a31901166518f99939844059f76914d331222e4':
  MtpDatabase: Use actual file size instead of media database size column
 2012-09-13 03:22:08 -07:00
Raph Levien
072288d17d am b23274e8: am 04578ee8: Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev 
* commit 'b23274e84250b2db835c9bf6641097e00114597f':
  Fix for bug 6872613 Need to revert back to a less hacky Arabic Font
 2012-09-13 03:22:04 -07:00
Craig Mautner
5409825bc2 am 5f3bce23: am faecd09c: Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev 
* commit '5f3bce237eb9ea18999d2c51b4cc3050a33541e8':
  Only consider hiddenRequested when deciding layout
 2012-09-13 03:21:59 -07:00
Jim Miller
f3254f57b8 am 208ed529: am 4f77268c: Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 
* commit '208ed529333a4c0025c5bb973cc8ebd465c4b87a':
  Initial pass at adding Music control to new keyguard.
 2012-09-13 03:21:55 -07:00
Makoto Onuki
8d715a9c7f am 599023f6: am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 
* commit '599023f639556b3c2657eb77c101db4696e15af4':
  A new broadcast action which is sent when profile changes
 2012-09-13 03:21:46 -07:00
Raph Levien
9a1e732282 am fde57726: am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 
* commit 'fde5772640c7c93ffb5b541b1711552c93309e6d':
  Fix for b7155617 race condition in TextLayoutCache.cpp
 2012-09-13 03:21:36 -07:00
Jim Miller
dc663fa5df am 39de2b0e: Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev 
* commit '39de2b0e1941c143d5b882a468e36929d978a35f':
  Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it
 2012-09-12 17:04:24 -07:00
rich cannings
3361340d9f am e88d6950: am 4a86019a: Temporarily turn off package verification 
* commit 'e88d69508ba76150850947f73ec86c03269762ad':
  Temporarily turn off package verification
 2012-09-12 17:03:38 -07:00
Selim Gurun
4c6e2bb822 am 2d449a48: am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev 
* commit '2d449a482c08d87a0d5409c1dda0695db0843c77':
  Minor update to addjavascriptinterface documentation
 2012-09-12 17:03:11 -07:00
Fabrice Di Meglio
ee5be7a5e7 am 465858e7: am 2cd35662: Merge "Fix SeekBar when in RTL layout direction" into jb-mr1-dev 
* commit '465858e779a79e88514a8b28df58bc089a0ee62b':
  Fix SeekBar when in RTL layout direction
 2012-09-12 17:03:06 -07:00
Fabrice Di Meglio
2b668afc11 am 47e39a9f: am 88724657: Merge "Fix bug #7148393 Switch can crash when hierarchyviewer is connected" into jb-mr1-dev 
* commit '47e39a9f61ae5ffdcb912c1f6196dd6f8e7478b5':
  Fix bug #7148393 Switch can crash when hierarchyviewer is connected
 2012-09-12 17:03:02 -07:00
Fabrice Di Meglio
297ecb3374 am 215ce60a: am b9674640: Merge "Enforce encapsulation for MarginLayoutParams startMargin and endMargin" into jb-mr1-dev 
* commit '215ce60a406c13d6963db24cc0a361da0eb64897':
  Enforce encapsulation for MarginLayoutParams startMargin and endMargin
 2012-09-12 17:02:58 -07:00
Selim Gurun
36562741f9 am 6e28f1aa: am 4f8da32f: Merge "Make JavascriptInterface annotation public." into jb-mr1-dev 
* commit '6e28f1aacfa4c82ab0c8b740a24ed233b031272f':
  Make JavascriptInterface annotation public.
 2012-09-12 17:02:51 -07:00
Brian Carlstrom
0829a09f72 am 2e96c791: am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev 
* commit '2e96c791e24454cf55144c64fe77321a31b746fe':
  Tracking upgrade to bouncycastle 1.47
 2012-09-12 17:02:47 -07:00
Elliott Hughes
1317ea6586 am 478eb3a6: am 6cfba16c: am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." 
* commit '478eb3a65ae085007a2799c4ae92cdb485f1443d':
  Include <sys/socket.h> instead of <linux/socket.h>.
 2012-09-12 17:02:40 -07:00
Scott Main
e2aa0dca95 am 460486bf: am c4091423: am 53d1864c: am 8dc0ff07: Merge "fix another link in the style doc" into jb-dev 
* commit '460486bfb84003529e56b628f502e7c193471595':
  fix another link in the style doc
 2012-09-12 17:02:30 -07:00
Marco Nelissen
3681c20a8b am f903c8d2: am a962d749: Merge "EffectsTest enhancements" into jb-mr1-dev 
* commit 'f903c8d23f824a7cd703db8a268e3aca7aa6c71e':
  EffectsTest enhancements
 2012-09-12 17:02:22 -07:00
Scott Main
a1b09db18d am c42abbc3: am 04827912: am eb0b6e27: am 94b2b5ef: Merge "fix links to style and themes source files" into jb-dev 
* commit 'c42abbc3af78da59a1e89eece69b9851eabda351':
  fix links to style and themes source files
 2012-09-12 17:02:18 -07:00
Kristian Monsen
f77e52e110 am 5710a2f1: am bd0fe878: Merge "Deprecating methods (and a constant) for JB MR1" into jb-mr1-dev 
* commit '5710a2f1269180c169855b98a8d33f2f12ced1a1':
  Deprecating methods (and a constant) for JB MR1
 2012-09-12 17:02:11 -07:00
The Android Open Source Project
3ffee6ac03 am da88c8b0: (-s ours) am 568e3ebb: am 4b0764ee: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'da88c8b0108b9fe4e319511149a347e382969c2e':
  Fix notification gestures.
  Single finger notification expansion.
 2012-09-12 16:59:23 -07:00
The Android Open Source Project
f119384a08 am 2b2b53c7: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '2b2b53c713001008b446c8ee17911fb199622160':
  Fixing issue with Airplane Mode. (Bug 7141144)
  Update airplane-mode manipulation for the new Settings namespace
  Check for null ViewRootImpl when saving accessibility focus in ListView.
  Reset GL buffer state after functor invocation
  Copy all mutable state before sending to clients.
  Disable wifi display API when the adapter is not registered.
  Wrapped call to notifyAll() in a synchronized block
  Fix EmergencyDialer button on devices without telephony hardware
 2012-09-12 16:59:06 -07:00
Jim Miller
39de2b0e19 Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev 2012-09-12 16:58:17 -07:00
Craig Mautner
a937899f72 am 4be29754: Merge "Rename variables and methods for clarity." into jb-mr1-dev 
* commit '4be297545362e547c2168c5d031be9b335101957':
  Rename variables and methods for clarity.
 2012-09-12 16:50:40 -07:00
Craig Mautner
4be2975453 Merge "Rename variables and methods for clarity." into jb-mr1-dev 2012-09-12 16:48:15 -07:00
Craig Mautner
5c0e78c445 Rename variables and methods for clarity. 
Change-Id: I2a1b2f2d5605123e55f264d45b1e7292852f2a7f
 2012-09-12 16:45:36 -07:00
Jim Miller
6fba0a0c72 Music in keyguard improvements 
- fix overscroll issue with workaround described in bug 7137941
- ignore noisy signals from music player that sometimes hide it

Change-Id: I6a25674ce7157bd70409f56881ec62644f5fce9b
 2012-09-12 16:38:56 -07:00
Mike Lockwood
0a31901166 am 3ddaace1: Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev 
* commit '3ddaace1a27e35eed78bdc4b6dc380d81ba6806d':
  MtpDatabase: Use actual file size instead of media database size column
 2012-09-12 16:34:47 -07:00
Jeff Sharkey
116be95495 Merge commit '81eb7640' into mergeit 
Conflicts:
	core/java/android/app/ActivityThread.java

Change-Id: I7bb19741ae948e4570c0882dee2558dd5ff2c350
 2012-09-12 16:34:31 -07:00
Mike Lockwood
3ddaace1a2 Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev 2012-09-12 16:31:56 -07:00
Raph Levien
b23274e842 am 04578ee8: Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev 
* commit '04578ee8bc7e47a12182ef65e211a3a330324c1f':
  Fix for bug 6872613 Need to revert back to a less hacky Arabic Font
 2012-09-12 16:31:01 -07:00
Raph Levien
04578ee8bc Merge "Fix for bug 6872613 Need to revert back to a less hacky Arabic Font" into jb-mr1-dev 2012-09-12 16:29:07 -07:00
Craig Mautner
5f3bce237e am faecd09c: Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev 
* commit 'faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f':
  Only consider hiddenRequested when deciding layout
 2012-09-12 16:21:00 -07:00
Jim Miller
208ed52933 am 4f77268c: Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 
* commit '4f77268c8a75dd89303b0c6bcf6ee02a97a68d1a':
  Initial pass at adding Music control to new keyguard.
 2012-09-12 16:19:00 -07:00
Craig Mautner
faecd09cb7 Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev 2012-09-12 16:18:37 -07:00
Jim Miller
4f77268c8a Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev 2012-09-12 16:16:21 -07:00
Craig Mautner
c516a5c58f Only consider hiddenRequested when deciding layout 
This change removes the test for hidden when deciding whether to
do a layout. So layout begins as soon as hiddenRequested occurs.
Since hidden is cleared when animations starts considering hidden
in the layout decision will delay layout until it is too late.

In particular we were not executing a relayout on return to an
activity even though the screen had been rotated while away.

Fixes bug 6615859.

Change-Id: I5fb0b4bf2c253b910a7a192da04419236d8f09d9
 2012-09-12 16:13:59 -07:00
Makoto Onuki
599023f639 am b11b9fc9: Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 
* commit 'b11b9fc9972ba0ae7f3d13984c5c61a8d89ca142':
  A new broadcast action which is sent when profile changes
 2012-09-12 16:13:50 -07:00
Makoto Onuki
b11b9fc997 Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev 2012-09-12 16:11:13 -07:00
Raph Levien
2f5bdb06e7 Fix for bug 6872613 Need to revert back to a less hacky Arabic Font 
Roozbeh provided an updated Arabic system UI font which does positioning
properly (using the GPOS mechanism, which is now fully supported in text
rendering), as opposed to the old workaround of using GSUB combinations.
It contains the following additional fixes:

1. Removed the new glyphs and relevant table fields created by GPOS2GSUB
2. [Kept empty glyphs for ZWSP, ZWNJ, and ZWJ]
3. Fixed a wrong GSUB substitution for Urdu Seven
4. Fixed shaping of U+06C1 HEH GOAL
5. Fixed shaping of U+06BA NOON GHUNNA
6. Removed the Rial ligature from the GSUB table
7. Tightened the Alef-Lam-Lam-Heh ligature in the GSUB table which was
getting triggered too frequently

This change just checks in the above work. I did a sanity-check
verification that Arabic text still renders reasonably in the system UI,
but did not check the above cases carefully.

Change-Id: Ie5fb9fd78d21bbfcd62b86deb327a5a2ae9321c6
 2012-09-12 15:53:26 -07:00
Mike Lockwood
f6f1661457 MtpDatabase: Use actual file size instead of media database size column 
Fixes problems with file transfer from device to host that can occur
if the database size value is wrong.

Bug: 6954446

Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-09-12 15:50:59 -07:00
Raph Levien
fde5772640 am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 
* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
  Fix for b7155617 race condition in TextLayoutCache.cpp
 2012-09-12 15:46:43 -07:00
Raph Levien
eb1f5349f8 Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev 2012-09-12 15:44:58 -07:00
Daniel Sandler
7b75adaafc am 2966351b: am 8a0e1fef: am b8026996: (-s ours) am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit '2966351be2f670eaef5f69e25d3169cb9274edc1':
  Fix notification gestures.
 2012-09-12 15:36:13 -07:00
Daniel Sandler
9196a1ec7d am 1bd62602: am ec4c62bf: am 2da1e221: (-s ours) am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit '1bd6260235ed0339400295ae248ecd4c2837b11c':
  Single finger notification expansion.
 2012-09-12 15:36:09 -07:00
Jeff Brown
eda63986fe am 81da4c77: am c7b6ec7a: Merge "Improve reporting of wifi connection state." into jb-mr1-dev 
* commit '81da4c7780134b4ed5d37872b198fb6ad01b3885':
  Improve reporting of wifi connection state.
 2012-09-12 15:35:48 -07:00
Svetoslav Ganov
3acdb339ac am e020020f: am 5e900e3a: Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev 
* commit 'e020020f218550c97d1011c7eb6221d14fe1ea33':
  Adding a scaling threshold in ScreenMagnifier
 2012-09-12 15:35:41 -07:00
Jean-Baptiste Queru
687e4ccea8 am cdb22217: am d057e73e: am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit 'cdb22217cf4935e8711b232af8bc35f8d762fe3d':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-12 15:35:32 -07:00