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

132347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
1c923a386e Force condition provider unsubscribe when exiting zen mode. 
Bug:13743109
Change-Id: I3c205067498a86e2862a0c545bc38e41682693d5
 2014-04-27 17:41:51 -04:00
John Spurlock
4210a3091c am c1644c59: Wire up condition providers to zen mode exit triggers. 
* commit 'c1644c590bbc24955ecd367cb4c8e368c24fe2e5':
  Wire up condition providers to zen mode exit triggers.
 2014-04-27 16:04:22 +00:00
John Spurlock
e77bb36d48 Wire up condition providers to zen mode exit triggers. 
Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
 2014-04-27 11:36:32 -04:00
Jae Seo
4395fa24f8 am a94816b3: Log watched TV programs 
* commit 'a94816b3a62c6d9efab108e5b3f7e69f9780b876':
  Log watched TV programs
 2014-04-26 13:30:18 +00:00
Jae Seo
31dc634be3 Log watched TV programs 
Change-Id: Id6ee87dffcf90f10f1619e849126c66ad27464e2
 2014-04-26 22:25:45 +09:00
Chris Craik
a398539879 am 79d9d187: Merge "Support Oval GradientDrawable outlines, and ShapeDrawable" 
* commit '79d9d187ffbcbbbe1bf19e82606a92c0f5222c2b':
  Support Oval GradientDrawable outlines, and ShapeDrawable
 2014-04-26 02:02:29 +00:00
Chris Craik
6689c9700d Merge "Support Oval GradientDrawable outlines, and ShapeDrawable" 2014-04-26 01:59:00 +00:00
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
994a9a39b5 am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:35:49 +00:00
Jim Miller
953c4e04fa am 427b7fb5: Merge "Add new DevicePolicyManager disable flags for keyguard." 
* commit '427b7fb50b5c2c8f38612a74a7c46ff056e22e68':
  Add new DevicePolicyManager disable flags for keyguard.
 2014-04-26 00:35:45 +00: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
163b9bb55a am fa774224: 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 developme 
* commit 'fa774224bfb155e72b7d5688df8ace17c97b1bd8':
  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:33:14 +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
be7734dfb6 am c644d0d1: Merge "Handle density request in LauncherActivityInfo" 
* commit 'c644d0d14cf3ec7fede43116c5bcafea2d57b325':
  Handle density request in LauncherActivityInfo
 2014-04-25 23:08:41 +00:00
Amith Yamasani
0150b48c4c Merge "Handle density request in LauncherActivityInfo" 2014-04-25 23:04:27 +00:00
Ricardo Cervera
43c794d4c0 am f662256c: am 9d7c58cf: am 6fe328c6: am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs 
* commit 'f662256c13749f83c7ff3eb8799e03aa506a9db9':
  docs: Added release notes for ADT 22.6.3
 2014-04-25 23:03:58 +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
Mark Salyzyn
82452f1436 am d8395db5: am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors" 
* commit 'd8395db5817c52a87cbf17e7eaa494bf9aa50578':
  EventLog: event log translation errors
 2014-04-25 22:58:52 +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
872a6d5baf am ed14822b: am cb48b962: am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit 'ed14822b739f46b9a2a5180c44a22b79124c71ef':
  Throw exception from startActivity if not allowed.
 2014-04-25 22:13:35 +00:00
Kenny Root
580e620a3c am de0a7e4a: Merge "PackageManager: add versioning to packages.xml file" 
* commit 'de0a7e4ae7e84b13d46c47394789045cae3dddb4':
  PackageManager: add versioning to packages.xml file
 2014-04-25 22:13:31 +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
5873714110 am 5e626cde: Merge "Fix ScrollView nested scrolling with touch down on buttons" 
* commit '5e626cde018f12ad0509d32b5653eb846b9d5f09':
  Fix ScrollView nested scrolling with touch down on buttons
 2014-04-25 21:39:40 +00:00
Adam Powell
07064fa730 Merge "Fix ScrollView nested scrolling with touch down on buttons" 2014-04-25 21:34:32 +00:00
destradaa
1d98bd899e am 3e446afc: Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 
* commit '3e446afc380db206547d9f1f8f9bd60cf48aa100':
  Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906
 2014-04-25 21:25:11 +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
David Friedman
5fb79db94e Fixed missing line break, broken link. 
Bug: 13975265
Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html

Change-Id: I69f7e56f9b261c776672161cfb1649c4cd72c96e
 2014-04-25 14:02:16 -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
58b305bb00 am 0ec41abf: Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" 
* commit '0ec41abf20df9c27cd995b8ca22fa709aff4434b':
  Provide access to ActivityInfo.name from LauncherActivityInfo
 2014-04-25 20:33:55 +00:00
Adam Lesinski
5fd6ae7c26 am 00dd322b: Merge "Child nodes of <preference-headers> now output proguard keep options." 
* commit '00dd322bddf874438869eaf36d1f637aacbb2420':
  Child nodes of <preference-headers> now output proguard keep options.
 2014-04-25 20:29:37 +00:00
Kenny Guy
e22d3e201e Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" 2014-04-25 20:28:13 +00:00