Commit Graph

38482 Commits

Author SHA1 Message Date
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
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
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
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
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
Fabrice Di Meglio
35d7b89b9f Add Preference highlighting
- use a specific drawable for highlighting a Preference
at a given position
- also add PreferenceFragment.hasListView() as hidden API

Change-Id: If69854cf6c4852d0f45e2c3a9734b1f63b352f9d
2014-04-16 16:01:13 -07:00
Michael Kolb
ca05e4e8ce am 46175e15: Merge "Revert "Add isRound to WindowInsets""
* commit '46175e152891eabd9051523f2f077de5a5562996':
  Revert "Add isRound to WindowInsets"
2014-04-16 22:58:53 +00:00
Michael Kolb
559291078a am cc9d2766: Merge "Add isRound to WindowInsets"
* commit 'cc9d2766726a1335ed178b4fdcea7ee2ba59b152':
  Add isRound to WindowInsets
2014-04-16 22:58:48 +00:00
Michael Kolb
46175e1528 Merge "Revert "Add isRound to WindowInsets"" 2014-04-16 22:52:31 +00:00
Michael Kolb
01ebfbd0a0 Revert "Add isRound to WindowInsets"
This reverts commit e5244b5638.

Change-Id: I6371c718e2189968699e980fd0e7ba91c486aca6
2014-04-16 22:52:14 +00:00
Michael Kolb
cc9d276672 Merge "Add isRound to WindowInsets" 2014-04-16 22:51:33 +00:00
Jeff Davidson
754e3802cd am 4c37b79c: Merge "Class for managing the active scorer application."
* commit '4c37b79cc9c3af57be4ca7f9ff40bceaad948d95':
  Class for managing the active scorer application.
2014-04-16 21:34:26 +00:00
Jeff Davidson
4c37b79cc9 Merge "Class for managing the active scorer application." 2014-04-16 21:32:06 +00:00
Jeff Brown
367687a8b1 am 047f3c71: resolved conflicts for merge of 3ee9dc58 to master
* commit '047f3c71a48d90a2b022bd886bf581add2d68326':
  Declare VersionCodes.KITKAT_WATCH.
2014-04-16 21:23:03 +00:00
Jeff Brown
047f3c71a4 resolved conflicts for merge of 3ee9dc58 to master
Change-Id: Idd045d01246367b77718210c8b6665110da58ac4
2014-04-16 14:18:49 -07:00
Jeff Davidson
dd6fd1e62b Class for managing the active scorer application.
Allows listing all possible scorer apps, getting the active scorer
app, setting the active scorer app, and determining whether a given
UID is for the active scorer.

Note that setting a default scorer with a system image will be handled
separately - the plan here is to add a read-only build property
containing a package name to use as the scorer out of the box.
When NetworkScorerService is initialized, it will check a provisioning
bit; if that bit isn't set, it will set the current scorer to the
package specified in this build property (if any) and set the
provisioning bit to true.

Bug: 13769362
Change-Id: I18c0b2ba2aceccc88b70c3611a49149e0bf17ecf
2014-04-16 14:17:01 -07:00
Adam Powell
e5244b5638 Add isRound to WindowInsets
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.

Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.

Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e
2014-04-16 13:59:00 -07:00
Jeff Brown
3ee9dc58e5 am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev
* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.
2014-04-16 20:52:24 +00:00
Jeff Brown
fa72a9eaae Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev 2014-04-16 20:49:15 +00:00
Craig Mautner
4f2f1f3a84 am 934ef057: am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '934ef05799532b75d349338c4300671cec1ab162':
  Fix ActivityContainer callback parcelling.
2014-04-16 20:27:15 +00:00
Jeff Brown
1c3f332c3f Declare VersionCodes.KITKAT_WATCH.
The constant does not have a final value yet but is useful for
documentation purposes during development.

Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
2014-04-16 13:27:00 -07:00
Craig Mautner
934ef05799 am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
  Fix ActivityContainer callback parcelling.
2014-04-16 20:13:09 +00:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
2014-04-16 20:10:26 +00:00
Craig Mautner
2fd3cb9544 Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 2014-04-16 20:05:31 +00:00
Craig Mautner
e3a00d745f Fix ActivityContainer callback parcelling.
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.

Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
2014-04-16 13:03:26 -07:00
Deepanshu Gupta
35d46778f4 resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
2014-04-16 12:14:34 -07:00
Jeff Davidson
eec3c36c09 am 34de7a83: Merge "Stub APIs for network scoring."
* commit '34de7a83033c65f28626aaa9762a91a1646d2486':
  Stub APIs for network scoring.
2014-04-16 19:10:07 +00:00
Jeff Davidson
b51e0a6c4b Stub APIs for network scoring.
NetworkScoreManager defines all interactions between the framework and
the scorer app. An ACTION_SCORE_NETWORKS broadcast is sent to the
default scorer with any unscored networks, which responds by calling
updateScores() with scores for those networks. An app may also check
whether they are currently the default scorer with
getDefaultScorerPackage() and request to become the default via the
ACTION_CHANGE_DEFAULT broadcast.

Bug: 13786258
Change-Id: Id3dc0f7c1109f0e3afd73356e2475b7f34167419
2014-04-16 11:55:14 -07:00
Deepanshu Gupta
ec6676ddf6 am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '863848808d005fe1d2fd84a2982adfc02a3fbb9f':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-04-16 18:40:55 +00:00
Deepanshu Gupta
f2d085e867 am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]
* commit 'd023360aa03db1a7831a5697d49faa2575e4a9c3':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-04-16 18:39:25 +00:00
Deepanshu Gupta
863848808d am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit 'f1e7187645f0b0388f7b97d742395efd228b347a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-04-16 18:37:10 +00:00