Commit Graph

35227 Commits

Author SHA1 Message Date
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
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
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
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
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
John Reck
7f31228548 am a040977d: Merge "Fix ThreadedRenderer.setEnabled()"
* commit 'a040977de8b3ec791bf3b7e0115630e8c27fd8ca':
  Fix ThreadedRenderer.setEnabled()
2014-04-09 18:13:57 +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
Narayan Kamath
a17e83ff01 am 10bdb4b9: am 769a2475: am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '10bdb4b9e966f0a3d8e1099bf8eff4c41c31981c':
  Allow connections to multiple zygotes.
2014-04-09 14:30:33 +00:00
Narayan Kamath
10bdb4b9e9 am 769a2475: am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit '769a247595cb78536fa159e8f5d54191a4ef90c6':
  Allow connections to multiple zygotes.
2014-04-09 14:24:56 +00:00
Narayan Kamath
769a247595 am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes."
* commit 'b6ab8c17bd0163bf07ff3dbe03ab352d58b61cb3':
  Allow connections to multiple zygotes.
2014-04-09 14:19:46 +00:00
Narayan Kamath
4444dcd0ad Allow connections to multiple zygotes.
Adds a new String argument "abi" to Process.start.
This method will now query the zygotes to
determine what ABIs the primary and the secondary
zygote support (the secondary is optional) and dispatch
a fork request over the right zygote connection.

Both zygotes are assumed to be active at all points.

Change-Id: I460319b4481ff1c1666e8172223691820658a35c
2014-04-09 15:07:10 +01:00
Narayan Kamath
7f74afac6d am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
  Move certain internal activity manager methods to new class.
2014-04-09 14:04:15 +00:00
Narayan Kamath
a981e3b01a resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp
Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
2014-04-09 14:57:59 +01:00
Narayan Kamath
3ff279dca8 am 33ea32fd: am dc7eb9c9: am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '33ea32fd4e5edd7920adecd17ca69defd0c4ba93':
  Don't allow MemoryFiles of negative length.
2014-04-09 12:26:54 +00:00
Narayan Kamath
33ea32fd4e am dc7eb9c9: am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit 'dc7eb9c947f36cbd34021663845bcbb090c3169d':
  Don't allow MemoryFiles of negative length.
2014-04-09 12:20:01 +00:00
Kenny Guy
70ef1e2798 am 9d43dc5e: Merge "Finish rename of related users to profiles."
* commit '9d43dc5e4eba1bf96f0b8fa5deae5ee61a7f85ad':
  Finish rename of related users to profiles.
2014-04-09 11:45:49 +00:00
Kenny Guy
9d43dc5e4e Merge "Finish rename of related users to profiles." 2014-04-09 11:42:40 +00:00
Narayan Kamath
dc7eb9c947 am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length."
* commit '00cfbe82fa80ef57f3b1c34e47836d3e28c381b8':
  Don't allow MemoryFiles of negative length.
2014-04-09 11:33:20 +00:00
Jeff Brown
7f9599d63c am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev
* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
  Move display power controller to display manager service. (DO NOT MERGE)
2014-04-09 09:12:40 +00:00
Jeff Brown
b601725abd am 1b03d160: Merge "Move display power controller to display manager service."
* commit '1b03d160114b1ea553f322e99ca168965daffea8':
  Move display power controller to display manager service.
2014-04-09 06:19:09 +00:00
Jeff Brown
1b03d16011 Merge "Move display power controller to display manager service." 2014-04-09 04:36:22 +00:00
Jeff Brown
131206b8a9 Move display power controller to display manager service.
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
2014-04-08 21:34:32 -07:00
Jeff Brown
13014b5fe5 Move certain internal activity manager methods to new class.
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
2014-04-08 20:51:07 -07:00
Jeff Brown
ad9ef191f5 Move display power controller to display manager service. (DO NOT MERGE)
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
2014-04-08 20:41:46 -07:00
Tor Norbye
20f323083a am 37eaebe7: Merge "Add resource reference annotations"
* commit '37eaebe7f25efd9f785f735f1aab0f842a8b1594':
  Add resource reference annotations
2014-04-09 01:40:43 +00:00
Tor Norbye
37eaebe7f2 Merge "Add resource reference annotations" 2014-04-09 01:37:43 +00:00
Zhijun He
36f317025a am d178496b: Camera2: Make colorFilterArrangement public
* commit 'd178496b7e823efdc9c9780ab1d980207a36a19a':
  Camera2: Make colorFilterArrangement public
2014-04-09 01:15:39 +00:00
Zhijun He
d178496b7e Camera2: Make colorFilterArrangement public
It will be used by DNG

Also fix a typo in spec.

Change-Id: I8427df6b28149c0f8ced27b110efe96dd38357f4
2014-04-09 00:50:00 +00:00
Amith Yamasani
73e3aaf7a6 am cc4e9e69: Merge "Avoid security exception when requesting badging"
* commit 'cc4e9e69d2ef90f07f9fd3722cf3fe93ef8aa5f7':
  Avoid security exception when requesting badging
2014-04-09 00:46:32 +00:00
Jae Seo
a876b32617 am 121db9e8: Merge "Unhide TvInputSession"
* commit '121db9e8525163a867915adfd23a08cf1300d4fa':
  Unhide TvInputSession
2014-04-09 00:46:13 +00:00
Amith Yamasani
c686d9abaf am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles"
* commit '5784b39843bd3d6112352ff3b736a6498107911c':
  Launcher APIs and broadcasts for managed profiles
2014-04-09 00:45:52 +00:00
Amith Yamasani
cc4e9e69d2 Merge "Avoid security exception when requesting badging" 2014-04-09 00:26:18 +00:00
Amith Yamasani
5abdbb6560 Avoid security exception when requesting badging
When requesting badged icons, use APIs that don't require the caller
to have MANAGE_USERS permission.

Change-Id: I218cdf5194f38f4affa1874a6fcb43a040ed5295
2014-04-08 17:23:46 -07:00
Jae Seo
121db9e852 Merge "Unhide TvInputSession" 2014-04-08 23:00:51 +00:00
Jae Seo
4aef7a5699 Unhide TvInputSession
This is necessary for the SDK build.

Change-Id: I64fb6b7e6cc3147edbfff0c34cd6af7f45a82364
2014-04-08 22:42:13 +00:00
Amith Yamasani
5784b39843 Merge "Launcher APIs and broadcasts for managed profiles" 2014-04-08 22:04:20 +00:00
John Reck
089651f84b am 77ecf0bb: Merge "Don\'t make HardwareRenderer calls in the finalizer"
* commit '77ecf0bb9687a4841a4880267bdb2cd7de05055f':
  Don't make HardwareRenderer calls in the finalizer
2014-04-08 21:29:09 +00:00
John Reck
77ecf0bb96 Merge "Don't make HardwareRenderer calls in the finalizer" 2014-04-08 21:22:42 +00:00
John Reck
0ed751dd22 Don't make HardwareRenderer calls in the finalizer
Bug: 13902530
 Don't try to set the RenderNode's displayListData to 0 in the finalizer.
 The HardwareRenderer may have already been finalized and it's not valid
 to make calls into HardwareRenderer from another thread anyway.

 The fix is that now that RenderNode is a refcounted object, this step
 can be skipped entirely. The RenderNode destructor handles deleting
 its DisplayListData if it needs to.

Change-Id: Ieab75575b98c24678a531dd5aa41a2d0afde0eef
2014-04-08 14:13:31 -07:00
Jae Seo
9210e8cb23 am 3957091b: Initial round of Television Input Framework
* commit '3957091ba8f08c02b5e781098cb955a5f697a1ff':
  Initial round of Television Input Framework
2014-04-08 20:43:49 +00:00
Jae Seo
3957091ba8 Initial round of Television Input Framework
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.

Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
2014-04-08 13:35:21 -07:00
Fabrice Di Meglio
db03d7e93d am 53c2cf79: Add support for saving and using the Preference\'s key value
* commit '53c2cf799fddfae7f6fc9ca1840ea345308b79ee':
  Add support for saving and using the Preference's key value
2014-04-08 20:34:46 +00:00
Fabrice Di Meglio
53c2cf799f Add support for saving and using the Preference's key value
- make public and hide the PreferenceGroupAdapter class
- add setActivated(int position) to be able to set the activated item
- udpate getView(int position, View convertView, ViewGroup parent) to set/unset
the activated item

Change-Id: I8a653ad6541bb6b7a043ba7c3d95e5ecad924a0d
2014-04-08 13:22:07 -07:00
Fabrice Di Meglio
1d6f207c0d am 19de4fff: Merge "Add support for key value for SearchIndexableData"
* commit '19de4ffff3c9ebca70694b55b9784afe86f5c11b':
  Add support for key value for SearchIndexableData
2014-04-08 20:15:06 +00:00