Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,051 Commits 3 Branches 0 Tags
8d3a44bcb09a5a68d1f00a49db02b306633b2ea7
Commit Graph

98051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick@google.com
8d3a44bcb0 am 12f2f8dc: am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '12f2f8dcd79fc1952b3d606829857b0df4398fa8':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-28 09:47:28 -08:00
Irfan Sheriff
fa28d45d59 am 7f93e7d2: am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '7f93e7d265509d4ae18f99cbc9a45cca087c4b71':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-28 09:47:03 -08:00
Jean-Michel Trivi
246f4529bb Merge "Remove unused audio source" 2012-12-28 08:46:50 -08:00
Jean-Michel Trivi
58a9cad4e8 Remove unused audio source 
Bug 7110996

Change-Id: I90737c14a4e6f9fe662eb7eb5bd0483da823083b
 2012-12-27 15:31:47 -08:00
Kristian Monsen
d05e4d820d Merge "Update Geolocation.getInstance() comment." 2012-12-26 16:00:25 -08:00
Craig Mautner
273fa2708a Merge "Fixes to clean up icon launching during animations." 2012-12-26 11:56:30 -08:00
Jean-Michel Trivi
c30f45b97f Add comments in AudioService focus and media button stack traversal 
Add comments to reflect where and why the audio focus and media
 button stacks are traversed with an iterator, which traverses
 the stack from bottom to top.

Change-Id: I462a522195e742295d13eff5fc727e59a5d7e830
 2012-12-26 10:46:29 -08:00
kmccormick@google.com
12f2f8dcd7 am 87d852a8: am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '87d852a84de0d691bce127f65bc7c4ba75883e2e':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:52:28 -08:00
kmccormick@google.com
87d852a84d am ec6d0847: am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit 'ec6d08475ee1a2020556b43b4698b60dcb56a9c6':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:51:02 -08:00
kmccormick@google.com
ec6d08475e am 5b03460f: Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 
* commit '5b03460fcb69394b984fad1a63e244f9aa798886':
  cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596
 2012-12-21 12:46:03 -08:00
&& repo sync -j8
5b03460fcb Merge "cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596" into jb-mr1-dev 2012-12-21 12:43:20 -08:00
Irfan Sheriff
7f93e7d265 am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced." 
* commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f':
  NsdService: Clear client info after resolution request is serviced.
 2012-12-21 10:07:24 -08:00
Craig Mautner
2d1eb74a8e Merge "Save most recent thumbnail Bitmap for reuse." 2012-12-20 16:45:06 -08:00
Craig Mautner
b12428a128 Save most recent thumbnail Bitmap for reuse. 
This keeps Recents from taking two identical screenshots, one for
the Recents thumbnail and one for the pause activity thumbnail.

Fixes bug 7351766.

Change-Id: Ia4d12802151666ec36e4d9b395cf10e1e02dc37f
 2012-12-20 16:24:58 -08:00
&& repo sync -j8
518edbfa97 cherrypick from jb-dev-docs: Gestures Class Change-Id: I9abebf58a9607c8f52f72ef2ce46308304386596 
Change-Id: I72c2621dcc674a2f486ec2a49e0eb409d8c9b5bd
 2012-12-20 16:06:55 -08:00
The Android Open Source Project
a8e4314604 am ac0fd124: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'ac0fd124133b04f555047df8804ecc46ef3751e9':
 2012-12-20 15:50:06 -08:00
The Android Open Source Project
ac0fd12413 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea
 2012-12-20 15:46:28 -08:00
Raph Levien
0925131933 Merge "Suppress horizontal scrolling with trailing blanks" 2012-12-20 15:46:23 -08:00
Raph Levien
afe8e9b6d0 Suppress horizontal scrolling with trailing blanks 
The existing behavior of EditText is that trailing blanks can cause a
line to exceed the layout width, causing the cursor to extend past the
line, which in turn causes horizontal scrolling. This patch clamps the
cursor to the layout width in the non-scrolling case, which makes the
spaces effectively invisible when they're at the end of the line, but at
least suppresses the scrolling.

The clamping only works reliably in left-to-right alignments, so this
patch checks for than and only enables the clamping in those cases.

Fix for bug 7699295.

Change-Id: I22bc4e6c9ded3d7716edfcf10dd2b5c31a5da9de
 2012-12-20 15:42:47 -08:00
Irfan Sheriff
88fe4ebc0b Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
The Android Automerger
345f7fcfaf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-20 14:31:16 -08:00
Victoria Lease
d07d7fd016 am 5ddfa247: am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 
* commit '5ddfa24776f971d45e5fc80189abb3edd715818d':
  Possible leak in android_emoji_EmojiFactory_newInstance
 2012-12-20 13:49:46 -08:00
Victoria Lease
5ddfa24776 am fc56015b: Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 
* commit 'fc56015bd3d86e470fdf3ac8449776809124875e':
  Possible leak in android_emoji_EmojiFactory_newInstance
 2012-12-20 13:47:07 -08:00
Dirk Dougherty
9ed5fd4cb7 am b7f4bf36: am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'b7f4bf3604df8f3181931835a5dfc414c3072749':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 13:29:38 -08:00
Scott Main
b23955be38 am d1ecaf39: am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit 'd1ecaf399d60395c4af4f53edba6de348004b6d3':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 13:29:33 -08:00
Dirk Dougherty
b7f4bf3604 am f6c71644: am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'f6c71644dce2a93c386a1803a46ca7d99a9ae543':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:55:39 -08:00
Dirk Dougherty
f6c71644dc am e487e537: am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit 'e487e537b0fcc5b9f972c1e247fd1b019150fa05':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:53:16 -08:00
Dirk Dougherty
e487e537b0 am 0402b653: Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 
* commit '0402b65327aa568c7ea706879d9ddb222436aa87':
  Doc change: point developer landing page featured content to blog post.
 2012-12-20 12:49:22 -08:00
Dirk Dougherty
0402b65327 Merge "Doc change: point developer landing page featured content to blog post." into jb-mr1-dev 2012-12-20 12:46:00 -08:00
Dirk Dougherty
0f08867b93 Doc change: point developer landing page featured content to blog post. 
Change-Id: I8201d223b4b2c28227c7aac3499a81d29c3ec9e3
 2012-12-20 12:40:22 -08:00
Scott Main
d1ecaf399d am 15423b20: am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '15423b204d1dfc6ef5632f26166d445bf9cef2f5':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:17:33 -08:00
Scott Main
15423b204d am 226e973f: am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '226e973f3946778078840db46274a2c34b30a6b0':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:15:25 -08:00
Scott Main
226e973f39 am 8afb3ba4: Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 
* commit '8afb3ba4dac2f3e42884cb40f8fa407e072382e3':
  docs: SDK r21.0.1 Release Notes
 2012-12-20 12:12:03 -08:00
Scott Main
732e2de1a0 am 0aa3df58: am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '0aa3df583f81de90078258781a95fff40237c499':
  docs: NDK r8d Release Notes
 2012-12-20 12:11:02 -08:00
Victoria Lease
fc56015bd3 Merge "Possible leak in android_emoji_EmojiFactory_newInstance" 2012-12-20 12:09:48 -08:00
Scott Main
0aa3df583f am c3261bd8: am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'c3261bd8402b13c4c4ac8842ff7eaa51a9c8c33e':
  docs: NDK r8d Release Notes
 2012-12-20 12:09:13 -08:00
Scott Main
c3261bd840 am 76f7774d: am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit '76f7774db8e8cba1ad06018f42edf21b8c77131c':
  docs: NDK r8d Release Notes
 2012-12-20 12:07:58 -08:00
Scott Main
76f7774db8 am f6e55123: Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 
* commit 'f6e551239017745f88893acaf38b3bac097aceb1':
  docs: NDK r8d Release Notes
 2012-12-20 12:04:57 -08:00
Scott Main
8afb3ba4da Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-20 12:03:53 -08:00
Scott Main
f6e5512390 Merge "docs: NDK r8d Release Notes" into jb-mr1-dev 2012-12-20 12:02:29 -08:00
Andrew Hsieh
d20df4de9a am 38dd88ef: am 62ec9588: Merge "Fix typo" 
* commit '38dd88ef6cecbbe0e344b64741990735f96fbb0c':
  Fix typo
 2012-12-20 11:07:08 -08:00
Glenn Kasten
8548749404 am 2326be4f: am ba97ad2a: Merge "Leak in ToneGenerator_native_setup" 
* commit '2326be4fa9cb3b523a3ea13875e91bdc437da33d':
  Leak in ToneGenerator_native_setup
 2012-12-20 11:07:04 -08:00
Andrew Hsieh
38dd88ef6c am 62ec9588: Merge "Fix typo" 
* commit '62ec9588650327f4fc3f367097b9549635229239':
  Fix typo
 2012-12-20 11:03:46 -08:00
Glenn Kasten
2326be4fa9 am ba97ad2a: Merge "Leak in ToneGenerator_native_setup" 
* commit 'ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf':
  Leak in ToneGenerator_native_setup
 2012-12-20 11:03:33 -08:00
Stephen Hines
696a5e04ea Merge "We can only optimize bitmaps that have USAGE_SHARED." 2012-12-20 10:25:04 -08:00
Craig Mautner
72669d1801 Fixes to clean up icon launching during animations. 
Several problems were causing animations to jump to the end when
launching an app while a previous app was animating away.

- Keep the two app token lists in tighter synch. These were separated
when we hoped to completely separate layout form animation. This is
not as critical a goal any more.

- Use new test criteria for starting and stopping animations.

Bug 7885350 fixed.

Change-Id: Ib679117f627d0957cda17cc6ffca2bc2cdd6ecdd
 2012-12-20 10:15:58 -08:00
Craig Mautner
5b88cd7218 Merge "Fade recents thumbnail to transparent earlier." 2012-12-20 09:48:37 -08:00
Dirk Dougherty
fa0f9be8c5 am 0943862c: am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit '0943862cf5025c74f5343ded76c8d6aaa0abeaa1':
  Doc change: update develop landing page.
 2012-12-20 09:42:45 -08:00
Dirk Dougherty
0943862cf5 am edafbe79: am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit 'edafbe798e7daf18a109fa234b11fe2351c8fe27':
  Doc change: update develop landing page.
 2012-12-20 09:41:02 -08:00
Dirk Dougherty
edafbe798e am a232fa3f: am 0f0d9b32: Merge "Doc change: update develop landing page." into jb-mr1-dev 
* commit 'a232fa3f831a9ae104c492d321be580ea0c7770e':
  Doc change: update develop landing page.
 2012-12-20 09:38:56 -08:00