Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,034 Commits 3 Branches 0 Tags
198ab3cf6cc4451ae1087a2f4e5e0d506b1df8d0
Commit Graph

34920 Commits

Author SHA1 Message Date
Matt Casey
198ab3cf6c am ca04d718: Merge "Add a mediastore constant for playlists." 
* commit 'ca04d7185369073ca0a291f37ec3680037711d44':
  Add a mediastore constant for playlists.
 2014-03-27 15:46:59 +00:00
Matt Casey
ca04d71853 Merge "Add a mediastore constant for playlists." 2014-03-27 15:43:19 +00:00
Jorim Jaggi
9451c34474 am 73581eff: Merge "Move legacy notification processing to Notification.Builder" 
* commit '73581effb0b4029961501c6f699e95a9930ea1e6':
  Move legacy notification processing to Notification.Builder
 2014-03-27 14:30:58 +00:00
Jorim Jaggi
73581effb0 Merge "Move legacy notification processing to Notification.Builder" 2014-03-27 14:25:17 +00:00
Jorim Jaggi
5c2d84675b Move legacy notification processing to Notification.Builder 
Bug: 13485610
Change-Id: I5466d3dbc328c77876dc701c17e7a5a06777dbbe
 2014-03-27 12:08:55 +01:00
Matt Casey
8cecb901fb am a0149568: Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register." 
* commit 'a0149568f2eab12427448fd85cde30dcef1f50b8':
  Update doc for ACTION_HEADSET_PLUG to mention explicit register.
 2014-03-27 00:29:18 +00:00
Kenny Root
49597825f1 am 0072a417: am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '0072a417f1672098f3abb6a4b7203463ccea4dd3':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-27 00:22:09 +00:00
Matt Casey
a0149568f2 Merge "Update doc for ACTION_HEADSET_PLUG to mention explicit register." 2014-03-27 00:20:24 +00:00
Kenny Root
0072a417f1 am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '1dc1d6b22deb38d78960f3ce89f94e536610492e':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-27 00:17:47 +00:00
Kenny Root
1dc1d6b22d am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustManagerFactory" 
* commit '5b93685af37d840e7ef6d415bcfe8a8a4c004032':
  CertificateChainValidator: initialize TrustManagerFactory
 2014-03-27 00:10:41 +00:00
Matt Casey
1dbf1f81e2 Add a mediastore constant for playlists. 
This is a followup to https://googleplex-android-review.git.corp.google.com/415218

I'm writing this change at the request of elmas@.

Bug: 13657009
Change-Id: I970cc59a33af2162c2488c4ddf628f7a73009cd6
 2014-03-26 17:09:56 -07:00
Selim Gurun
1280f9285a am 5632dc1c: Merge "Revert "Support for new gTLDs"" 
* commit '5632dc1cf0b4bded368dd53ab425e725f37dfeb8':
  Revert "Support for new gTLDs"
 2014-03-26 23:43:37 +00:00
Paul Lawrence
96a6b115c1 am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decrypting" 
* commit '6ee7d25010d4f23b44a151f3953225ba253de8af':
  Revert "Don't prompt at boot if we already did that when decrypting"
 2014-03-26 23:43:32 +00:00
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
5632dc1cf0 Merge "Revert "Support for new gTLDs"" 2014-03-26 22:37:24 +00:00
Selim Gurun
a739994d60 Revert "Support for new gTLDs" 
This reverts commit d3ff8bdf92.

Change-Id: I2006c4fcca54a4bc3b680ea0b0600b359cac6ca3
 2014-03-26 22:33:49 +00:00
Paul Lawrence
6ee7d25010 Revert "Don't prompt at boot if we already did that when decrypting" 
This reverts commit 493e3e7e65.

Should fixes

Bug: 13611885
Bug: 13656830
Change-Id: I117c988bb6679f44f8add4fcc18f45cb8238dfb4
 2014-03-26 22:31:04 +00:00
Matt Casey
79867f5981 Update doc for ACTION_HEADSET_PLUG to mention explicit register. 
Copied the documentation from other similar actions that have the
same behavior.

AudioService.java has
 intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
for this action.

Change-Id: I79736f8146bd6b72d01034be428e83b5841c73fa
 2014-03-26 15:20:25 -07: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
Kenny Root
587a9455de CertificateChainValidator: initialize TrustManagerFactory 
Need to call TrustManagerFactory#init before use. I suspect this class
isn't used anywhere since this hasn't caused a problem yet.

Change-Id: I17425d0bba4795d71960062361a755830abba7de
 2014-03-26 08:40:45 -07: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
Eino-Ville Talvala
63d61640d4 am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '55a1e78fbd38955a5f5d0f09a517b392cc8199cb':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:15:52 +00:00
Eino-Ville Talvala
55a1e78fbd am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:11:12 +00: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
Eino-Ville Talvala
1555cec2e5 am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit 'ecad0541a6e90b98ad96456c4e6992121ee8a789':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 19:01:45 +00:00