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

86108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
d02341d0bd am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit '072533e934e759b95228ba61152e7d958b641b96':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-19 12:23:36 -07:00
Fabrice Di Meglio
eebe7df2a3 am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'efa568525fc7755ac49e44e75246b2be1ef5269f':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-19 12:23:32 -07:00
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 12:21:15 -07:00
Fabrice Di Meglio
072533e934 Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 2012-09-19 12:11:49 -07:00
Raph Levien
3c9a0b11de am d79dd344: Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 
* commit 'd79dd34482b7a9252485c28ff17aede669f70986':
  Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family
 2012-09-19 11:59:45 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 11:56:40 -07:00
Fabrice Di Meglio
efa568525f Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 2012-09-19 11:55:31 -07:00
Raph Levien
d79dd34482 Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 2012-09-19 11:53:03 -07:00
Dianne Hackborn
9b4d528d7e am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '09ad0832e0c28fa43a2e2bf53bef87df39bd4416':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-19 11:42:56 -07:00
Dianne Hackborn
09ad0832e0 Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 2012-09-19 11:40:18 -07:00
Scott Main
7b882e36ce am 5580005c: am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '5580005cc7f333e15326b219a0ff06b7c6eca529':
  udpate media formats for JB
 2012-09-19 11:30:31 -07:00
Scott Main
5580005cc7 am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '9198495b2767c507eb983f94b0449f23516240db':
  udpate media formats for JB
 2012-09-19 11:27:42 -07:00
Dianne Hackborn
15491c6a72 Switch to showing top-most thumbnail of recent apps. 
The way it should have been, and with the new recents enter animation
the way it must be.

Added a new method to retrieve this thumbnail, since it would be less
efficient to use the existing API (which always returns the "base"
thumbnail).  Probably at some point that existing API should be tweaked
to always return the top thumbnail instead, but that is for a later time.

Also removed code that would clear the thumbnail associated with an
activity when it is resumed.  I don't think there should ever be a
reason to clear a thumbnail -- it's much better to have *something*
for the task, even if it is a little out of date.

Change-Id: I83e6ca6403eb2df5e4de3009dfe8c210e8cf8d5b
 2012-09-19 11:25:40 -07:00
Jeff Sharkey
f40a2ba146 am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 11:25:25 -07:00
Jeff Sharkey
a490bddc8b Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 11:22:14 -07:00
Scott Main
9198495b27 am 19a39686: am b79d8ecc: udpate media formats for JB 
* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB
 2012-09-19 11:22:02 -07:00
Glenn Kasten
a84ed72307 am 549be8be: Merge "New API for querying audio properties" into jb-mr1-dev 
* commit '549be8beadf5ad2a56b7f4269d419753c0d61be8':
  New API for querying audio properties
 2012-09-19 11:16:56 -07:00
Glenn Kasten
549be8bead Merge "New API for querying audio properties" into jb-mr1-dev 2012-09-19 11:13:58 -07:00
Craig Mautner
8863cca57d Fixes to Starting window and Wallpaper windows. 
- Checking for found wallpaper to match either mWallpaperTarget
or mLowerWallpaperTarget keeps from swapping the layers while
transitioning between two wallpaper activities.

- Fade out RecentsActivity while bringing up selected activity. This
keeps the RecentsActivity from showing through a launching wallpaper
activity.

- When moving a starting window from one activity to another clear
the startingDisplayed flag in the old activity.

- When moving a starting window from one activity to another assign
the new activity's mAppAnimator to the starting window's mWinAnimator.

- Only treat a wallpaper transition as entering if the mWallpaperTarget
is visible and not being hidden. Keeps from assigning the wrong
animation when activities are launched back to back and the
mWallpaperTarget is still animating away.

Fixes bug 7148089.

Change-Id: Idd405b1ba113f3345ca2116d141b474abe5bd4c0
 2012-09-19 11:11:46 -07:00
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB 
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
 2012-09-19 11:00:23 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Baligh Uddin
ed6650c500 am 7b6ec1f6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7b6ec1f6fd4f2858063d2d441b6118ac22da5569':
  Import translations. DO NOT MERGE
 2012-09-19 09:23:04 -07:00
Baligh Uddin
7b6ec1f6fd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 09:14:59 -07:00
Narayan Kamath
40c5a7a6e1 am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '5d1a870a25f7495755432a42cf8c81818dc369fa':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 05:50:08 -07:00
Narayan Kamath
5d1a870a25 Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 2012-09-19 01:31:36 -07:00
Scott Main
b79d8ecc27 udpate media formats for JB 
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
 2012-09-19 00:02:12 -07:00
Irfan Sheriff
74f4997ca4 am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '5d4206a55c5336a163408422ba3302f5fd8463f7':
  Get strings in
 2012-09-18 22:36:36 -07:00
Irfan Sheriff
5d4206a55c Merge "Get strings in" into jb-mr1-dev 2012-09-18 22:34:34 -07:00
Irfan Sheriff
7f0aaac7f2 Get strings in 
Bug: 65904101
Bug: 7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a
 2012-09-18 22:06:13 -07:00
Jim Miller
a149f19742 am 5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev 
* commit '5d8d169bbb0325665d600415bc7b4add2dbcaf75':
  Fix wrong pattern count in keyguard pattern security view.
 2012-09-18 21:08:28 -07:00
Jim Miller
5d8d169bbb Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev 2012-09-18 21:06:41 -07:00
Jim Miller
d2b82f70fe Fix wrong pattern count in keyguard pattern security view. 
This fixes a bug introduced in I085c5ec8 where keyguard attempts to emulate
slippery windows with views.  In order to do so,  the code was overloading
dispatchTouchEvent().  It would allow the super (a ViewGroup) to dispatch
the events and then would dispatch them itself to sub views.  In the case
where an event overlaps an actual child view, it would  result in 2 copies of the event
per window layer (there are 2).  This results in 2 events per layer for the
top two views in the hierarchy. So each actual pattern attempt would count as 4
attempts to the system.

The solution is to overload onTouchEvent() at each level in the view hierarchy,
which means that we ignore events that were already handled by a child window
of the parent.

This change also disables slippery windows for keyguard because it causes
vertical patterns to be ignored.

Fixes bug 7191277

Change-Id: I4df217f2bf382134d93113b8d55b0d71e0e23677
 2012-09-18 21:02:08 -07:00
Amith Yamasani
728f3193ef am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '4adb9d34162b109db3c67e352ad50c76dc7f2d45':
  DevicePolicyManager per user
 2012-09-18 20:03:20 -07:00
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Fabrice Di Meglio
69542e48c3 Fix some typos in Javadoc for Accessibility APIs 
Change-Id: Ie3ca20e1c3bb11fb59bd7dcaed9ea92be320b3eb
 2012-09-18 19:34:34 -07:00
Jason Sams
dd2f703df5 am 2d95a33d: Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev 
* commit '2d95a33dc3a463b197d4597b38f5ae124de25017':
  Fix build.  Missed current.txt in previous checkin.
 2012-09-18 19:14:00 -07:00
Jason Sams
2d95a33dc3 Merge "Fix build. Missed current.txt in previous checkin." into jb-mr1-dev 2012-09-18 19:11:18 -07:00
Jason Sams
9e6e5ae243 Fix build. Missed current.txt in previous checkin. 
Change-Id: I458944fbd9b04526068d03330620ad4805b5c993
 2012-09-18 19:10:34 -07:00
Romain Guy
deaa070113 am 4e54f930: Merge "Add test for layer updates optimizations" into jb-mr1-dev 
* commit '4e54f930d4dcd297f45507883b9404e1a5ef703b':
  Add test for layer updates optimizations
 2012-09-18 19:04:00 -07:00
Romain Guy
4e54f930d4 Merge "Add test for layer updates optimizations" into jb-mr1-dev 2012-09-18 19:01:26 -07:00
Romain Guy
189ff17caa Add test for layer updates optimizations 
Optimizations are following.

Change-Id: I120e1d0c08d8068fcac46515f37a4ae510e5f3a3
 2012-09-18 18:59:59 -07:00
Adam Powell
6837fc3442 am 2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 
* commit '2a81fe68c208768ea202cd0353ad4a8212c2b066':
  Further tune config_minScalingSpan for small screen devices.
 2012-09-18 18:54:02 -07:00
Adam Powell
2a81fe68c2 Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 2012-09-18 18:49:32 -07:00
Jason Sams
c7b20e5cd4 am 55db6865: Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev 
* commit '55db6865ef708d66fd2382d6e96a845b68030f20':
  Clean up and publish the YUV to RGB intrinsic.
 2012-09-18 18:46:46 -07:00
Adam Powell
3179154c36 am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '98c370e71d93ed2704018e2bc3455f00c08821a9':
  Make invalidateOptionsMenu asynchronous
 2012-09-18 18:45:08 -07:00
Jason Sams
55db6865ef Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev 2012-09-18 18:43:52 -07:00
Adam Powell
98c370e71d Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 2012-09-18 18:42:59 -07:00
Adam Powell
4b6d93fd04 Make invalidateOptionsMenu asynchronous 
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.

Bug 7189372

Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
 2012-09-18 18:37:28 -07:00
Dianne Hackborn
8f2ec4365f am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev 
* commit '1e5aeecb64827d2b71f429d73a05c25ffe4a5be8':
  Don't allow more than 3 actively running users at a time.
 2012-09-18 18:26:21 -07:00
Jason Sams
e69e9e6b6e Clean up and publish the YUV to RGB intrinsic. 
Change-Id: Iffb346a5d751f0bae123455869bda8db37d542ff
 2012-09-18 18:23:15 -07:00