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

129141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Lane
5a577903d3 Fix incorrect "listener no longer active" errors 
Was incorrectly using .indexOfValue to search for Integer objects in the
client map.

Change-Id: I54e2e1725e0fff0a7d35a22376714cc8266a9eee
 2014-04-25 18:57:23 -07:00
Wink Saville
ae166fe9e0 am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:28:56 +00:00
Jim Miller
66fbe3dc81 Merge "Add new DevicePolicyManager disable flags for keyguard." 2014-04-26 00:28:44 +00:00
Wink Saville
c79963c3cb am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:25:44 +00:00
Wink Saville
1c1827a640 am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit '3f4867f49d6c1932117e3519ce10d11f37829f19':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:20:02 +00:00
George Mount
1b2fb2ca13 Fade Transition sometimes disappeared improperly. 
Bug 14320504

Change-Id: I43c2ddd34a5bd3a366027cd3c09d088baa4fb6f4
 2014-04-25 17:07:58 -07:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
Vince Harron
731bc6bd31 am 165b965e: am 4f50911a: am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Rem 
* commit '165b965edb42460ef9b0add89a76a311c707a1e2':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:28:10 +00:00
Vince Harron
165b965edb am 4f50911a: am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that 
* commit '4f50911aa18f9d4650c6721456dd05ac499fcefd':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:25:11 +00:00
Vince Harron
4f50911aa1 am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don\'t allocat 
* commit 'e9a4e9deaad6a3185269bf5696c2a2946962fbd2':
  Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
 2014-04-25 23:22:07 +00:00
Vince Harron
e9a4e9deaa Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev 2014-04-25 23:17:37 +00:00
Amith Yamasani
0150b48c4c Merge "Handle density request in LauncherActivityInfo" 2014-04-25 23:04:27 +00:00
Chris Craik
7979388d4f Support Oval GradientDrawable outlines, and ShapeDrawable 
Change-Id: Ifc9e55757d3325cb28a1a812ec696512d4a18b39
 2014-04-25 15:59:47 -07:00
Ricardo Cervera
af6f910de7 am 9d7c58cf: am 6fe328c6: am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '9d7c58cf8b609e5eda1c7d4df252a723b2dd5c23':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:59:36 +00:00
Amith Yamasani
30acde7e90 Handle density request in LauncherActivityInfo 
Change-Id: I4e8dc8ef1454b3881bdb80ae118e2d0d306642f3
 2014-04-25 15:56:26 -07:00
Mark Salyzyn
95df2024ed am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'a19b9c413b3e7f3b6038b06c51d01bab1e0bfda9':
  EventLog: event log translation errors
 2014-04-25 22:52:09 +00:00
Ricardo Cervera
9d7c58cf8b am 6fe328c6: am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '6fe328c62abd3b98aceeeb99aaf5d824bd42adc6':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:37:45 +00:00
Ricardo Cervera
6fe328c62a am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '86afa0b56bf8af0a2c94fcabf5eb7f64f6c66c2d':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:33:25 +00:00
Ricardo Cervera
86afa0b56b am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit '039bd50825f7ea8b706c8ea6e54a1c893759309d':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 22:21:10 +00:00
Ricardo Cervera
039bd50825 Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 2014-04-25 22:15:28 +00:00
Craig Mautner
e361268e6e am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit 'cb48b96223071dc9d8633aab8f6cd9a91b3676bf':
  Throw exception from startActivity if not allowed.
 2014-04-25 22:10:12 +00:00
Kenny Root
a466b101be Merge "PackageManager: add versioning to packages.xml file" 2014-04-25 22:09:25 +00:00
Mark Salyzyn
a19b9c413b am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'dfdeabf9ba40ea7f082acf7eba6fe086d2e643fb':
  EventLog: event log translation errors
 2014-04-25 22:07:07 +00:00
Mark Salyzyn
dfdeabf9ba am ac732708: Merge "EventLog: event log translation errors" 
* commit 'ac7327082c411617f7937b87575c117bd63ad9df':
  EventLog: event log translation errors
 2014-04-25 22:03:20 +00:00
Mark Salyzyn
ac7327082c Merge "EventLog: event log translation errors" 2014-04-25 21:59:19 +00:00
Adam Powell
07064fa730 Merge "Fix ScrollView nested scrolling with touch down on buttons" 2014-04-25 21:34:32 +00:00
destradaa
08f15963fe Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 2014-04-25 21:21:37 +00:00
Adam Powell
e9a16a5a3e Fix ScrollView nested scrolling with touch down on buttons 
Start ScrollView's nested scroll in onIntercept to signal nested
scrolling parents not to intercept along the vertical axis.

Change-Id: Ieb343ff6b8216b113d3876bf93a804e609257f2a
 2014-04-25 14:21:27 -07:00
Mark Salyzyn
747802f8aa EventLog: event log translation errors 
- Deal with L using v3 event log format, or K using v1 or v2 event log format

Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
 2014-04-25 13:45:03 -07:00
Kenny Guy
e22d3e201e Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" 2014-04-25 20:28:13 +00:00
Jim Miller
50e62183d4 Add new DevicePolicyManager disable flags for keyguard. 
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS

Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
 2014-04-25 13:27:10 -07:00
Adam Lesinski
c029d5f988 Merge "Child nodes of <preference-headers> now output proguard keep options." 2014-04-25 20:25:24 +00:00
Winson Chung
4553b2d7c8 Merge "Updating recent tasks list in response to package events. (Bug 14260718)" 2014-04-25 20:22:31 +00:00
Kenny Guy
86a6430e52 Provide access to ActivityInfo.name from LauncherActivityInfo 
Change-Id: Ia34900f3e232b59f3879dbb3cb3131498023b8ac
 2014-04-25 21:21:55 +01:00
Zhijun He
50ec7cbf9f Merge "ImageReader: remove RAW_SENSOR format translation" 2014-04-25 19:44:20 +00:00
John Spurlock
47ffde252e Merge "Delay settings panel visibility until touch slop exceeded." 2014-04-25 18:53:16 +00:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
 2014-04-25 18:45:06 +00:00
Craig Mautner
1a7e9e66a6 Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 2014-04-25 18:39:46 +00:00
destradaa
cc972725af Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. 
b/14118906

Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
 2014-04-25 11:39:16 -07:00
Adam Lesinski
9cf4b4a932 Child nodes of <preference-headers> now output proguard keep options. 
Bug:13797600
Change-Id: I55c71a2fcf7f9b4bdad684d5c235981c3a8bc1e9
 2014-04-25 11:37:23 -07:00
Amith Yamasani
250bb6e3e0 Merge "Allow profile owners to set user restrictions" 2014-04-25 18:23:37 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed. 
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
 2014-04-25 11:20:01 -07:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Winson Chung
8faa342c8a Updating recent tasks list in response to package events. (Bug 14260718) 
Change-Id: I7e887256b2d504aebfaedcfebb5ee8a40b05fe24
 2014-04-25 10:53:57 -07:00
Yuling Liang
2be1f8c3f4 am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit '69a9d92502428a4cf6eb6b5bf6577d9e525796a2':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:38:00 +00:00
Yuling Liang
69a9d92502 am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:35:52 +00:00
Yuling Liang
eea94f060a Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 2014-04-25 17:32:28 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView" 
This reverts commit a10e19845ce76c0e4dd38018c84b83c9255dc9fe.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
 2014-04-25 17:32:08 +00:00
Alexandra Gherghina
d8e6a5f18a Merge "Temporarily switch off returning only enabled profiles to support dogfooding" 2014-04-25 17:12:44 +00:00
Alexandra Gherghina
92d6aea86e Temporarily switch off returning only enabled profiles to support dogfooding 
Bug: 14132551
Change-Id: I3679c8fc248a799c816e5b80641b1fca6b7af061
 2014-04-25 18:11:21 +01:00