Alan Viverette
261208e002
Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
2015-05-05 16:50:29 +00:00
Alan Viverette
c1d527926e
Add API for obtaining changing configurations bitmask from Theme
...
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.
Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
2015-05-05 09:49:03 -07:00
Jean-Michel Trivi
28a516280a
Merge "AudioRecord JNI: use default UID / PID" into mnc-dev
2015-05-05 15:55:13 +00:00
Todd Kennedy
3266f60ba0
Merge "Call Activity#onAttachFragment()" into mnc-dev
2015-05-05 15:53:29 +00:00
Kenny Guy
e02b7868c6
Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev
2015-05-05 15:36:51 +00:00
Svet Ganov
4a64b19f23
Merge "Permission UI - legacy apps support" into mnc-dev
2015-05-05 15:34:10 +00:00
Svet Ganov
019d230499
Permission UI - legacy apps support
...
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
2015-05-05 08:33:04 -07:00
John Reck
c64b3fab95
Merge "Attempt to solve the double-GC problem" into mnc-dev
2015-05-05 14:50:50 +00:00
John Spurlock
0bc8afff7e
Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev
2015-05-05 14:42:03 +00:00
John Spurlock
d39af2d3f8
Zen: Remove calendar rule attendance attribute.
...
- No longer supporting a filter based on attendance type.
- Remove from model + condition provider logic.
Bug: 20064962
Change-Id: I0bc16275a2860ab95d4de316b6326a1499003f05
2015-05-05 09:49:32 -04:00
Seigo Nonaka
d4474cb945
Remove dead code from IMMS.
...
MSG_SHOW_IM_PICKER is no longer used. Also by removing that message, we
can simplify showInputMethodMenu/showINputMethodSubtypeMenu.
Change-Id: I7002ff063e490928309e9a9a0f6557ce3d12e6aa
2015-05-05 12:49:34 +09:00
Dirk Dougherty
08e474ca24
am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
...
* commit '08c72b91bedefbebe0547646544cd875c1062af0':
Doc change: merge landing page and header/footer designs.
2015-05-05 02:46:40 +00:00
Dirk Dougherty
08c72b91be
am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
...
* commit 'ecfed34d3e71bfceae11493b8441a051e803ec05':
Doc change: merge landing page and header/footer designs.
2015-05-05 02:34:51 +00:00
Dirk Dougherty
ecfed34d3e
Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs
2015-05-05 02:27:47 +00:00
Jean-Michel Trivi
60e1dc2e3e
AudioRecord JNI: use default UID / PID
...
Bug 20832981
Change-Id: I887e38a4e95c9f4b9360f831b3dfc0073d151706
2015-05-05 02:05:56 +00:00
Rich Slogar
703b5f895d
am 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
...
* commit '2f6261534b0916714715ffa9e2800716dd900eb8':
docs: Update Eclipse migrate procedure
2015-05-05 01:48:06 +00:00
Andrew Solovay
3e51aa3981
am 168bbcef: am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit '168bbcef02603b35b9fad53d923310b9a80acb5b':
Docs: New swipe-to-refresh training guide.
2015-05-05 01:48:00 +00:00
Prerepa Viswanadham
d1808401ca
Merge changes from topic 'mwd-merge-050415' into mnc-dev
...
* changes:
Merge commit 'b6f59f4' into master_merge
Merge commit 'f6db0ce' into master_merge
Merge commit '17455a3' into master_merge
Merge commit 'b4d5b32' into master_merge
Merge commit 'a1a2fa7' into master_merge
Merge commit '8dfdb98' into master_merge
Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Rich Slogar
2f6261534b
am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs
...
* commit '39220a7e924e659dffccd94ea7680f3ef8ac14b6':
docs: Update Eclipse migrate procedure
2015-05-05 00:59:34 +00:00
Andrew Solovay
168bbcef02
am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs
...
* commit '65241c66974053203a66c11cd27678b84f65691c':
Docs: New swipe-to-refresh training guide.
2015-05-05 00:59:30 +00:00
Yorke Lee
6526f67e45
Add hidden methods to set/get default dialer across users
...
First part of a set of changes to make the default dialer work
across multiple users. This initial CL should not affect any
user-facing behavior, just add new methods.
Bug: 20696062
Change-Id: If1651240e185b4c09e960260c822c9265069fb9a
2015-05-04 17:11:46 -07:00
Fabrice Di Meglio
44b60be189
Merge "Add user selectable Default Browser feature - part 5" into mnc-dev
2015-05-05 00:11:06 +00:00
Fabrice Di Meglio
7d1a9d0562
Add user selectable Default Browser feature - part 5
...
- check and clear default Browser if its package is no more available
See bug #20144393
Change-Id: I60a1b8f11058f3a4f9dc80440027ab72fe7cce2e
2015-05-04 17:06:33 -07:00
Adam Lesinski
5b1516900a
Merge "AAPT2: Add option to generate static library" into mnc-dev
2015-05-04 23:58:27 +00:00
Adam Lesinski
f713aa2f10
Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev
2015-05-04 23:57:22 +00:00
Adam Lesinski
247bc95cb3
Merge "AAPT2: Record public status in a more robust way" into mnc-dev
2015-05-04 23:56:24 +00:00
Adam Lesinski
2f519532ee
Merge "Add namespace handling in attribute values" into mnc-dev
2015-05-04 23:54:15 +00:00
Jorim Jaggi
f31a700364
Merge "Update emergency call button label when language changes" into mnc-dev
2015-05-04 23:51:21 +00:00
Robert Shih
5eac1da3bb
Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev
2015-05-04 23:50:07 +00:00
Jorim Jaggi
76511c75e6
Update emergency call button label when language changes
...
Bug: 17987231
Change-Id: I74fe6942f4ff965537803d61f3446d5f28a60f9e
2015-05-04 23:46:56 +00:00
Jorim Jaggi
9f74303eb8
Track unlock attempts per user.
...
Bug: 19330825
Change-Id: I3e09f676b945dbeee16dc0fb3cb126cb884a6934
2015-05-04 23:44:15 +00:00
Adam Lesinski
6d8e4c48f9
AAPT2: Add option to generate static library
...
Difference between normal app and static library is that
the R file uses non-final fields, and the extra chunks added
by AAPT2 remain in the final APK.
Change-Id: I61416387ca9bb3c21857ff7cfab5847ac3edf57a
2015-05-04 16:43:24 -07:00
Adam Lesinski
838a68705b
AAPT2: Include package name of attributes in styleable from another package
...
Change-Id: I44f902e297238e7ee4ae27c02aaaf9e148652d2a
2015-05-04 16:43:24 -07:00
Adam Lesinski
6ff19664f9
AAPT2: Record public status in a more robust way
...
This allows us to store the source and comments of a resource's
public declaration and avoids issues where there is no default
configuration for a publicly declared resource (like with drawables
of various densities) and AAPT2 mistakenly took this as an error.
Change-Id: I07a2fe9f551daefcce842f205fb219d2fa453ebc
2015-05-04 16:43:24 -07:00
Adam Lesinski
24aad163bc
Add namespace handling in attribute values
...
Previously, you could only reference namespace prefixes in attribute names:
<View xmlns:appcompat="http://schemas.android.com/apk/res/android.support.v7.appcompat "
appcompat:name="hey"
...
Now you can also reference them in resource names within an attribute value:
...
android:text="@appcompat:string/confirm"
...
Which will be treated as "@android.support.v7.appcompat:string/confirm".
Change-Id: Ib076e867a990c80cf877a704eb77cd1ef0b23b52
2015-05-04 16:43:24 -07:00
Robert Shih
98b6842e30
MediaPlayer: setSubtitleAnchor on a HandlerThread
...
This ensures that we wouldn't run into the error `Can't create handler
inside thread that has not called Looper.prepare` no matter on which
thread we attempt to set the SubtitleController internally.
Bug: 20821869
Change-Id: Ie53d60b58f5382428e7b7a01deccfa516b61b25f
2015-05-04 16:38:30 -07:00
Andre Eisenbach
ab2581398c
BluetoothSap class should not be public
...
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
2015-05-04 23:20:28 +00:00
Wei Jia
73b4a3303e
Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev
2015-05-04 23:14:17 +00:00
John Reck
f29ed28c7b
Attempt to solve the double-GC problem
...
Fix the issue where Bitmap requires two GC passes
to release its byte[] by using some questionable
ref-counting hacks to manage whether or not
native has a strong or weak ref to the byte[]
Change-Id: Ia90a883579f61c0b1904b5549a66bd0ef34b32c5
2015-05-04 16:05:12 -07:00
Wei Jia
d80d6f6b05
MediaSync: clean up configureAudioTrack and configureSurface.
...
Bug: 19666434
Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
2015-05-04 15:59:20 -07:00
Joe Fernandez
2dc05e22bd
am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs
...
* commit '722b509df505c156c71e95336b8059b8afcd8621':
docs: Android Developer Dashboard update - May 2015
2015-05-04 22:19:56 +00:00
Rich Slogar
3b7af8c9b4
am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions
...
* commit '0d13312552030dce0499fd9201c8e17b92aa8a4d':
2015-05-04 22:19:46 +00:00
Dirk Dougherty
41ef6ba4ce
am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove shadow.
...
* commit 'fd92db9c843042ab66f76d11a733493819d8c2c9':
Update N6 device art port image to remove shadow.
2015-05-04 22:19:39 +00:00
Rich Slogar
d5aa39cc0a
am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions
...
* commit '5bf92cbab9e6df7fb918c925fd506737a9e25c4e':
docs: sdk 24.2.0 revisions
2015-05-04 22:19:33 +00:00
Joe Fernandez
ed4331d29a
am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs
...
* commit '419aff0fd39c565d52c21a845e346c691f3ec4fb':
docs: M Preview mini site skeleton
2015-05-04 22:19:23 +00:00
Yang Ni
17c2d7a3e1
Sanity checks in JNI code for closure creation
...
b/20728113
In case the requested size for memory allocation overflows, or memory
allocation fails.
Change-Id: I8dac132dd4d0210938660ffbb82cbe44000d2a90
(cherry picked from commit 4e90b9b57cc96964a9d5c1845172a72cb51feafb)
2015-05-04 15:09:29 -07:00
George Mount
57436d3f7e
Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev
2015-05-04 22:08:03 +00:00
George Mount
f586c925d5
Fix potential NPE in internal isValidTarget method.
...
Bug 19805383
Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd
2015-05-04 15:01:55 -07:00
Andre Eisenbach
f455986a45
Add documentation for BluetoothSocket.getConnectionType()
...
Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b
2015-05-04 21:56:17 +00:00
George Mount
c81af1ca78
Merge "When returning, transition only existing shared elements." into mnc-dev
2015-05-04 21:48:56 +00:00