Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,088 Commits 3 Branches 0 Tags
f53f2d27acfd42530ae4e8b428eb924f26f88e88
Commit Graph

35473 Commits

Author SHA1 Message Date
Tao Bai
f53f2d27ac am e5b7c95b: Merge "Define new general permission APIs for webview." 
* commit 'e5b7c95b8a247e9962710dca127c56a78d4faca5':
  Define new general permission APIs for webview.
 2014-04-15 17:40:33 +00:00
Tao Bai
e5b7c95b8a Merge "Define new general permission APIs for webview." 2014-04-15 17:37:12 +00:00
Deepanshu Gupta
2f202be72e am 8d95b500: Merge "Action bar rendering in layoutlib" 
* commit '8d95b5009ce5592f55a9487536fa640724dc316b':
  Action bar rendering in layoutlib
 2014-04-14 23:12:03 +00:00
Deepanshu Gupta
8d95b5009c Merge "Action bar rendering in layoutlib" 2014-04-14 23:07:30 +00:00
Christopher Lane
68fe45839a am 111db01a: resolved conflicts for merge of 381ac080 to master 
* commit '111db01a2668b7a1ec256a4166c322db061d1ddd':
  Add support for custom TXT records in NSD
 2014-04-14 22:20:52 +00:00
Christopher Lane
111db01a26 resolved conflicts for merge of 381ac080 to master 
Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21
 2014-04-14 15:14:01 -07:00
Jae Seo
225ef788e3 am 72139a92: Merge "Add a contract class for the TV content provider" 
* commit '72139a92ab7b4e7f986f57a3ac4134fd6c404968':
  Add a contract class for the TV content provider
 2014-04-14 21:35:40 +00:00
Jae Seo
72139a92ab Merge "Add a contract class for the TV content provider" 2014-04-14 21:31:16 +00:00
Christopher Lane
381ac08054 am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev 
* commit '62538940de1755c71c56b0e5d81e12397e5de58a':
  Add support for custom TXT records in NSD
 2014-04-14 21:16:27 +00:00
Christopher Lane
62538940de Merge "Add support for custom TXT records in NSD" into klp-modular-dev 2014-04-14 21:13:09 +00:00
Christopher Lane
b72d8b4091 Add support for custom TXT records in NSD 
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
 2014-04-14 14:10:36 -07:00
Alan Viverette
5539d1737c am 58c1c293: Merge "Actually store gravity in ActionBar.LayoutParams constructor" 
* commit '58c1c2938517a8a9fe685f7c138749aca8cd0c9b':
  Actually store gravity in ActionBar.LayoutParams constructor
 2014-04-14 20:07:08 +00:00
Alan Viverette
58c1c29385 Merge "Actually store gravity in ActionBar.LayoutParams constructor" 2014-04-14 20:03:35 +00:00
Alan Viverette
da4bd6fd96 Actually store gravity in ActionBar.LayoutParams constructor 
Change-Id: I19252d55188e0ef075a272985f468fbe3c0628f5
 2014-04-14 12:59:15 -07:00
John Reck
673da9ae9a am 1562f2e5: Merge "Fence on destruction" 
* commit '1562f2e574a423ea8e000b84432d4cae2a848cc3':
  Fence on destruction
 2014-04-14 19:53:42 +00:00
John Reck
1562f2e574 Merge "Fence on destruction" 2014-04-14 19:48:18 +00:00
John Reck
fae904d639 Fence on destruction 
Bug: 14052927
 destroyCanvasAndSurface() needs a fence as when it returns the
 underlying BufferQueue is going to be released from under
 the render thread.

Change-Id: I0147a1d5ec5adf0239c761ef22f65cd8c8a137df
 2014-04-14 12:44:53 -07:00
Raph Levien
13301ef47d am 7bc016e8: am f6ee7e3f: am 202d1ec7: Fix text shadow attributes in textAppearance 
* commit '7bc016e88a854d8de870ddb6e235fab3c902c0c7':
  Fix text shadow attributes in textAppearance
 2014-04-14 19:37:23 +00:00
Raph Levien
7bc016e88a am f6ee7e3f: am 202d1ec7: Fix text shadow attributes in textAppearance 
* commit 'f6ee7e3f47ee443078d803b03c0507ea1bf5cd54':
  Fix text shadow attributes in textAppearance
 2014-04-14 19:32:52 +00:00
Raph Levien
f6ee7e3f47 am 202d1ec7: Fix text shadow attributes in textAppearance 
* commit '202d1ec753ff9401f3a1ea93a09a7419e76b7f91':
  Fix text shadow attributes in textAppearance
 2014-04-14 19:30:22 +00:00
Fabrice Di Meglio
e3cd5f03af am 1c3f4092: Merge "SearchIndexablesProvider - support for querying for non indexable data keys" 
* commit '1c3f409284b47312c1c7e5d36283df9a05d29dfb':
  SearchIndexablesProvider - support for querying for non indexable data keys
 2014-04-14 19:14:13 +00:00
Evan Charlton
8c6d9e544e resolved conflicts for merge of 352e1082 to master-nova 
Change-Id: I6ab96bcc801d8c264908c89d465a9a7f49e1ef16
 2014-04-14 11:53:39 -07:00
Raph Levien
202d1ec753 Fix text shadow attributes in textAppearance 
The various text shadow attributes were not being properly applied
because they were being retrieved from the wrong TypedArray.

This is the proper fix for bug 13525033 Shadow* attributes in a style
not being applied in textAppearance.

Change-Id: I57a8f498bf6059c5c5c74c1072edb277a24ea053
 2014-04-14 18:27:30 +00:00
Fabrice Di Meglio
1c3f409284 Merge "SearchIndexablesProvider - support for querying for non indexable data keys" 2014-04-14 17:58:58 +00:00
Dan Sandler
352e108259 Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'" 2014-04-14 17:54:22 +00:00
Jeff Brown
b631b43ced am 15b0bef9: am 9e2fde9c: am d912e1f6: Use the display\'s actual state in the view hierarchy. 
* commit '15b0bef9250e084bfbceb388716d28ed62ca018f':
  Use the display's actual state in the view hierarchy.
 2014-04-12 02:10:00 +00:00
Jeff Brown
15b0bef925 am 9e2fde9c: am d912e1f6: Use the display\'s actual state in the view hierarchy. 
* commit '9e2fde9c8a3557d6e8d1f3971a421ecdf5c2ce07':
  Use the display's actual state in the view hierarchy.
 2014-04-12 02:02:26 +00:00
Jeff Brown
9e2fde9c8a am d912e1f6: Use the display\'s actual state in the view hierarchy. 
* commit 'd912e1f6a111fb33118d116bd72da1a328041bca':
  Use the display's actual state in the view hierarchy.
 2014-04-12 01:58:57 +00:00
Jeff Brown
d912e1f6a1 Use the display's actual state in the view hierarchy. 
Previously, the view hierarchy would suppress drawing whenever the
PowerManager.isScreenOn() method returned false.  However, this method
really describes the interactive state of the device rather than the
actual display state.  This is especially a problem when there are
multiple displays but it also breaks drawing while in doze mode.

This change makes the view hierarchy consider the actual state of the
display instead on an individual basis.

Bug: 13133142
Change-Id: I69870b6b14a3504607a30562aa48c3452f777c1f
 2014-04-11 18:46:22 -07:00
Fabrice Di Meglio
97babb1e9a SearchIndexablesProvider - support for querying for non indexable data keys 
SearchIndexablesProvider should be able to send a list of data keys that
should not be indexed (mainly depending on some condition/state from the
device)

- update the contract by adding a new query named queryNonIndexableKeys(...)

Change-Id: Ie720825050acb600dca8ac8fed96fa4f59c3af71
 2014-04-11 18:45:44 -07:00
Fabrice Di Meglio
a0790d3f8e am efb40a0d: Merge "Update Javadoc for SearchIndexablesContract" 
* commit 'efb40a0dba8874297b4dcf6a41e5d741c7f721e9':
  Update Javadoc for SearchIndexablesContract
 2014-04-12 00:31:48 +00:00
Fabrice Di Meglio
efb40a0dba Merge "Update Javadoc for SearchIndexablesContract" 2014-04-12 00:27:43 +00:00
Fabrice Di Meglio
a8e8f3f647 Update Javadoc for SearchIndexablesContract 
- fix typo and update some comment

Change-Id: Id001290aa367ee2b8b0d6d9ca9098710e760ad31
 2014-04-11 17:24:02 -07:00
John Reck
7f01896bde am 777648cd: Merge "Support onHardwarePostDraw in ThreadedRenderer" 
* commit '777648cde44c83b0e8c7b15473c9d7d29de653b7':
  Support onHardwarePostDraw in ThreadedRenderer
 2014-04-11 23:32:20 +00:00
Alan Viverette
a736818cc7 am 24e2e667: Merge "Clean up VolumePanel, tweak volume & brightness dialog styling" 
* commit '24e2e6674d45acf22d9008368ee692746a5971ab':
  Clean up VolumePanel, tweak volume & brightness dialog styling
 2014-04-11 23:26:28 +00:00
John Reck
777648cde4 Merge "Support onHardwarePostDraw in ThreadedRenderer" 2014-04-11 23:23:59 +00:00
John Reck
bc0cc0220b Support onHardwarePostDraw in ThreadedRenderer 
Bug: 13958485

Change-Id: Ie9c7af7cee582850a7f0a3d891aa3685c230cfc7
 2014-04-11 16:16:48 -07:00
Alan Viverette
24e2e6674d Merge "Clean up VolumePanel, tweak volume & brightness dialog styling" 2014-04-11 23:01:11 +00:00
Alan Viverette
e8ebaf3f6f Clean up VolumePanel, tweak volume & brightness dialog styling 
Change-Id: Ibd008fbc6acab00bf642422cb322ec147799d3d7
 2014-04-11 15:44:15 -07:00
Fabrice Di Meglio
02f80877e2 am 296832e0: Merge "Fix constructors for SearchIndexableData and SearchIndexableResource" 
* commit '296832e0e5ac007aecd5824dede840d1f403ced0':
  Fix constructors for SearchIndexableData and SearchIndexableResource
 2014-04-11 22:26:23 +00:00
Fabrice Di Meglio
296832e0e5 Merge "Fix constructors for SearchIndexableData and SearchIndexableResource" 2014-04-11 22:19:23 +00:00
Fabrice Di Meglio
773a56bbf4 Fix constructors for SearchIndexableData and SearchIndexableResource 
- fix locale initialization
- fix constructor chain

Change-Id: Id072574cca79fd49013e0b796b98a12d0bb8459f
 2014-04-11 15:15:34 -07:00
Amith Yamasani
792e41fe2a am 8f993de8: Merge "Expose an API to generate a badged icon for managed profiles." 
* commit '8f993de81f9e9bcfd136c42bb6bf12114fedfd36':
  Expose an API to generate a badged icon for managed profiles.
 2014-04-11 22:04:41 +00:00
Amith Yamasani
8f993de81f Merge "Expose an API to generate a badged icon for managed profiles." 2014-04-11 22:01:16 +00:00
Amith Yamasani
7dda2657be Expose an API to generate a badged icon for managed profiles. 
Change-Id: I6257f43934ba6eefe752003942d8d3bcf207d5f9
 2014-04-11 14:57:12 -07:00
Paul McLean
5dbe3d35c1 am fd7d3108: Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices." 
* commit 'fd7d31087bcd40b825b0eee3058e2298d8648e9f':
  Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices.
 2014-04-11 21:25:07 +00:00
Paul McLean
6eb0e0f576 am d1d7c491: Merge "Revert "Revert "Initial implementation of USB Audio output.""" 
* commit 'd1d7c491601a3fd1547c31606e1b8386db068b9c':
  Revert "Revert "Initial implementation of USB Audio output.""
 2014-04-11 21:25:03 +00:00
Paul McLean
b755253f28 am fd7d3108: Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices." 
* commit 'fd7d31087bcd40b825b0eee3058e2298d8648e9f':
  Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices.
 2014-04-11 21:21:23 +00:00
Paul McLean
1f396ec3f6 am d1d7c491: Merge "Revert "Revert "Initial implementation of USB Audio output.""" 
* commit 'd1d7c491601a3fd1547c31606e1b8386db068b9c':
  Revert "Revert "Initial implementation of USB Audio output.""
 2014-04-11 21:21:20 +00:00
Paul McLean
fd7d31087b Merge "Implement USB Audio across Nexus Devices Fix issues with connecting non-audio USB devices." 2014-04-11 21:18:51 +00:00