Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,054 Commits 3 Branches 0 Tags
ea59a8367eb005bd8d17cd70835bcd7bc5f176b6
Commit Graph

85054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
ea59a8367e am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-20 06:19:30 -07:00
Glenn Kasten
a917eb5cc3 am 549be8be: Merge "New API for querying audio properties" into jb-mr1-dev 
* commit '549be8beadf5ad2a56b7f4269d419753c0d61be8':
  New API for querying audio properties
 2012-09-20 06:19:24 -07:00
Baligh Uddin
08e354cc7c am 7b6ec1f6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7b6ec1f6fd4f2858063d2d441b6118ac22da5569':
  Import translations. DO NOT MERGE
 2012-09-20 06:18:56 -07:00
Baligh Uddin
05cf18e13b Import translations. DO NOT MERGE 
Change-Id: I23706cb8f364984ad92ab1ce927b108539c141c6
Auto-generated-cl: translation import
 2012-09-19 16:23:03 -07:00
Baligh Uddin
17a54db05d Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-19 12:39:50 -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
Glenn Kasten
549be8bead Merge "New API for querying audio properties" into jb-mr1-dev 2012-09-19 11:13:58 -07:00
Baligh Uddin
4d8fbcb228 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-19 09:28:07 -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
7047ea7568 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:51:22 -07:00
Irfan Sheriff
48a9892dbd am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '5d4206a55c5336a163408422ba3302f5fd8463f7':
  Get strings in
 2012-09-19 05:50:40 -07:00
Jim Miller
b6adf0121a 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-19 05:50:33 -07:00
Amith Yamasani
b8e362ae27 am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '4adb9d34162b109db3c67e352ad50c76dc7f2d45':
  DevicePolicyManager per user
 2012-09-19 05:50:07 -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
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
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
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Jason Sams
2534714375 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:13:35 -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
4843d1934b 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:03:36 -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
7501fbd36e 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:52:40 -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
978c923f5a 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:48:53 -07:00
Adam Powell
171fa7f2c5 am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '98c370e71d93ed2704018e2bc3455f00c08821a9':
  Make invalidateOptionsMenu asynchronous
 2012-09-18 18:47:17 -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
ff88bee1c0 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:30:08 -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
Dianne Hackborn
1e5aeecb64 Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev 2012-09-18 18:22:15 -07:00
Dianne Hackborn
bb1aeff320 Don't allow more than 3 actively running users at a time. 
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
 2012-09-18 18:20:43 -07:00
Andy Stadler
2e16d61257 am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 
* commit '6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
  Move X509TrustManagerExtensions to correct directory
 2012-09-18 17:54:36 -07:00
Andy Stadler
6d4e887da4 Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 2012-09-18 17:51:09 -07:00
Andy Stadler
8071124375 Move X509TrustManagerExtensions to correct directory 
Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
 2012-09-18 17:40:14 -07:00
Mike Lockwood
4074f0817e am 954a5d61: Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 
* commit '954a5d61a2b66a64a841669f75e1cbd9103029b5':
  AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
 2012-09-18 17:15:35 -07:00
Mike Lockwood
954a5d61a2 Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev 2012-09-18 17:12:37 -07:00
Romain Guy
51f225bbe3 am 24755d2b: Merge "mutate() didn\'t work as advertised Bug #7162705" into jb-mr1-dev 
* commit '24755d2b4248c2aa678e08a4703e8e97fd2e7dd1':
  mutate() didn't work as advertised Bug #7162705
 2012-09-18 17:06:03 -07:00
Jim Miller
0c6c57e390 am 402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 
* commit '402f0c81230304379d7c4108745f928b34e052fa':
  Refactor Carrier text as a movable module.
 2012-09-18 17:04:13 -07:00
Romain Guy
24755d2b42 Merge "mutate() didn't work as advertised Bug #7162705" into jb-mr1-dev 2012-09-18 17:03:04 -07:00
Jim Miller
402f0c8123 Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 2012-09-18 17:00:38 -07:00
Romain Guy
684385ddde mutate() didn't work as advertised 
Bug #7162705

Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
 2012-09-18 16:56:11 -07:00
Romain Guy
4247ec1d56 am ceb5a981: Merge "Minimize state changes when updating layers" into jb-mr1-dev 
* commit 'ceb5a981296e57a5fb1be60f7b030c4d6c7e0acb':
  Minimize state changes when updating layers
 2012-09-18 15:54:59 -07:00
Fabrice Di Meglio
eef4e625d3 am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 
* commit '9ffc6047f14883f853b643a2913bd590995b9031':
  Fix bug #7173155 API REVIEW: android.view.View
 2012-09-18 15:54:55 -07:00
Jeff Sharkey
3fe5bf6d69 Make getMediaStorageDirectory() user-aware. 
Bug: 7173591
Change-Id: I4513afbd8c3d6a31cd66d8a149be4071d5a4d24c
 2012-09-18 15:54:52 -07:00
Romain Guy
8055bd0920 am 29d0aa73: Merge "Compute GradientDrawable\'s opacity correctly" into jb-mr1-dev 
* commit '29d0aa73a099fde05c506857b5d215cde87b78d6':
  Compute GradientDrawable's opacity correctly
 2012-09-18 15:54:51 -07:00