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

118458 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
ad25fa36cb Add display synchronously. 
Adding the virtual display to window manager through a handler message
causes timing issues. Add the display directly to fix it.

Change-Id: I3ad6b16ce6dff2a48abd120a8e873e11a028e2c3
 2014-01-12 21:26:09 -08:00
Craig Mautner
4504de5d5a Implement ActivityView. 
With an existing ActivityContainer a caller can now create an
ActivityView which consists of a new VirtualDisplay immediately
attached to the ActivityContainer.

Change-Id: Id70333dcbef55d524a87df8f8c92d72ca5579364
 2014-01-10 10:54:55 -08:00
Adam Powell
9c9975ac3d Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-modular-dev 2014-01-10 18:30:23 +00:00
Craig Mautner
96ada57b2c Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev 2014-01-10 18:21:50 +00:00
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
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
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
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
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
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
Wink Saville
f05ae3fe0f am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit 'bc0207fdbd6cd8b3f250704b07edef07ab376bcb':
  telephony: Add same named operator configuration for some operators
 2014-01-08 19:37:30 +00:00
Wink Saville
bc0207fdbd am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit '2626d0e18dc9898d70f75540fabc67421f33fab3':
  telephony: Add same named operator configuration for some operators
 2014-01-08 19:34:12 +00:00
Wink Saville
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
 2014-01-08 11:31:02 -08:00
Wink Saville
ad06883730 am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators" 
* commit '76d5cdd820b5d81af8de73180c272d7f8a01caae':
  telephony: Add same named operator configuration for some operators
 2014-01-08 11:28:58 -08:00
Wink Saville
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
Craig Mautner
88bfc6ddc8 Merge "Extend stack management to other displays." into klp-modular-dev 2014-01-08 17:33:42 +00:00
Mike Lockwood
43bc1c07d2 am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit 'd9e708e365d94e83ec135f1486129febd3f8eaea':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:08:17 +00:00
Mike Lockwood
d9e708e365 am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '12ec2e6d71bc69ca11946f7f051931863c934273':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:05:29 +00:00
Mike Lockwood
12ec2e6d71 am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '992065938a95e5273b22dea009b8581bcc693e61':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:01:42 -08:00
Mike Lockwood
992065938a am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '9607d78f5144792993bd254a4b5983b2a9d5bf83':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 07:59:06 -08:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Narayan Kamath
e853de1f10 am 2d87407e: am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '2d87407e5765228a3469b9681ebff6c0c7eee140':
  Fix a bug introduced in change 73712
 2014-01-08 13:06:55 +00:00
Narayan Kamath
2d87407e57 am 136c0219: am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '136c02191790aa937c490341df49e966735f6857':
  Fix a bug introduced in change 73712
 2014-01-08 13:04:15 +00:00
Narayan Kamath
136c021917 am c156021d: am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit 'c156021debb8e13324e451cb288da7edd7e112ca':
  Fix a bug introduced in change 73712
 2014-01-08 05:00:33 -08:00
Narayan Kamath
c156021deb am 8a927cfa: Merge "Fix a bug introduced in change 73712" 
* commit '8a927cfa4ea8e4a78f6a9fa1e2b1da9187a3d1e8':
  Fix a bug introduced in change 73712
 2014-01-08 04:49:24 -08:00
Narayan Kamath
8a927cfa4e Merge "Fix a bug introduced in change 73712" 2014-01-08 12:47:31 +00:00
Narayan Kamath
db47efd3f8 am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '651807fcd0b1012ea848efe5f67b4381d8ce6797':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:33:16 +00:00
Narayan Kamath
55a12adc19 am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '72a8fe6d03a7c9e88e8fdd7181ca6896a2d475eb':
  AArch64: Use long for pointers
 2014-01-08 12:33:11 +00:00
Narayan Kamath
29eadb328a am 9a743575: am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '9a743575254d7d5d456456517171f0ee31bc9247':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:33:06 +00:00
Narayan Kamath
87d6cd4537 Fix a bug introduced in change 73712 
"return (bool) true" was incorrectly changed to
"return (jboolean) JNI_FALSE"

Change-Id: I45f62f60c5affbae7970bb8889c55981e26d01ba
 2014-01-08 12:26:28 +00:00
Narayan Kamath
3f7b8d0c6c resolved conflicts for merge of 92ae0347 to klp-modular-dev 
Change-Id: I703aea4f20985a4bbda0f685254721d6480bb20f
 2014-01-08 12:19:40 +00:00
Narayan Kamath
651807fcd0 am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '3f589e5d1e09e17a2aaa0a52fc15e16520d1bd5a':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 12:05:13 +00:00
Narayan Kamath
3f589e5d1e am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit '2842bd021c11274720d6a10219538b536b7d2050':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 04:02:05 -08:00
Narayan Kamath
72a8fe6d03 am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '74661ff119b274e58d1b2f15cff97cfa6a1e64fa':
  AArch64: Use long for pointers
 2014-01-08 12:01:13 +00:00
Narayan Kamath
9a74357525 am 71cdc73d: am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '71cdc73d2808944fca0a9e200696253d1f4a5bf4':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 12:01:09 +00:00
Narayan Kamath
92ae034756 am cbf339f6: am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'cbf339f6e4bf45a7d41cd0327d2dd7975875b8aa':
  AArch64: Use long for pointers in services
 2014-01-08 12:01:04 +00:00
Narayan Kamath
2842bd021c am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup" 
* commit 'de8c3cf13b0fc0655cf49934658e652b441ee019':
  AArch64: Use long for pointers in App/Backup
 2014-01-08 03:59:46 -08:00
Narayan Kamath
74661ff119 am b5558817: am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit 'b5558817c78e3140fa3f9cbbe167cacf6481f47f':
  AArch64: Use long for pointers
 2014-01-08 03:58:22 -08:00
Narayan Kamath
71cdc73d28 am 53acc7ae: am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit '53acc7ae00ba921e8c7afb9415dbf473785a3be6':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:58:17 -08:00
Narayan Kamath
cbf339f6e4 am ab169215: am f210044f: Merge "AArch64: Use long for pointers in services" 
* commit 'ab169215fb135f590f0960ab89f5199dd7303a33':
  AArch64: Use long for pointers in services
 2014-01-08 03:58:13 -08:00
Narayan Kamath
b5558817c7 am 002ae75b: Merge "AArch64: Use long for pointers" 
* commit '002ae75b829730047240ab20a044a00570eb71d2':
  AArch64: Use long for pointers
 2014-01-08 03:56:00 -08:00
Narayan Kamath
53acc7ae00 am f5598210: Merge "AArch64: Use long for pointers in hardware classes" 
* commit 'f5598210f067acf340487ba2fe55b00e43be1d9d':
  AArch64: Use long for pointers in hardware classes
 2014-01-08 03:55:56 -08:00