Jean-Michel Trivi
bc9a5a0fb7
Merge "Continue refactoring MediaFocusControl"
2014-03-26 21:00:46 +00:00
Jean-Michel Trivi
e80ba69d79
Merge "Continue refactoring of MediaFocusControl"
2014-03-26 21:00:26 +00:00
quddusc
d43c13009c
docs: Fixed url to point to Google Analytics v4 Getting Started guide.
...
Change-Id: I4be35af686fcf3613f391c0c886728e5c19f22e6
2014-03-26 13:53:41 -07:00
Mark Salyzyn
0046b16ec7
am 959bce3e: am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"
...
* commit '959bce3e69b4eb5dcba9ec48d92f21002f9c13b3':
jni: 64-bit compile issue
2014-03-26 20:08:00 +00:00
Ricardo Cervera
6519d853c4
am 39d1b3f0: am a8d12f76: am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
...
* commit '39d1b3f0b887f37555924cc3737347b2c4044ce9':
docs: Added release notes for Support Library 19.1.0
2014-03-26 20:04:05 +00:00
Mark Salyzyn
959bce3e69
am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"
...
* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
jni: 64-bit compile issue
2014-03-26 20:00:13 +00: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
Mark Salyzyn
4e3abafc94
am 5daf51c0: Merge "jni: 64-bit compile issue"
...
* commit '5daf51c0fe6d5bea858c37291fed88bd3094d3ec':
jni: 64-bit compile issue
2014-03-26 12:56:02 -07:00
Ricardo Cervera
39d1b3f0b8
am a8d12f76: am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
...
* commit 'a8d12f764ccf85da52b82d6726c4a2a12c475fcf':
docs: Added release notes for Support Library 19.1.0
2014-03-26 19:53:28 +00:00
Mark Salyzyn
5daf51c0fe
Merge "jni: 64-bit compile issue"
2014-03-26 19:52:11 +00:00
Alan Viverette
460572b22f
Merge "Fix attribute extraction, use color attrs in Quantum drawables"
2014-03-26 19:50:49 +00:00
Ricardo Cervera
a8d12f764c
am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
...
* commit '19a67a71d0105bb27472e26e5f5e0c8ef3a71dfd':
docs: Added release notes for Support Library 19.1.0
2014-03-26 19:47:38 +00:00
Ricardo Cervera
19a67a71d0
Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
2014-03-26 19:41:04 +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
2ab8525654
Import translations. DO NOT MERGE
...
Change-Id: I2a3bcccf660a5a5247b3f54a8a3783ddeae7ccfa
Auto-generated-cl: translation import
2014-03-26 11:50:47 -07:00
Ricardo Cervera
583080d87c
am 5d005ba9: am 3d093ea6: am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
...
* commit '5d005ba9a7e5d0bab8b1a8ce9b332e30fa3b5054':
docs: Added Android Studio build system doc.
2014-03-26 18:29:32 +00:00
Mark Salyzyn
aeb75fc5a3
jni: 64-bit compile issue
...
- switch to PRId64
- some unused parameter warning suppression
Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
2014-03-26 11:28:45 -07:00
Ricardo Cervera
5d005ba9a7
am 3d093ea6: am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
...
* commit '3d093ea69a488e4afd982a59273f0bf8c3474b5a':
docs: Added Android Studio build system doc.
2014-03-26 18:23:10 +00:00
Ricardo Cervera
3d093ea69a
am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
...
* commit 'e59a26650afbc664aeda08f7e69c2d135631c34d':
docs: Added Android Studio build system doc.
2014-03-26 18:16:35 +00:00
Ricardo Cervera
e59a26650a
am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
...
* commit '1b59f291573deb4c1d6f60035637a3c49e671ab4':
docs: Added Android Studio build system doc.
2014-03-26 18:11:33 +00:00
Ricardo Cervera
1b59f29157
Merge "docs: Added Android Studio build system doc." into klp-docs
2014-03-26 18:06:51 +00: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
Jean-Michel Trivi
564a0cd87c
Merge "Continue refactoring of MediaFocusControl"
2014-03-26 17:36:59 +00:00
Chris Wren
4c31999282
Merge "always clear the HeadsUpDecayTimer"
2014-03-26 17:09:55 +00:00
Chris Wren
7fd2a3bf6a
always clear the HeadsUpDecayTimer
...
for non-clearable heads up notifications,
a decay timer may be left in the queue
Bug: 13652819
Change-Id: I533db43484731922790f8501250b5a1ca7d4ba0b
2014-03-26 13:09:18 -04:00
Nick Kralevich
c76275377c
am 32cc40a9: am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
...
* commit '32cc40a9b57750451a6489e01526dc6a14d72bff':
Note libselinux dependency on packages.list format changes.
2014-03-26 16:36:33 +00:00
Nick Kralevich
32cc40a9b5
am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
...
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
Note libselinux dependency on packages.list format changes.
2014-03-26 15:55:41 +00:00
Nick Kralevich
fdd6351067
am 491eaf22: Merge "Note libselinux dependency on packages.list format changes."
...
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
Note libselinux dependency on packages.list format changes.
2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255
Merge "Note libselinux dependency on packages.list format changes."
2014-03-26 15:41:14 +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
Stephen Smalley
e6e25554d3
Note libselinux dependency on packages.list format changes.
...
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-03-26 09:19:12 -04: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
Dan Sandler
59f0258a27
Categorize some system notifications.
...
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
2014-03-26 01:31:04 +00:00
Adam Lesinski
a200414ffe
Merge "Use new build var to depend on an APKs resources"
2014-03-26 00:41:28 +00:00
Craig Mautner
d7dc6f77f7
am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
...
* commit '16744ac3f7b030f1192d298132256ac06eaff205':
Defer removal of activity until animation complete.
2014-03-26 00:32:14 +00: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
Craig Mautner
16744ac3f7
am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
...
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
Defer removal of activity until animation complete.
2014-03-26 00:26:03 +00:00
Jean-Michel Trivi
dda1c4040c
Continue refactoring MediaFocusControl
...
Rename MediaController to PlayerRecord.
Change-Id: Icf474b4107649f501341309bf7ec520aa1e71586
2014-03-25 17:25:25 -07:00
Craig Mautner
d1e32cd320
Merge "Defer removal of activity until animation complete." into klp-modular-dev
2014-03-26 00:21:56 +00:00
Scott Main
da5c13eb8a
am 57be1303: am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit '57be13035205a32707df94ceaf055ffa334d2852':
fix broken link
2014-03-26 00:12:20 +00:00
Scott Main
57be130352
am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit 'c3bcce5907553c6f006fc2c0ac74383f01647827':
fix broken link
2014-03-26 00:05:17 +00:00
Adam Lesinski
b0569b98d5
Use new build var to depend on an APKs resources
...
Some other projects use LOCAL_APK_LIBRARIES and don't yet
work with the new shared library changes.
Change-Id: Ibb54bc1b5e3eb1252cf5b4e45249b089d25854ac
2014-03-25 17:04:56 -07:00
Scott Main
c3bcce5907
am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit '01e68cabb523440382ef3a02a512f8ce3b8af287':
fix broken link
2014-03-25 23:58:10 +00:00
Scott Main
01e68cabb5
am ad52a4ce: Merge "fix broken link" into klp-docs
...
* commit 'ad52a4ce9964508288316bfc5fb52833bf70b6a5':
fix broken link
2014-03-25 23:53:24 +00:00
Craig Mautner
79e6578b6c
Defer removal of activity until animation complete.
...
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.
Fixes the ugly output associated with bug 13440426.
Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
2014-03-25 16:48:47 -07:00