48764 Commits

Author SHA1 Message Date
Narayan Kamath
22d074643e resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp
Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
2014-03-27 12:50:58 +00:00
Ashok Bhat
f5df700e6c AArch64: Make frameworks/base code more portable
Changes in this patch include

[x] Use %zu for size_t, %zd for ssize_t

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-03-27 12:30:42 +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
Dan Sandler
a55734aaed Introduce CATEGORY_NOTIFICATION_PREFERENCES.
Allows applications to advertise to the system an Activity
where the user can configure the app's notifications. Will
be used by the Settings app.

Change-Id: Iafe7de79e20046d5655fda3f3a3cba9f5db059c4
2014-03-27 00:34:44 -04:00
John Spurlock
4f0db5e23a Remove obsolete MultiWaveView
Change-Id: Ic878221c873d29577928aed2669f967851307e4d
2014-03-26 21:52:03 -04:00
Alan Viverette
a5df8067ec Make quantum text styles public
Change-Id: I6deab6eb712d0910cddf1e8daeddf4737d39ba58
2014-03-26 18:41:14 -07:00
Dianne Hackborn
27832b0e88 Fix build.
And prevent it from breaking again like this.

Change-Id: I68ca200714420ead41bdaa96fe320260ecddb426
2014-03-26 18:12:10 -07:00
Alan Viverette
2c5d6d742a Merge "Separate ripple animation logic, remove RevealDrawable" 2014-03-27 00:31:53 +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
John Hoford
49224acd78 Merge "add Dynamic Drawable (vector graphics for Icons)" 2014-03-27 00:14:14 +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
John Hoford
abb7d134c0 add Dynamic Drawable (vector graphics for Icons)
Change-Id: Id44b7f6d1b8dd073b8ed35e2142a380550f2449b
2014-03-26 16:59:54 -07:00
Alan Viverette
47bf0d95ef Separate ripple animation logic, remove RevealDrawable
Change-Id: I9d0370cea288e6caf518209b5bc94a66a0f9176f
2014-03-26 16:43:07 -07: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 d3ff8bdf92c23d596f3e4701455223f9e3ac8873.

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 493e3e7e6523fd94cc1acae3e45935a1227d58c3.

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
Michael Wright
1b10869f39 Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
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: Ib18c99b94ac555104c69eac526860aa501e89e03
2014-03-26 14:56:07 -07:00
Selim Gurun
5579eb9b16 Merge "Support for new gTLDs" 2014-03-26 21:42:52 +00:00
Michael Wright
1e3c93975e Adds API for determining confirm and cancel keys.
Bug: 13624048
Change-Id: I9f42eeb9c3a6bdae35eb0d7213fb4ac0fd8dc0d9
2014-03-26 14:40:42 -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 ab8a501f255b272af887acb0e66eb71cdf24c755.

Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
2014-03-26 19:59:48 +00: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
9067dc03ff Merge "Expand install observer semantics" 2014-03-26 19:24:09 +00:00
Baligh Uddin
13b4765155 Import translations. DO NOT MERGE
Change-Id: I817268227df02a844f82cca64c6e0abfdc0e7fbb
Auto-generated-cl: translation import
2014-03-26 11:37:57 -07:00
Baligh Uddin
b79bceeb6f Import translations. DO NOT MERGE
Change-Id: I4da32094b7c44f5042c276dc7dd2aef2132ffca9
Auto-generated-cl: translation import
2014-03-26 11:08:06 -07:00
Baligh Uddin
9ac253ffed Import translations. DO NOT MERGE
Change-Id: I9e363ec3f4253e6496f1c6cc6019bb807388e7f4
Auto-generated-cl: translation import
2014-03-26 11:06:02 -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
Andre Eisenbach
580b0a1302 LE: Add API to configure MTU for a given connection (3/4)
bug:13571470
Change-Id: I3619617eaf864701a35f7802bc71805784d768d0
2014-03-25 18:02:06 -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
Yuhao Zheng
10bf6354a5 Wifi hotspot stack initial hook up
Add a dummy wifi hotspot service for futher development use. This is to
resolve the different between master branch and kwd branch, such that future
development can go into kwd and being auto-merged to master.

bug: 5485670
Change-Id: Ica58de445dd050a9f0b817f8e4accaa2478299c5
2014-03-25 15:00:45 -07:00
Will Haldean Brown
a22b385777 am 7e98cee6: am f3f1c7a3: am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
* commit '7e98cee6c2e9770dab9133d7aad6e5affd4a7c40':
  Remove all but two micro themes, light and dark.
2014-03-25 21:58:01 +00:00
Will Haldean Brown
f3f1c7a334 am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
* commit '63d161e4ae57b61b33d77f4ea3c91279a6acb807':
  Remove all but two micro themes, light and dark.
2014-03-25 21:47:06 +00:00
Will Haldean Brown
63d161e4ae Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 2014-03-25 21:39:17 +00: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
aaad0047a6 Merge "Camera2: Add partial flash state" 2014-03-25 20:54:55 +00:00
Zhijun He
8dda7273db Camera2: Add partial flash state
Bug 13637334

Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
2014-03-25 13:49:30 -07:00
Will Haldean Brown
61e0965678 Remove all but two micro themes, light and dark.
Bug: 13434321
Change-Id: I201cb22e3fd7aa629f4d25004be6b4b9e05907a3
2014-03-25 13:38:33 -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
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