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

130214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Gunsch
0acae4034c am ece41093: am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 
* commit 'ece410939fbb7a463c79ea63adf3b96c12dc386e':
  Merge "NsdService does not clean up after exiting clients"
 2014-04-10 01:14:18 +00:00
Jesse Gunsch
ece410939f am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 
* commit '3c1c137579783fad81169da01d5c7c5819c81b07':
  Merge "NsdService does not clean up after exiting clients"
 2014-04-10 01:07:23 +00:00
John Reck
b8c0f774db am 9817ddd4: Merge "Merge hasFunctors & pushStaging into prepareTree" 
* commit '9817ddd420aaa885f92f778ae2cfd17e6a71bc87':
  Merge hasFunctors & pushStaging into prepareTree
 2014-04-10 00:18:15 +00:00
John Reck
9817ddd420 Merge "Merge hasFunctors & pushStaging into prepareTree" 2014-04-10 00:14:10 +00:00
Deepanshu Gupta
ddb31bf2c9 am 8aa7a967: Merge "Support custom views using TimePickerDialog in layoutlib" 
* commit '8aa7a9677af8f235ade204602014a5e2e9f9188e':
  Support custom views using TimePickerDialog in layoutlib
 2014-04-10 00:06:34 +00:00
Alan Viverette
9ddf8ef184 am 5062649a: Merge "Update list item text appearance" 
* commit '5062649abac9bf873123fe560fbb7b0748b30a54':
  Update list item text appearance
 2014-04-10 00:00:48 +00:00
John Reck
f4198b713e Merge hasFunctors & pushStaging into prepareTree 
Bug: 13902607
 Fixes synchronous mode for WebView in HardwareLayers

Change-Id: I90de1e26dcfd9b75cc2f03bac72705fc23237b68
 2014-04-09 17:00:04 -07:00
Deepanshu Gupta
8aa7a9677a Merge "Support custom views using TimePickerDialog in layoutlib" 2014-04-09 23:59:26 +00:00
Jeff Brown
908fae826b am 30439d62: am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
* commit '30439d62d28d1368b68c59e77fb1bcf6be1d8fbe':
 2014-04-09 23:56:44 +00:00
Winson Chung
51b6daf6b0 am 2835db8b: Merge "Removing duplicated code in Recents" 
* commit '2835db8b62ec8cb15369a96da6d7b97122d395fb':
  Removing duplicated code in Recents
 2014-04-09 23:56:41 +00:00
Winson Chung
bdcf525a89 am 2adb9586: Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view." 
* commit '2adb95860f9682ed2c4893da58679540cd8cac56':
  Allow for different rects when animating to a single task stack view and a multiple task stack view.
 2014-04-09 23:56:37 +00:00
Alan Viverette
5062649aba Merge "Update list item text appearance" 2014-04-09 23:54:24 +00:00
Alan Viverette
55565ecd46 Update list item text appearance 
Adds a new attribute for secondary list item text and points
the Gingerbread and Holo themes to use TextAppearance.Small for
compatibility's sake.

Change-Id: I8e78a908b699baae6d1f5b3623fd7b5648b99b77
 2014-04-09 16:52:54 -07:00
Svetoslav
34d233dd48 am bc1a8f42: Merge "Active window not correctly computed." 
* commit 'bc1a8f42d9eb5f1d91c872904a9a283781291fcb':
  Active window not correctly computed.
 2014-04-09 23:52:14 +00:00
Jeff Brown
30439d62d2 am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
* commit '6fdb5e6df178b3b1062ac67b505b288aa609a66b':
 2014-04-09 23:50:47 +00:00
Winson Chung
2835db8b62 Merge "Removing duplicated code in Recents" 2014-04-09 23:50:39 +00:00
Jesse Gunsch
3c1c137579 am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 
* commit '8d31358fb4f0f948fcfd07399d4247375dc5eea9':
  Merge "NsdService does not clean up after exiting clients"
 2014-04-09 23:50:35 +00:00
Winson Chung
2adb95860f Merge "Allow for different rects when animating to a single task stack view and a multiple task stack view." 2014-04-09 23:50:33 +00:00
Svetoslav
bc1a8f42d9 Merge "Active window not correctly computed." 2014-04-09 23:48:41 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
 2014-04-09 16:47:40 -07:00
Svetoslav
48eacec53e Active window not correctly computed. 
The accessibility manager service was not handling the focused
window properly which as a result was breaking the active window
tracking.

bug:13788022

Change-Id: Iaa3fadfbf7b9545f5151e3603beeda2662fe7618
 2014-04-09 16:45:49 -07:00
John Reck
c8334289f5 am 8e1f9187: Merge "Switch DisplayListData to a staging model" 
* commit '8e1f918738abf70a4dc86dbb12b386a9deea37f8':
  Switch DisplayListData to a staging model
 2014-04-09 23:06:00 +00:00
John Reck
8e1f918738 Merge "Switch DisplayListData to a staging model" 2014-04-09 23:01:02 +00:00
John Reck
8de65a8e05 Switch DisplayListData to a staging model 
Bug: 13912977

Change-Id: I5b2f664e797be22a58300964f57ceb4fab60528c
 2014-04-09 15:48:00 -07:00
Winson Chung
b44c24fb50 Removing duplicated code in Recents 
- Also disabling the animation on the first task view when animating from home
- Fixing a case where filtered and non-filtered state can be exactly the same

Change-Id: I01665391fc0b0745a89e404b12280d3d919aec83
 2014-04-09 15:19:57 -07:00
Deepanshu Gupta
86e5218220 Support custom views using TimePickerDialog in layoutlib 
Bug: http://b.android/com/61515

Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
 2014-04-09 15:15:49 -07:00
John Spurlock
50ee51d955 am 3c86a27d: Merge "Put suppressed notifications behind a summary notification." 
* commit '3c86a27d3e9044d04d0f176e59a1ebbcd774a54c':
  Put suppressed notifications behind a summary notification.
 2014-04-09 21:49:27 +00:00
John Spurlock
3c86a27d3e Merge "Put suppressed notifications behind a summary notification." 2014-04-09 21:45:36 +00:00
Winson Chung
0d767551c5 Allow for different rects when animating to a single task stack view and a multiple task stack view. 
- Fixing regression in task bar enter animation duration
- Fixing issue with extra long titles in the task bar
- Cleaning up some constants and unused code
 2014-04-09 14:33:23 -07:00
John Spurlock
bf20eab6fc Put suppressed notifications behind a summary notification. 
Bug:13726563
Change-Id: Ib1c3fba3a328792dc674c8403735f75d4db41973
 2014-04-09 16:52:20 -04:00
Alan Viverette
f7dd84ee48 am 03bdcfa5: Merge "Ensure theme attributes are set appropriately" 
* commit '03bdcfa519766ffe9d331d176eae8c77452bc4ff':
  Ensure theme attributes are set appropriately
 2014-04-09 20:43:57 +00:00
Alan Viverette
03bdcfa519 Merge "Ensure theme attributes are set appropriately" 2014-04-09 20:37:20 +00:00
Fabrice Di Meglio
3654de0b02 am 03fee276: Merge "Update SearchIndexablesContract" 
* commit '03fee27646564cf1b559b7f8a53d35a1db18d0bd':
  Update SearchIndexablesContract
 2014-04-09 20:33:56 +00:00
Fabrice Di Meglio
03fee27646 Merge "Update SearchIndexablesContract" 2014-04-09 20:29:19 +00:00
Fabrice Di Meglio
1ecde22134 Update SearchIndexablesContract 
- add indices constants for colums
- add missing properties (entries / key)

Change-Id: Ie6c00abf27aaf0fc27e685c8ee0ff8e1e16b5d52
 2014-04-09 13:17:42 -07:00
Alan Viverette
d722e59984 am 514d4aaf: Merge "Update supported Drawable tinting modes and docs" 
* commit '514d4aaf53abf6671b0fe8be6d8a2d6b2a69b887':
  Update supported Drawable tinting modes and docs
 2014-04-09 20:12:03 +00:00
Alan Viverette
5b6b1bb97b Ensure theme attributes are set appropriately 
BUG: 13920927
Change-Id: I0ddb3e3c5ca56cce3110c6b85959f2c22671e079
 2014-04-09 13:09:15 -07:00
Alan Viverette
514d4aaf53 Merge "Update supported Drawable tinting modes and docs" 2014-04-09 20:08:46 +00:00
Alan Viverette
2f8ba8f7fa Update supported Drawable tinting modes and docs 
Change-Id: I9c20d2bc4dc499f91c21a348871cf209c1065ba6
 2014-04-09 13:00:17 -07:00
Jae Seo
5e75df5218 am b06cb887: Skip cleaning up TV service/session when the user state is not found 
* commit 'b06cb8870f0407f18bb1225065a93aba2a5de2bf':
  Skip cleaning up TV service/session when the user state is not found
 2014-04-09 19:35:21 +00:00
Jae Seo
b06cb8870f Skip cleaning up TV service/session when the user state is not found 
Bug: 13930813
Change-Id: I64285edaca0bd06d6f6efaeb6b5c30c2ef762902
 2014-04-09 12:10:58 -07:00
Zhijun He
a4b0ef8802 am 8d637b81: Camera2: Fix the JPEG format issues 
* commit '8d637b819b23d0fcca87a39d26d0350e062852f4':
  Camera2: Fix the JPEG format issues
 2014-04-09 18:54:33 +00:00
Zhijun He
8d637b819b Camera2: Fix the JPEG format issues 
Also add unit test.

Bug: 13836016

Change-Id: I0af4bfe299f99c99e70faf5d3159eb0cbcc147eb
 2014-04-09 18:51:38 +00:00
Chris Craik
6de57fd243 am 972d0488: Merge "When recording a child node into a parent, read staging projection property" 
* commit '972d0488a555ff65a9e18655795e65e4b5365175':
  When recording a child node into a parent, read staging projection property
 2014-04-09 18:14:00 +00:00
John Reck
7f31228548 am a040977d: Merge "Fix ThreadedRenderer.setEnabled()" 
* commit 'a040977de8b3ec791bf3b7e0115630e8c27fd8ca':
  Fix ThreadedRenderer.setEnabled()
 2014-04-09 18:13:57 +00:00
Chris Craik
972d0488a5 Merge "When recording a child node into a parent, read staging projection property" 2014-04-09 18:10:28 +00:00
John Reck
a040977de8 Merge "Fix ThreadedRenderer.setEnabled()" 2014-04-09 18:10:28 +00:00
Jesse Gunsch
8d31358fb4 Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev 2014-04-09 18:09:03 +00:00
John Reck
f7d9c1dc84 Fix ThreadedRenderer.setEnabled() 
Bug: 13914116
 Fixes lifecycle issues around setEnabled where ThreadedRenderer
 was reporting as being enabled before it had a Surface. This is
 incorrect.

 Also fix some EGL lifecycle issues

Change-Id: I12ebb279707f9b533a570b61d68735d858b560bf
 2014-04-09 11:01:29 -07:00
Winson Chung
d6bb4d92b2 am daa610cc: Merge "Prevent Recents from lingering after screen-off." 
* commit 'daa610cc42ae68db0af1b63755fe3a7531f47dcc':
  Prevent Recents from lingering after screen-off.
 2014-04-09 17:44:11 +00:00