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

38510 Commits

Author SHA1 Message Date
Ricardo Cervera
c50a14e91a am 92f4a346: am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '92f4a3465ea2521523b5659f8006097e07a9be58':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:07:44 +00:00
Ricardo Cervera
92f4a3465e am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'fa711a33be265d1fcd08efd850085615ec66dd89':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 02:03:14 +00:00
Ricardo Cervera
fa711a33be am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'd09e1bffe412ace61a411873cc8d0a3759540e46':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:59:03 +00:00
Ricardo Cervera
d09e1bffe4 am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit 'ed5b8c06bbc70facbe553a9ca257a277ac3758ca':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:54:31 +00:00
Ricardo Cervera
ed5b8c06bb am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 
* commit '6aeea4549787ec282d2ca42b8495b87645958fc9':
  docs: Added the play from search intent. Bug: 13473141.
 2014-04-18 01:49:50 +00:00
Ricardo Cervera
6aeea45497 Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs 2014-04-18 01:46:25 +00:00
Michael Kolb
dfbcf0ca33 am f4399e72: resolved conflict for merge from d42eeab2 to master 
* commit 'f4399e7243c35bef3eabfd20582246818a0bbbd3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 01:17:38 +00:00
Michael Kolb
f4399e7243 resolved conflict for merge from d42eeab2 to master 
Change-Id: I41bd238f0628110c923b79259de4cd11a783340c
 2014-04-17 18:00:40 -07:00
Selim Cinek
8d19d37938 am 47391720: Merge "ViewGroup now applies clipBounds to its children" 
* commit '473917208961a90ca76fa9b9341b95902859b682':
  ViewGroup now applies clipBounds to its children
 2014-04-18 00:49:39 +00:00
Michael Kolb
d42eeab20f am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 
* commit '4abbd0a685cb418eb3cfc1f030d3091ef394a7e3':
  Populate isRound from config.xml to WindowInsets
 2014-04-18 00:48:13 +00:00
Michael Kolb
4abbd0a685 Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev 2014-04-18 00:44:35 +00:00
Selim Cinek
4739172089 Merge "ViewGroup now applies clipBounds to its children" 2014-04-18 00:41:21 +00:00
Michael Kolb
6642e51ac5 Populate isRound from config.xml to WindowInsets 
Change-Id: I41b3aef1322a7cdccdcbc679eb753e0a1e561fad
 2014-04-17 17:32:50 -07:00
Jianing Wei
a698d4e00a am abb7a886: Merge "Camera2 API: fix wrong logic in handling last frame number." 
* commit 'abb7a886970448bbaeb8abe7cd877eab48809a60':
  Camera2 API: fix wrong logic in handling last frame number.
 2014-04-18 00:09:05 +00:00
Jianing Wei
abb7a88697 Merge "Camera2 API: fix wrong logic in handling last frame number." 2014-04-18 00:00:12 +00:00
Jeff Brown
6d74bc462c am aaea4d3a: am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 
* commit 'aaea4d3a4822a380831084a779f52a8e767ce402':
  Add support for dynamically setting the virtual display surface.
 2014-04-17 23:06:00 +00:00
Jeff Brown
aaea4d3a48 am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 
* commit '18a69b936afa6bdb8c65b6b582989c4dcdac45ee':
  Add support for dynamically setting the virtual display surface.
 2014-04-17 22:59:59 +00:00
RoboErik
161bec6fe4 resolved conflicts for merge of 0a57a111 to master-nova 
Change-Id: Id9fad51341239051203a219d58213b9438effc50
 2014-04-17 15:43:15 -07:00
RoboErik
0a57a1112f Merge "Add RouteProviders to the new Media APIs" 2014-04-17 22:13:30 +00:00
Jianing Wei
5a4b02be33 Camera2 API: fix wrong logic in handling last frame number. 
Change-Id: I23bdceada2460238c1e7fc45524ae491268b4243
 2014-04-17 15:12:26 -07:00
RoboErik
07c7077c54 Add RouteProviders to the new Media APIs 
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).

Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
 2014-04-17 15:02:33 -07:00
Jeff Brown
18a69b936a am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
  Add support for dynamically setting the virtual display surface.
 2014-04-17 21:53:34 +00:00
Zhijun He
a5ec9213f9 am f60194b1: Merge "Camera2: Update sync.frameNumber tag" 
* commit 'f60194b115edb4797464dd3714ed9d03f3ff21ff':
  Camera2: Update sync.frameNumber tag
 2014-04-17 20:44:21 +00:00
Zhijun He
f60194b115 Merge "Camera2: Update sync.frameNumber tag" 2014-04-17 20:40:19 +00:00
Zhijun He
4f91e2a459 Camera2: Update sync.frameNumber tag 
This is from the type mismapping bug fix in metadata generation.

Change-Id: Icaa9916e00e76b30cdc5688c3d3b7e9cadf84794
 2014-04-17 13:20:21 -07:00
Ricardo Cervera
a3b13847b0 docs: Added the play from search intent. Bug: 13473141. 
Change-Id: Icf483b5e0446e064b32a782717408484d5806859
 2014-04-17 12:31:18 -07:00
Raph Levien
2735a39c4e am 06136574: Merge changes Ia693f512,If3b7d41f 
* commit '0613657426aecb7ed6141c133f100baf24166ae0':
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
 2014-04-17 19:24:38 +00:00
Raph Levien
0613657426 Merge changes Ia693f512,If3b7d41f 
* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
 2014-04-17 19:21:14 +00:00
Raph Levien
53c0077256 Add elegantTextHeight text appearance attribute 
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.

The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.

The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.

Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
 2014-04-17 11:16:46 -07:00
George Mount
bd032bf1dc am 99d2ffa1: Merge "Split Activity Transitions out of PhoneWindow." 
* commit '99d2ffa1268da1258390fa6f272bf41687084d7b':
  Split Activity Transitions out of PhoneWindow.
 2014-04-17 18:13:30 +00:00
Robin Lee
766a442a5e am 56a0a269: Merge "Allow ProfileOwner apps to manage app restrictions" 
* commit '56a0a269cd7309476c5f49a21563249e97f70a9e':
  Allow ProfileOwner apps to manage app restrictions
 2014-04-17 18:12:57 +00:00
George Mount
31a217290c Split Activity Transitions out of PhoneWindow. 
Bug 13622834
Made it possible to use shared elements without making
Views invisible.

Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
 2014-04-17 09:49:25 -07:00
Robin Lee
66e5d96cf9 Allow ProfileOwner apps to manage app restrictions 
Simple wrapper around the UserManager.{get|set}ApplicationRestrictions
APIs. Also added a new Intent to signal to running apps that the set
of restrictions has changed since startup.

Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
 2014-04-17 15:58:03 +01:00
Selim Cinek
19cadc203e ViewGroup now applies clipBounds to its children 
Fixed a bug where a ViewGroup did not clip its children to the
set clipBounds unless willNotDraw was set to true.

Bug: 14104527
Change-Id: I4892639bb860c1767f1ae6892f3e69525691e55e
 2014-04-17 09:55:11 +02:00
John Reck
a8487ebbef am c7314356: Merge "Add missing resume() call" 
* commit 'c731435649ef42a454a7e2e22fa2e303a242f8f9':
  Add missing resume() call
 2014-04-17 06:53:16 +00:00
John Reck
bc7dde920d am 3b3d66ef: Merge "Clear mIgnoreDirtyState after draw" 
* commit '3b3d66ef68628adb34c7c315fa5cefbce92c4bf1':
  Clear mIgnoreDirtyState after draw
 2014-04-17 06:53:12 +00:00
John Reck
c731435649 Merge "Add missing resume() call" 2014-04-17 04:36:52 +00:00
John Reck
3b3d66ef68 Merge "Clear mIgnoreDirtyState after draw" 2014-04-17 04:33:15 +00:00
John Reck
6f07a0dc87 Add missing resume() call 
Bug: 14087850

Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
 2014-04-16 21:32:25 -07:00
John Reck
6313b9259d Clear mIgnoreDirtyState after draw 
Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
 2014-04-16 21:32:24 -07:00
Jeff Brown
92207df753 Add support for dynamically setting the virtual display surface. 
Previously, the surface that backs a virtual display had to be set
at the time when the display was created.  This change now makes
it possible to set or remove the surface later.  The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
 2014-04-16 18:45:05 -07:00
Ruben Brunk
a4bc9d929b am a2e86e42: Merge "Update DNG tags." 
* commit 'a2e86e427d454d4cc6d4020ed2771a988d4be6b4':
  Update DNG tags.
 2014-04-16 23:42:36 +00:00
Ruben Brunk
a2e86e427d Merge "Update DNG tags." 2014-04-16 23:36:21 +00:00
Fabrice Di Meglio
c567e7c1e1 am 2c5453e5: Merge "Add Preference highlighting" 
* commit '2c5453e5ce88ff3ef5ca65d40ef124cb5cdcea56':
  Add Preference highlighting
 2014-04-16 23:24:29 +00:00
Adam Powell
e515a494d9 am 23c5bbb0: Merge "Revert the revert of adding isRound to WindowInsets after early merge" 
* commit '23c5bbb0906cb1883682d11c089abf5e35e20352':
  Revert the revert of adding isRound to WindowInsets after early merge
 2014-04-16 23:24:24 +00:00
Adam Powell
3d678ad462 am 973ddaac: DO NOT MERGE Add isRound to WindowInsets 
* commit '973ddaacaef255b8659d35cfe4151dd5b7436138':
  DO NOT MERGE Add isRound to WindowInsets
 2014-04-16 23:23:02 +00:00
Fabrice Di Meglio
2c5453e5ce Merge "Add Preference highlighting" 2014-04-16 23:20:26 +00:00
Adam Powell
23c5bbb090 Merge "Revert the revert of adding isRound to WindowInsets after early merge" 2014-04-16 23:16:51 +00:00
Adam Powell
2accbf904f Revert the revert of adding isRound to WindowInsets after early merge 
This reverts commit 01ebfbd0a0.

Change-Id: I3d5a3523a1505cc3bfd0172c7282a8eda21ae206
 2014-04-16 23:14:57 +00:00
Ruben Brunk
7c062369d5 Update DNG tags. 
Change-Id: I497b0fac5d52005c126eaf52c67d30bd224a80b5
 2014-04-16 16:01:29 -07:00