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

81109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
7ea4979835 am edc34cf5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'edc34cf55482faa25b48e867bd51ecec74dbd0e8':
  Import translations. DO NOT MERGE
 2012-06-20 12:28:33 -07:00
Ying Wang
edc34cf554 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-20 12:26:14 -07:00
Ying Wang
83b148dfdc Merge "Import translations. DO NOT MERGE" 2012-06-20 12:25:58 -07:00
Ying Wang
7e439f873f Merge "Import translations. DO NOT MERGE" 2012-06-20 12:25:52 -07:00
Ying Wang
c801e3ed0b Import translations. DO NOT MERGE 
Change-Id: If56cf4c763d2994bfe838b5b9ebab92a585a135b
 2012-06-20 12:17:27 -07:00
Charles Chen
6ea5527157 am 80a3c3ea: am d0d3a850: Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 
* commit '80a3c3ea6f69df461c7e722c8e16362ce4bb60f3':
  Fixing gesture recognition configuration in TouchExplorer.
 2012-06-20 12:16:42 -07:00
Charles Chen
80a3c3ea6f am d0d3a850: Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 
* commit 'd0d3a850650ade52198e7836f87a0e27ad2d6b41':
  Fixing gesture recognition configuration in TouchExplorer.
 2012-06-20 12:14:08 -07:00
Charles Chen
d0d3a85065 Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 2012-06-20 12:12:07 -07:00
Dianne Hackborn
306211d792 am b0222bb1: am 0fa4d30b: Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 
* commit 'b0222bb19e8d850ccbd74c4f0832d73ae552df8d':
  Fix issue #6686339: 2 taps required to launch notification...
 2012-06-20 12:10:39 -07:00
Dianne Hackborn
ae5bd3a998 am cb1c45ed: am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 
* commit 'cb1c45ed80df368051368a478fa931d3333c99f6':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
 2012-06-20 12:10:36 -07:00
Dianne Hackborn
b0222bb19e am 0fa4d30b: Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 
* commit '0fa4d30b03c4307ca5d461aa4450b672b6850ea1':
  Fix issue #6686339: 2 taps required to launch notification...
 2012-06-20 12:08:03 -07:00
Dianne Hackborn
cb1c45ed80 am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 
* commit 'b6ce1f311ce154af713ebc4f543fc2aaed446939':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
 2012-06-20 12:08:00 -07:00
Ying Wang
a739382039 Import translations. DO NOT MERGE 
Change-Id: Ifda99210ad7f26a2907db12ce7c88c7b73e4ec65
 2012-06-20 12:07:10 -07:00
Dianne Hackborn
0fa4d30b03 Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 2012-06-20 12:06:38 -07:00
Dianne Hackborn
b6ce1f311c Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-06-20 12:06:14 -07:00
Peter Ng
74cc83fe77 am 61e7b87e: am 2c24de30: Fixing typography typo and iconography typo 
* commit '61e7b87e8daa9518e8d5ba69165fc407282c156c':
  Fixing typography typo and iconography typo
 2012-06-20 12:02:05 -07:00
Peter Ng
61e7b87e8d am 2c24de30: Fixing typography typo and iconography typo 
* commit '2c24de30a73b59ca1fa93cf7bfb7aba90953a0dc':
  Fixing typography typo and iconography typo
 2012-06-20 11:59:36 -07:00
Ying Wang
ddaeed3615 Import translations. DO NOT MERGE 
Change-Id: If50ab67d8bc4570a07cb2e9dba0c22ed4f7d7592
 2012-06-20 11:58:21 -07:00
satok
4c0e7152e7 Workaround: Never reset the default IME if the system is not ready 
Bug: 6685037
Change-Id: Ifb311f85154beadd4787ec73669bedfdf1f5172d
 2012-06-21 02:22:24 +09:00
Peter Ng
2c24de30a7 Fixing typography typo and iconography typo 
Bug: 5836343
Bug: 5831156
Change-Id: I2801002a20645d1cbf7d548a1a7c280796457adb
 2012-06-20 09:33:39 -07:00
Chris Wren
8b007ed423 Merge "One-finger notificaiton open: pop the next item too." 2012-06-20 09:28:38 -07:00
Billy Hewlett
be97f1458b Elegant fonts for Webkit, Compact fonts for Textview (Data) 
Font files are marked with elegant or compact in attributes.
This is the data check for the code checkin with a similar title

Bug: 6649136
Change-Id: Ie246ae0cff55c1e76c0f32012a740547274e8221
 2012-06-20 09:24:26 -07:00
Kenny Root
5293d0cb2e Merge "Packages for PackageManagerService tests" 2012-06-20 09:13:47 -07:00
Jean-Michel Trivi
6009dc014f am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit 'b92d2a13c4ab34862968f47191d2713de3701757':
  Remote volume handling in MediaRouter
 2012-06-20 09:12:59 -07:00
Jean-Michel Trivi
b92d2a13c4 am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
  Remote volume handling in MediaRouter
 2012-06-20 09:10:18 -07:00
Jean-Michel Trivi
18ddb6ce6f Merge "Remote volume handling in MediaRouter" into jb-dev 2012-06-20 09:07:59 -07:00
Billy Hewlett
ecf80965d0 Use Elegant fonts for Webkit, Compact fonts for Textview 
Fonts can be marked with elegant or compact in fallback_fonts.xml.
Webkit uses elegant fonts, Textview uses compact fonts (the default),
unmarked fonts are used by both.

    Bug: 6649136

Change-Id: Ie0debcddc13350bf60fe3139cd7ae533e466f02b
 2012-06-20 09:07:09 -07:00
The Android Open Source Project
0fa755a7bb am eb47f9c8: Reconcile with jb-release 
* commit 'eb47f9c81dee7c277e77f77ff977ec5f1ded5bc1':
 2012-06-20 08:28:29 -07:00
The Android Open Source Project
eb47f9c81d Reconcile with jb-release 
Change-Id: I6743fa9d2193a3c89f14c6157ef0e783474b0477
 2012-06-20 08:25:40 -07:00
The Android Automerger
f90c0a8869 merge in jb-release history after reset to jb-dev 2012-06-20 07:02:31 -07:00
Luca Zanolin
2e134263f5 am 50ff53be: am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev 
* commit '50ff53be520c0fb272507d406286711e46601386':
  Clone the list of listeners before notifing any event.
 2012-06-20 02:37:36 -07:00
Luca Zanolin
50ff53be52 am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev 
* commit '17c1425f5ab5c6f734a700d74b5bd8118f289cd5':
  Clone the list of listeners before notifing any event.
 2012-06-20 02:34:33 -07:00
Luca Zanolin
17c1425f5a Merge "Clone the list of listeners before notifing any event." into jb-dev 2012-06-20 02:32:12 -07:00
Hung-ying Tyan
87ab6962e4 Fix crash when SimpleCursorAdapter changes cursor from null 
when the spinner's drop-down view is shown.

Bug: 6637141

Change-Id: I62f759f778b040db386cc72a753c3b2745517b7e
 2012-06-20 15:58:43 +08:00
Adam Powell
00130f13f0 Fix build; un-pin attribute destined for API 17 or later to prevent 
further automerge antics.

Change-Id: I547dc0abd8db09e8aefc89123e4fb7f73eea712b
 2012-06-19 20:06:53 -07:00
Jean-Michel Trivi
1357012968 Remote volume handling in MediaRouter 
Extend MediaRouter.UserRouteInfo to enable setting playback
 information, which includes volume. When the user route instance
 has a RemoteControlClient, forward any playback information to it.
 Enable specifying a callback to be notified of volume events
 on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
 information.

Update RemoteControlClient javadoc to reflect which parts of the
 API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
 2012-06-19 19:41:35 -07:00
Adam Powell
b10345898c am da828803: am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit 'da8288037cff76367c3088adaa174ddb27bf55c2':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:22:44 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:20:05 -07:00
Adam Powell
2dde147b28 Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 2012-06-19 19:18:34 -07:00
Jeff Brown
e6d2016be0 Merge "Clean up PowerManager API." 2012-06-19 18:48:20 -07:00
Romain Guy
c63c7bf944 am b56fe8ab: am f96d117e: Merge "Add extra systrace tracing" into jb-dev 
* commit 'b56fe8abf6735337b65e050f44e1baf2f3f813ed':
  Add extra systrace tracing
 2012-06-19 18:43:31 -07:00
Jeff Brown
1244cdaedd Clean up PowerManager API. 
Mostly just moved the code around and improved the docs.

Fixed a minor inefficiency in WakeLock.setWorkSource() where
we would tell the power manager that the work source was changed
even when the old work source and new work source were both null.

Fixed a bug in WakeLock.setWorkSource() where we would not
notify the power manager that the work source was changed if
there was no work source previously specified.

Added synchronized to WakeLock.setReferenceCounted.

Added a checked in WakeLock.acquireLocked() and WakeLock.release()
to check whether the wake lock is actually not held / held
before performing the corresponding operation.  This change avoids
making redundant calls into the power manager service in the
case where the wake lock is not reference counted and acquire()
or release() have been called multiple times.

Made the PowerManager and WakeLock classes final.  They are not
directly instantiable by applications so this change does not
break the API.

Removed a little dead code (one private constructor and an
unused constant).

Change-Id: I4e10cf893506115938a35756136c101256dccf30
 2012-06-19 18:42:05 -07:00
Romain Guy
b56fe8abf6 am f96d117e: Merge "Add extra systrace tracing" into jb-dev 
* commit 'f96d117e9bf2d5998677521330697628c95ec3f1':
  Add extra systrace tracing
 2012-06-19 18:40:50 -07:00
Romain Guy
f96d117e9b Merge "Add extra systrace tracing" into jb-dev 2012-06-19 18:39:08 -07:00
Jim Miller
ea03338dfa am 27d1916e: am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 
* commit '27d1916e85ad994c3a440a80066737a8492eb791':
  Fix 6656710: center dot pattern in GlowPadView
 2012-06-19 18:36:04 -07:00
Jim Miller
27d1916e85 am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 
* commit 'fce2ec4da468c2d5ba26de8d051ff7ee64bb01c3':
  Fix 6656710: center dot pattern in GlowPadView
 2012-06-19 18:33:27 -07:00
Jim Miller
fce2ec4da4 Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 2012-06-19 18:31:31 -07:00
Jim Miller
94754ef36d Fix 6656710: center dot pattern in GlowPadView 
This fixes a bug where the dots weren't aligned with the center of the view.
The matrix should not contain the offset of the image itself since we really
want to scale about the abstract points.  The code now subtracts the image
centering positions (cx,cy) from the point to be scaled.

Change-Id: I1d46a5d51b1fd1d39944c64baf86c306c2d5e923
 2012-06-19 18:28:25 -07:00
Romain Guy
77e67cf905 Add extra systrace tracing 
This change shows how much time is spent updating and executing
framework display lists within a frame.
This change also fixes a crash that happnes if you attempt to
perform a dumpsys gfxinfo while the app is drawing (we are telling
developers to use this new tool.)

Change-Id: Ia4047a78a42b545ab77176ef4f371c300686548c
 2012-06-19 18:21:06 -07:00
Xavier Ducrohet
752e7b3bf6 am 58a8d8d2: am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into jb-dev 
* commit '58a8d8d2d4b15cd4abf010680181359823ebfda4':
  Disable debug output in SDK layoutlib.
 2012-06-19 18:09:14 -07:00