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

121897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
bd503a4e3a Allow for the possibility of null ActivityContainer 
When BinderProxy is passed in as the IBinder for
getEnclosingActivityContainer the activity manager cannot turn it into
an ActivityRecord. This causes NPE in ActivityThread which is Not Good
(tm).

Allowing null to be returned when requesting an ActivityContainer and
handling it appropriately fixes this bug.

Fixes bug 12473669.

Change-Id: I6937636042f8853b3ddc2df40be010e7391e41a5
 2014-01-10 10:16:43 -08:00
Adam Powell
efc3bb0612 Fix a bug where OnTouchListeners in action views could be removed 
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
 2014-01-10 10:16:27 -08:00
Zhihai Xu
c9eff80eca Merge "Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" 2014-01-10 17:44:22 +00:00
Craig Mautner
88a00abe08 am 0bb2a4de: Merge "Call moveHomeStack before moving any stack." into klp-modular-dev 
* commit '0bb2a4deee6451a2f3075254761e9bfb38429fa4':
  Call moveHomeStack before moving any stack.
 2014-01-10 16:46:43 +00:00
Craig Mautner
0bb2a4deee Merge "Call moveHomeStack before moving any stack." into klp-modular-dev 2014-01-10 16:43:19 +00:00
Craig Mautner
fefeef8249 Call moveHomeStack before moving any stack. 
Order matters, otherwise mFocusedStack and mLastStack aren't updated
correctly.

Fixes bug 12478856.

Change-Id: I12e4334678bb3af49d1ff26c4003def3e8d987c2
 2014-01-10 08:40:23 -08:00
Amith Yamasani
a3040e8d5d am 22eba28e: Only compile the services jar and so when using mmm 
* commit '22eba28e90e58230cc120bd53faaf223651f9344':
  Only compile the services jar and so when using mmm
 2014-01-10 00:23:21 +00:00
Amith Yamasani
b38e2088ca am cd6d1f51: Merge "Include subdirectory Android.mks." into klp-modular-dev 
* commit 'cd6d1f51e20da71d75e8dbf23ba18b371fb3a8ab':
  Include subdirectory Android.mks.
 2014-01-10 00:07:21 +00:00
Christopher Tate
1f5ca7fed2 am 7b3cfebc: am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal" 
* commit '7b3cfebce3ab51e96d6c89317ea48b8bce640d9d':
  Cursor leakage due to cancellation signal
 2014-01-10 00:07:09 +00:00
Amith Yamasani
22eba28e90 Only compile the services jar and so when using mmm 
Don't build the tests when using "mmm frameworks/base/services"

Change-Id: If1895598381bd0fce0b4d7f5e879f154d8fc44d0
 2014-01-09 15:38:12 -08:00
Alan Viverette
8f164f64ec Fixing Drawable methods for find by layer ID and invalidation callback 
BUG: 12475487, 12475575
Change-Id: Icbf11c76eaf9357fe2076bf60f7e448db65bc835
 2014-01-09 15:15:01 -08:00
Amith Yamasani
cd6d1f51e2 Merge "Include subdirectory Android.mks." into klp-modular-dev 2014-01-09 21:45:10 +00:00
Christopher Tate
7b3cfebce3 am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal" 
* commit 'f1fbe1135a2872a7287f5c06af211cf780f16598':
  Cursor leakage due to cancellation signal
 2014-01-09 20:53:45 +00:00
Christopher Tate
f1fbe1135a am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal" 
* commit '4ba1bbadb784e365f443b0272b111d384f4f2229':
  Cursor leakage due to cancellation signal
 2014-01-09 20:50:22 +00:00
Christopher Tate
4ba1bbadb7 am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal" 
* commit '5fbcb1347494e17dc9e9cd66d8e47a3972a8b90d':
  Cursor leakage due to cancellation signal
 2014-01-09 12:47:50 -08:00
Christopher Tate
5fbcb13474 am 35b7de4c: Merge "Cursor leakage due to cancellation signal" 
* commit '35b7de4c4562db8af697ad3384c09d2258d183ba':
  Cursor leakage due to cancellation signal
 2014-01-09 12:43:39 -08:00
Ying Wang
ba09ada20e Include subdirectory Android.mks. 
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
(cherry picked from commit c459bfea7e7be4343387dee137d4a5be9742fd91)
 2014-01-09 20:41:57 +00:00
Christopher Tate
35b7de4c45 Merge "Cursor leakage due to cancellation signal" 2014-01-09 20:41:26 +00:00
Ying Wang
ddf89c0cc8 Merge "Include subdirectory Android.mks." 2014-01-09 20:21:14 +00:00
Glenn Kasten
7dd77a875c Merge "Improve error reporting in AudioTrack JNI" 2014-01-09 20:08:25 +00:00
Leon Scroggins III
b311b3424b Merge "Merge AssetStream with AssetStreamAdaptor." 2014-01-09 19:58:33 +00:00
Vinod Krishnan
c6a0a57489 am aef49f9a: Fwk: Adding a micro theme 
* commit 'aef49f9a7142892f38c3bb84b5eae3ceb9a96a15':
  Fwk: Adding a micro theme
 2014-01-09 19:25:26 +00:00
Vinod Krishnan
aef49f9a71 Fwk: Adding a micro theme 
Adding a micro theme affects 3 different GIT repositories:

1. Repository 'device/google/clockwork' - https://ar/398971
This has the overlay for the DeviceDefault for ClockWork

2. Repository 'platform/vendor/google_clockwork' - https://ar/399378
This has the changes to Clockwork Home to use the new micro Theme.

3. Repository 'frameworks/base' - https://ar/398959
This adds the *_micro.xml style/theme files.

Change-Id: Ib1e87953b052a9ec2ff0ea11dd0dfe55317442b4
 2014-01-09 11:11:56 -08:00
Ying Wang
c459bfea7e Include subdirectory Android.mks. 
Change-Id: I6e6bc721dbcf127b52f2a60f255c9fc677d3be29
 2014-01-09 11:02:03 -08:00
Glenn Kasten
659a9712f2 Improve error reporting in AudioTrack JNI 
for android_media_AudioTrack_get_min_buff_size when it
calls AudioTrack::getMinFrameCount.  That AudioTrack API
has been changed recently to guarantee that it will always
return a valid frameCount if the return value == NO_ERROR.

Change-Id: I8f7f850f1c30229ce77a02bdc963634cdbaf3aac
 2014-01-09 09:55:54 -08:00
Michael Jurka
8a1b1e6fcd Merge "Fix build" 2014-01-09 12:58:01 +00:00
Martin Kosiba
6c7be83b22 Merge "Fix the build." 2014-01-09 12:36:13 +00:00
Martin Kosiba
4580d9cf1d Fix the build. 
Change I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967 broke the build
with a typo.

Change-Id: If8876078c0e1a20ca1034cc5926080e02fead205
 2014-01-09 12:33:22 +00:00
Narayan Kamath
61d94e0d99 Merge "Add new Java 7 concurrent APIs." 2014-01-09 12:25:23 +00:00
riddle_hsu
446ef1de8d Fix visibility of multiple non-fullscreen activities. 
Issue detail:
Assume X, Y are non-fullscreen activities.
 a.Home starts an activity X in task A in application stack.
 b.X starts an activity Y in <task A> or <new task B>
 c.Activity X will be invisible.

How to fix:
Because the function "isActivityOverHome" means an activity is able to see home.
But there may have many non-fullscreen activities between the top non-fullscreen activity and home.
If flag "behindFullscreen" is set, those middle activities will be invisible.
So it should only take care from who is adjacent to home.
Then check two flags frontOfTask(task root) and mOnTopOfHome for constraining the condition.

Change-Id: I60bcea304976414e44835a0a38675aae365e9e19
 2014-01-09 20:24:34 +08:00
Michael Jurka
1c228aa47f Fix build 2014-01-09 13:15:37 +01:00
Baligh Uddin
20d9741be2 Merge "Import translations. DO NOT MERGE" 2014-01-09 03:46:45 +00:00
Baligh Uddin
c1062affd2 Merge "Import translations. DO NOT MERGE" 2014-01-09 03:46:39 +00:00
Baligh Uddin
1adf652d45 Merge "Import translations. DO NOT MERGE" 2014-01-09 03:46:35 +00:00
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
 2014-01-09 02:14:56 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Alan Viverette
c619b6e58b Merge "Add DisplayList bit for projecting onto a contained volume" 2014-01-09 01:35:03 +00:00
Alan Viverette
58f09b3524 Add DisplayList bit for projecting onto a contained volume 
Does not handle reordering/translating the projected DisplayList.

Change-Id: I6f1ebb2b20b7436c86fe849b35d582fd9c8a8967
 2014-01-08 17:18:19 -08:00
Adam Powell
4be3573c7e Update internal action bar layouts for API change 
Change-Id: Icce370388ddd78f1b2e4115c94072c9420896f0b
 2014-01-08 17:05:57 -08:00
Michael Wright
1f634d2627 Merge "Fix Rhodi KL file axes" 2014-01-09 00:43:44 +00:00
Fabrice Di Meglio
5aaae37506 Code cleaning for PreferenceActivity 
- remove non used argument

Change-Id: If57b8230aefffdd77fbba240042093ddb6975b9d
 2014-01-08 15:50:34 -08:00
Adrian Roos
73415b0c75 Merge "Don't show incorrect pattern in stealth mode." 2014-01-08 23:49:11 +00:00
Vinit Deshpande
80a3a364fd Merge "Revert "Revert "Move Wifi services to a new git project""" 2014-01-08 23:47:44 +00:00
Michael Wright
fbefb93f26 Fix Rhodi KL file axes 
Change-Id: Ifb779c7730ed4b69325bf57aa7629c663ee4cb5c
 2014-01-08 15:40:14 -08:00
Adrian Roos
e2d71e4520 Don't show incorrect pattern in stealth mode. 
Prevent the pattern keyguard from displaying an incorrect pattern when it is configured not to display patterns.

Bug: 11112503
Change-Id: I6defdcbea102e4f3e09193d61071cecc59ea3080
 2014-01-08 15:38:23 -08:00
David Christie
8e27a8f695 Merge "Document that Handler.postDelayed uses uptimeMillis() based counting. -Make it clear that delay may be longer than requested. -Potentially help developers avoid power bugs (e.g. releasing after delay). Bug: 12015795" 2014-01-08 22:58:08 +00:00
Adam Powell
9e2694b521 Merge "Move ActionMenuView into android.widget and make it public" 2014-01-08 22:44:22 +00:00
Tim Murray
45bd9a03ef Merge "Fix most logging macros for context pointers." 2014-01-08 22:41:29 +00:00
Tim Murray
cbf779e65c Merge "Fix getBytesSize for YUV allocations." 2014-01-08 22:41:21 +00:00
Marco Nelissen
3de2377d7a Merge "sqlite integer fields are long" 2014-01-08 22:22:27 +00:00