Commit Graph

34897 Commits

Author SHA1 Message Date
Selim Gurun
f014f1569d am 5579eb9b: Merge "Support for new gTLDs"
* commit '5579eb9b1664343804b24378a71fc38607284ac6':
  Support for new gTLDs
2014-03-26 23:33:38 +00:00
Selim Gurun
5579eb9b16 Merge "Support for new gTLDs" 2014-03-26 21:42:52 +00:00
Glenn Kasten
dc0f2be939 am 1ee4eb07: Merge "Revert "Expand install observer semantics""
* commit '1ee4eb074c2d85148658e93e865a18834bdced72':
  Revert "Expand install observer semantics"
2014-03-26 13:05:12 -07:00
Glenn Kasten
1ee4eb074c Merge "Revert "Expand install observer semantics"" 2014-03-26 20:00:11 +00:00
Glenn Kasten
7629a18a3f Revert "Expand install observer semantics"
This reverts commit ab8a501f25.

Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
2014-03-26 19:59:48 +00:00
Alan Viverette
79ebf68c67 am 460572b2: Merge "Fix attribute extraction, use color attrs in Quantum drawables"
* commit '460572b22fe8fe5880ad099090b38765e2f8a2f6':
  Fix attribute extraction, use color attrs in Quantum drawables
2014-03-26 12:56:19 -07:00
Alan Viverette
460572b22f Merge "Fix attribute extraction, use color attrs in Quantum drawables" 2014-03-26 19:50:49 +00:00
Alan Viverette
1cd4612cc0 Fix attribute extraction, use color attrs in Quantum drawables
Removes some unused entries in the Quantum themes and styles and
collapses identical styles since we don't have separate drawables
anymore. Adds some Quantum text appearances as styles.

BUG: 12368046
Change-Id: I9334feb87391cd54ad3b77b297d135de436e1417
2014-03-26 12:33:48 -07:00
Christopher Tate
cfe34117bc am 9067dc03: Merge "Expand install observer semantics"
* commit '9067dc03ffc76c5210d26d5a53a211eff046d412':
  Expand install observer semantics
2014-03-26 12:29:19 -07:00
Christopher Tate
9067dc03ff Merge "Expand install observer semantics" 2014-03-26 19:24:09 +00:00
John Spurlock
f811f917ba am 1dd9c53a: Merge "Zen mode updates."
* commit '1dd9c53a40b7c147767c63e10a47eb5cb6f8e197':
  Zen mode updates.
2014-03-26 10:45:59 -07:00
Chris Craik
4b1e94e2af am 62828dfc: Merge "Add private circular reveal API on View/RenderNode"
* commit '62828dfca2b009d42a414b60117d7f34034841f8':
  Add private circular reveal API on View/RenderNode
2014-03-26 10:45:56 -07:00
John Spurlock
1dd9c53a40 Merge "Zen mode updates." 2014-03-26 17:44:16 +00:00
John Spurlock
eeb397b77f Zen mode updates.
- Now only two modes, no more ZEN_MODE_FULL.
 - Alarms are allowed by default.
 - Interstitial dialog cleanup to follow current UX.

Change-Id: I8e4c8f64854dabfef69ad33b3eb35bee07e55ef7
2014-03-26 13:41:54 -04:00
Chris Craik
62828dfca2 Merge "Add private circular reveal API on View/RenderNode" 2014-03-26 17:40:32 +00:00
Christopher Tate
ab8a501f25 Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission.

We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.

Bug 13551375

Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
2014-03-25 19:28:54 -07:00
Svetoslav
bc211274a7 am 8a2b46d5: Merge "Wrong constant used for undefined accessibility window id."
* commit '8a2b46d535e28c102b972407faa866cd15246445':
  Wrong constant used for undefined accessibility window id.
2014-03-25 17:31:36 -07:00
Svetoslav
8a2b46d535 Merge "Wrong constant used for undefined accessibility window id." 2014-03-26 00:28:27 +00:00
Svetoslav
cbcc9695f0 Wrong constant used for undefined accessibility window id.
Change-Id: I8b14db034a42a7ffd211a46fa3fee7bf2a6eac8f
2014-03-25 17:27:37 -07:00
Chris Craik
8c271ca63b Add private circular reveal API on View/RenderNode
Change-Id: I139c8e12b354083149a665f6768f3f6931a8dd15
2014-03-25 16:03:48 -07:00
Kenny Root
590ab7793c am 6ab41d71: am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit '6ab41d71eb9acbe07257c6cf208d662de82cc22e':
  Use X509ExtendedTrustManager and not Conscrypt
2014-03-25 14:32:46 -07:00
Kenny Root
6ab41d71eb am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit '266de3efcd4b57ba3b301d87ff0fb692090d9a95':
  Use X509ExtendedTrustManager and not Conscrypt
2014-03-25 21:23:18 +00:00
Zhijun He
993b9646d7 am aaad0047: Merge "Camera2: Add partial flash state"
* commit 'aaad0047a6c2e7478312b85ebab275a3578ec4c2':
  Camera2: Add partial flash state
2014-03-25 13:58:57 -07:00
Zhijun He
aaad0047a6 Merge "Camera2: Add partial flash state" 2014-03-25 20:54:55 +00:00
Adam Lesinski
fe08a4447f am 7f3b7116: Merge "Shared library resource support"
* commit '7f3b7116b78ca108f64ca2f5d57515793ef9fd02':
  Shared library resource support
2014-03-25 13:51:52 -07:00
Zhijun He
8dda7273db Camera2: Add partial flash state
Bug 13637334

Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
2014-03-25 13:49:30 -07:00
Sailesh Nepal
00ffde305d resolved conflicts for merge of 2d72d000 to master-nova
Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d
2014-03-25 13:02:59 -07:00
Adam Lesinski
de898ff429 Shared library resource support
Shared libraries can now export resources for applications
to use.

Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.

Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.

Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.

At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.

See /tests/SharedLibrary/ for examples of a shared library and its
client.

Bug:12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
2014-03-25 12:09:56 -07:00
Kenny Root
dd3e639909 am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit 'c1d863e7a4b55f8e583067eebaffc6686723d7ab':
  Use X509ExtendedTrustManager and not Conscrypt
2014-03-25 19:09:27 +00:00
Gabriel Peal
2d72d00093 Merge "resolved conflicts for merge of 74fb97de to master" 2014-03-25 18:32:23 +00:00
Chris Craik
fa1ce103c6 am c21929c7: Merge "Fix doc build"
* commit 'c21929c710949a48790fa2701c47cedfabb7b9dc':
  Fix doc build
2014-03-25 11:12:23 -07:00
Chris Craik
c21929c710 Merge "Fix doc build" 2014-03-25 18:08:30 +00:00
Gabriel Peal
f1e1e77143 resolved conflicts for merge of 74fb97de to master
Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a
2014-03-25 11:08:19 -07:00
Chris Craik
f975823773 Fix doc build
Change-Id: I18627229be3e8e242e469af83e7e5ae580b03707
2014-03-25 11:06:58 -07:00
John Reck
7adcd56a4e am bcad68ad: Merge "Move where updateProperties is called"
* commit 'bcad68ad80e5a44e5dc6988eddb8acabdc01a737':
  Move where updateProperties is called
2014-03-25 10:51:42 -07:00
John Reck
bcad68ad80 Merge "Move where updateProperties is called" 2014-03-25 17:46:18 +00:00
Przemyslaw Szczepaniak
7c31572061 am 0a8596dc: Merge "Documentation update for TextToSpeech#getFeatures"
* commit '0a8596dc0c497404a332ae990b2bd77553cde870':
  Documentation update for TextToSpeech#getFeatures
2014-03-25 03:44:21 -07:00
Przemyslaw Szczepaniak
0a8596dc0c Merge "Documentation update for TextToSpeech#getFeatures" 2014-03-25 10:40:19 +00:00
John Reck
bfb07a0377 Move where updateProperties is called
Change-Id: I27da448996019094c44487ce28c5689d098d6535
2014-03-24 21:00:18 -07:00
Gabriel Peal
4668f1ed0d am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit '8ee4491dc80943429cd79d0c7b87c28056067a58':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-25 03:54:11 +00:00
Gabriel Peal
8ee4491dc8 am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* commit 'e05077d78c9abde054a754db53e71c647b9a705c':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
2014-03-25 03:46:17 +00:00
Michael Wright
4d646f66de am 5da8ca91: Merge "Respect ACTION_CANCEL for joystick fallbacks"
* commit '5da8ca918967b7100b8f7927c08075e4555347ab':
  Respect ACTION_CANCEL for joystick fallbacks
2014-03-24 18:53:52 -07:00
Michael Wright
5da8ca9189 Merge "Respect ACTION_CANCEL for joystick fallbacks" 2014-03-25 01:48:06 +00:00
Alan Viverette
d3d6f4a8c7 am 9bbbee11: Merge "Implement APIs for obtaining, caching themed Drawables"
* commit '9bbbee116e5d480c56676686b96e86e2ef7d83ca':
  Implement APIs for obtaining, caching themed Drawables
2014-03-24 18:30:18 -07:00
Alan Viverette
9bbbee116e Merge "Implement APIs for obtaining, caching themed Drawables" 2014-03-25 01:26:15 +00:00
Alan Viverette
52b999f072 Implement APIs for obtaining, caching themed Drawables
When Drawables are inflated during preload (or otherwise without a theme)
they cache their themeable attributes in their constant state as an array
keyed on attribute index. Drawables inflated with a theme will simply
resolve theme attributes as part of normal inflation, and they will not
cache any themeable attributes.

Drawables obtained from Resources are pulled from theme-specific cache
when possible. If an unthemed Drawable exists in the preload cache, a
new constant state will be obtained for the Drawable and the theme will
be applied by resolving the cached themeable attributes and overwriting
their respective constant state properties. If no cached version exists,
a new Drawable is inflated against the desired theme.

Constant states from themed drawables may be cached if the applied theme
is "pure" and was loaded from a style resource without any subsequent
modifications.

This CL does not handle applying themes to several Drawable types, but it
fully supports BitmapDrawable, GradientDrawable, NinePatchDrawable,
ColorDrawable, and TouchFeedbackDrawable.

BUG: 12611005
Change-Id: I4e794fbb62f7a371715f4ebdf946ee5f9a5ad1c9
2014-03-24 18:00:26 -07:00
Michael Wright
9adca06514 Respect ACTION_CANCEL for joystick fallbacks
Also change MotionEvent.PointerCoords bit packing and unpacking
methods to be consistent with BitSets which are now used on the
native PointerCoords object.

Bug: 11480300
Change-Id: Ic6c7ebda5c545d07ea1ed259ca1f1184ccf85f29
2014-03-24 17:33:29 -07:00
Ruben Brunk
4b56fe3fd8 am 0dfdcb10: Merge "camera3: Update whiteLevel/greenSplit docs."
* commit '0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9':
  camera3: Update whiteLevel/greenSplit docs.
2014-03-24 17:17:31 -07:00
Ruben Brunk
0dfdcb1019 Merge "camera3: Update whiteLevel/greenSplit docs." 2014-03-25 00:12:21 +00:00
Ruben Brunk
e89b120eae camera3: Update whiteLevel/greenSplit docs.
Bug: 13191430
Change-Id: I61cab65da546bdf1a748f46c28b6fce218b27bc4
2014-03-24 17:10:35 -07:00