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

74410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
43de94a943 Merge "Revert "Faster and simpler replace in SSB"" 2012-04-06 14:46:24 -07:00
Gilles Debunne
bc6862300f Revert "Faster and simpler replace in SSB" 
Bug 6300658

This change reveals a weird race condition where sometimes the
text is entered twice. Adding a debugger slows down everything,
and the problem is no longer reproducable. Reverting for now.

This reverts commit ebd9a23817052c4d2aaa1058efa2b80b08003d4a.
 2012-04-06 14:37:46 -07:00
Christopher Tate
bf64e70f9b Merge "Attribute alarm broadcast wakelocks to the sender" 2012-04-06 14:35:16 -07:00
Jean-Baptiste Queru
a987d2bde7 Merge "Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex" 2012-04-06 14:25:20 -07:00
Christopher Tate
c4a07d1caa Attribute alarm broadcast wakelocks to the sender 
Wakelock usage for the purpose of sending an alarm broadcast is now
attributed to the application which posted the alarm, not to the OS.

Bug 5911317

Change-Id: I8cb79c3bd5db467388716ab68285f4ab0bfe468b
 2012-04-06 14:23:12 -07:00
Amith Yamasani
36dec4efa8 Merge "Fixes a bug in migration of lock settings to LockSettingsService." 2012-04-06 14:14:45 -07:00
Craig Mautner
1ade5ae9c8 Merge "Animate from local list of WindowStateAnimators." 2012-04-06 14:12:46 -07:00
Wei Zhong
789a01aa05 Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex 
"Copyright (c) 2008-2009, Motorola, Inc"

Bug: 6299628

Change-Id: Ia64d7341a8466ee9213ecabe6315c64b8643574e
Signed-off-by: Wei Zhong <wzhong@google.com>
(cherry picked from commit 559841702b8a8760e057af29d14d1a31ce75ff18)
 2012-04-06 14:04:31 -07:00
Craig Mautner
bec53f7066 Animate from local list of WindowStateAnimators. 
Stop animate() from using the mWindows maintained by
WindowManagerService. Animating WindowStateAnimators are now drawn from
a HashSet maintained by WindowAnimator and containing just those
WindowStateAnimators that have Surfaces.

When starting a move animation do not place parameters directly into
the WindowStateAnimator, instead pass them through the Handler.

Also removed synchronization points from mWindows/mAppTokens
add/remove.
 2012-04-06 14:03:25 -07:00
Jeff Sharkey
a5372055d3 Merge "INetworkStatsSession with lifecycle for caching." 2012-04-06 13:40:41 -07:00
Dianne Hackborn
e824120016 Hide the optional permission stuff, not making it in to JB. 
Also lock down the rest of the development tools permissions to
be development permissions that must be granted through an
explicit shell command.

Change-Id: I1ba216fffe1aab4bb9f83fcef108efc504f892f4
 2012-04-06 13:39:09 -07:00
Jeff Sharkey
b52e3e5509 INetworkStatsSession with lifecycle for caching. 
Users outside system_server now explicitly communicate their
lifecycle, which keeps a strong-reference chain to any fully loaded
NetworkStatsCollection histories.

Bug: 6236498
Change-Id: I8e22739b6e89a626b676967a736d7117fd000778
 2012-04-06 13:38:29 -07:00
Andreas Huber
a3bd242954 Merge "New JAVA API to support submitting encrypted buffers of input data." 2012-04-06 13:34:42 -07:00
Dianne Hackborn
85d9e02094 Merge "Fix dumb bug." 2012-04-06 13:22:35 -07:00
Eric Fischer
442d572dda Import translations. DO NOT MERGE 
Change-Id: I5899fbec882970afd4840aded5ef0eab32b40e54
 2012-04-06 13:04:40 -07:00
Dianne Hackborn
5e4705a827 Fix dumb bug. 
Change-Id: I5e0dfc0f03677888c22d938013299a8ec4597c69
 2012-04-06 12:55:53 -07:00
Chris Craik
3d4d2159bc Merge "fix functor flag parsing, tweak process delay" 2012-04-06 12:51:36 -07:00
Andreas Huber
9e6bcce17d New JAVA API to support submitting encrypted buffers of input data. 
Change-Id: Ib0df9a9427b4580946179860495b26f743558597
related-to-bug: 6275919
 2012-04-06 12:14:47 -07:00
Mike Lockwood
5713c9cfa9 Merge "Add Intents to notify when USB audio devices or accessories are attached" 2012-04-06 11:29:25 -07:00
Dianne Hackborn
29d6fa9d8b Merge "Implement call log permission compatibility." 2012-04-06 11:11:32 -07:00
Mike Lockwood
9d5a4be05b Add Intents to notify when USB audio devices or accessories are attached 
In this change, only the USB audio accessory support is implemented.

Change-Id: Id9b411319b07a96dc56649ca74cc5f3f89a55a7c
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-04-06 11:00:27 -07:00
Scott Main
dc0dbbd4a0 am 34599640: am e6c56712: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus 
* commit '345996400b664b34541c68535ca2f31424dcbc56':
 2012-04-06 10:31:48 -07:00
Alexander Lucas
1c6b2a9030 am 00d44e5f: am 3d7c8404: am ad606697: Removed HTML artifact from index page 
* commit '00d44e5fa2d067b342659b25ec203e089fc137fb':
 2012-04-06 10:31:46 -07:00
Scott Main
4c534684e4 am 4317bfed: am 6ff75ab5: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently 
* commit '4317bfedea82a3ebcb55c64168e781b2da92d71f':
 2012-04-06 10:31:45 -07:00
Trevor Johns
d95ade89ca am cbbdd734: am ac5ae52d: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 
* commit 'cbbdd7340cd530679a085db512f7bcc8b4761b7b':
 2012-04-06 10:31:43 -07:00
Stephen Hines
90d82ea008 Merge "Build /system/bin/asan/app_process." 2012-04-06 10:30:49 -07:00
Scott Main
345996400b am e6c56712: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus 
* commit 'e6c567122b76ae4282aba706092af88be43e30af':
 2012-04-06 10:15:00 -07:00
Alexander Lucas
00d44e5fa2 am 3d7c8404: am ad606697: Removed HTML artifact from index page 
* commit '3d7c8404da5ffa5a5e9cca2f7c16507df463e6f0':
 2012-04-06 10:14:51 -07:00
Scott Main
4317bfedea am 6ff75ab5: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently 
* commit '6ff75ab5d7d0426bc3bbb73884b21a42af88d2df':
 2012-04-06 10:14:45 -07:00
Trevor Johns
cbbdd7340c am ac5ae52d: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 
* commit 'ac5ae52d13ef6c603ca8971579e8a981c6749e94':
 2012-04-06 10:14:41 -07:00
Scott Main
e7aff29984 am 74405274: am cde2feb2: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus 
* commit '74405274a58dcb98b782b58e8a7d0129a3ea1f22':
 2012-04-06 09:54:01 -07:00
Alexander Lucas
a37fd07910 am fccf7f55: am 5801ead9: am ad606697: Removed HTML artifact from index page 
* commit 'fccf7f55e514ae07522794982dc39f356a0c1274':
 2012-04-06 09:53:59 -07:00
Scott Main
62bbadc96b am d579953f: am 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently 
* commit 'd579953f6530ab4dec87ccd60a31d99ab2006fc5':
 2012-04-06 09:53:58 -07:00
Trevor Johns
e08284dcfc am fbff4f6b: am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 
* commit 'fbff4f6b0ebf556ac825e34a587ba0f416b3db14':
 2012-04-06 09:53:56 -07:00
yoonsung.nam
d00576709d am 6be4fe37: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '6be4fe371a6c24916789c66bf39d73cada779079':
 2012-04-06 09:53:54 -07:00
Fred Chung
8ee26e595d am 7b5f48f4: am 624e02d6: am f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1 
* commit '7b5f48f48aad69cb94af30cebdf062f7710a9125':
 2012-04-06 09:53:52 -07:00
Scott Main
74405274a5 am cde2feb2: am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus 
* commit 'cde2feb2c3628b90cada1e6e552c40aabbad2baa':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus
 2012-04-06 09:49:50 -07:00
Alexander Lucas
fccf7f55e5 am 5801ead9: am ad606697: Removed HTML artifact from index page 
* commit '5801ead919d18f72a0538592c6c7d961e5767019':
  Removed HTML artifact from index page
 2012-04-06 09:49:48 -07:00
Scott Main
d579953f65 am 5756da24: am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently 
* commit '5756da24ad478383630e9aedc2b7b696bf844571':
  docs: Android U: Displaying Bitmaps Efficiently
 2012-04-06 09:49:46 -07:00
Trevor Johns
fbff4f6b0e am ae6323dd: am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 
* commit 'ae6323dd1ea0e06f987b8fc097378ee3bb060f47':
  Docs: Fixing typo in "Testing from Other IDEs" article
 2012-04-06 09:49:43 -07:00
yoonsung.nam
6be4fe371a Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-04-06 09:49:43 -07:00
Scott Main
cde2feb2c3 am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and Menus 
* commit '2b0267dc3671282a1498a92da7b38fd2ef5c018f':
  docs: Deprecate the old UI guidelines about Activity/Task and Menus
 2012-04-06 09:43:14 -07:00
Alexander Lucas
5801ead919 am ad606697: Removed HTML artifact from index page 
* commit 'ad6066970ae8f5979942178bcbbe90f72a348440':
  Removed HTML artifact from index page
 2012-04-06 09:43:06 -07:00
Scott Main
5756da24ad am 153f8fe4: docs: Android U: Displaying Bitmaps Efficiently 
* commit '153f8fe420506a7e1b7a8f6b4d07db798867746e':
  docs: Android U: Displaying Bitmaps Efficiently
 2012-04-06 09:42:57 -07:00
Trevor Johns
ae6323dd1e am e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1 
* commit 'e07b58506579085b62fde0771b74111b24aa27a0':
  Docs: Fixing typo in "Testing from Other IDEs" article
 2012-04-06 09:42:55 -07:00
Amith Yamasani
7ab8c4abca Fixes a bug in migration of lock settings to LockSettingsService. 
Due to the code to handle backward compatibility, the migration
ended up being recursive.

Change-Id: I1c2cf4a81fbdee6a4b74cafb624625716c88cad3
 2012-04-06 09:27:12 -07:00
Jamie Gennis
335a6625b6 Merge changes Iac9cc917,I8eed4b0d 
* changes:
  TextureView: add setSurfaceTexture method
  SurfaceTexture: add GL context attach & detach
 2012-04-06 09:06:28 -07:00
Daniel Sandler
aca9ef4ded Merge "Fix boot on sw600dp devices." 2012-04-06 08:46:52 -07:00
Craig Mautner
7a3bc87468 Merge "Fix so that windows again animate when moving." 2012-04-06 08:00:47 -07:00
Daniel Sandler
de6b5152bb Fix alignment of notification action buttons. 
Change-Id: Ibfb8f54b6aa59f1c7a56a5e3e8b0c762e48dd496
 2012-04-06 10:23:07 -04:00