Deepanshu Gupta
904d77118b
am 7b561be3: am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '7b561be3a6fedebfce412cecd8c36d6686f6576c':
Fix SystemProperties in LayoutLib.
2014-08-06 22:45:23 +00:00
Deepanshu Gupta
7b561be3a6
am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
Fix SystemProperties in LayoutLib.
2014-08-06 22:37:10 +00:00
Deepanshu Gupta
09c3c2edb2
am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit 'ba31d628621f3d49195d141dabff30a7665f3b50':
Fix SystemProperties in LayoutLib.
2014-08-06 22:30:06 +00:00
Deepanshu Gupta
ba31d62862
am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit 'db94ea9ed03dbaa0ca075a433a986d7e414e8f8d':
Fix SystemProperties in LayoutLib.
2014-08-06 22:25:50 +00:00
Deepanshu Gupta
db94ea9ed0
am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit 'f970d2c201649843b8d51d094b865f16b15bc0bc':
Fix SystemProperties in LayoutLib.
2014-08-06 22:21:54 +00:00
Deepanshu Gupta
f970d2c201
am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.
2014-08-06 22:18:04 +00:00
Deepanshu Gupta
79c3f678d2
am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '206c691bfdb3a6b78d35c7481365980dd387b8c9':
Fix SystemProperties in LayoutLib.
2014-08-06 22:13:18 +00:00
Deepanshu Gupta
206c691bfd
am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '72cf03a27a73e91d4a3eabf74e0384b310f4a5b2':
Fix SystemProperties in LayoutLib.
2014-08-06 22:09:13 +00:00
Deepanshu Gupta
72cf03a27a
am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
Fix SystemProperties in LayoutLib.
2014-08-06 22:05:38 +00:00
Deepanshu Gupta
3a544a81b3
resolved conflicts for merge of a232a68d to jb-mr1.1-docs
...
Change-Id: I1ea220e3e0a81880db68abab87beab56dc4a336c
2014-08-06 15:00:14 -07:00
Deepanshu Gupta
a232a68d4c
resolved conflicts for merge of 5476cfee to jb-mr1-dev
...
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
2014-08-06 14:41:02 -07:00
Deepanshu Gupta
5476cfee6b
am 505c675c: Fix SystemProperties in LayoutLib.
...
* commit '505c675c3a536ac7c6ad264eb62542537532119c':
Fix SystemProperties in LayoutLib.
2014-08-06 21:28:24 +00:00
Alan Viverette
b1de5a59be
Merge "Separate tint and tintMode properties" into lmp-dev
2014-08-06 17:19:40 +00:00
Andres Morales
6429f313b4
Allow PersistentDataBlockService to be used with all users
...
Bug: 16795591
Change-Id: Id5e5dc5c26408752fe85f6f6fc2c67d9408b6a2a
2014-08-06 23:41:20 +00:00
Chris Craik
af046ab637
Update radial gradient doc
...
bug:16838331
Clarify positions parameter, and naming of several others.
Change-Id: I6096d26deaada717b52d924cd53e852b3c31626f
2014-08-06 23:25:09 +00:00
Alan Viverette
a426445dfd
Separate tint and tintMode properties
...
BUG: 16054922
Change-Id: I820fb857b671faf9eb27612e470e820c5c4cd6b5
2014-08-06 15:42:10 -07:00
John Reck
dc0349beba
Add missing null check
...
Bug: 16352267
Change-Id: Ib60baa6d22ec02ba623a297660e2e3ecc7557d0f
2014-08-06 22:28:47 +00:00
ztenghui
33559c96ad
Merge "MiterLimit represent a ratio itself, no need to scale" into lmp-dev
2014-08-06 17:19:40 +00:00
ztenghui
c4d651ec8a
MiterLimit represent a ratio itself, no need to scale
...
Change-Id: I474d8c29fc28786c6b3ff88848c1c802ab76d77c
2014-08-06 20:07:04 +00:00
Yao Chen
dc33b6170b
Merge "Adds getServiceComponent() to MediaBrowser, getQueueTitle() and getExtras() to MediaController" into lmp-dev
2014-08-06 17:19:40 +00:00
Yao Chen
51fdfa273e
Adds getServiceComponent() to MediaBrowser, getQueueTitle() and
...
getExtras() to MediaController
Change-Id: I6092ac1ae05ba55c14a042698bb88bd16e9b1fa7
2014-08-06 14:10:41 -07:00
Eric Laurent
b287c9388e
Merge "AudioSystem: add API to query audio HW sync source" into lmp-dev
2014-08-06 17:14:55 +00:00
Chet Haase
54b9e5baa3
Fix Scroller interpolation
...
The ViscousFluid interpolator simply returns the input value and not the
interpolation of that value.
Issue #16815073 Scroller.ViscousFluidInterpolator short circuited
Change-Id: Ifa189026c1396a42a2348260a2a54cf0c3caad08
2014-08-06 19:34:56 +00:00
Christopher Tate
4cf9f007e6
Add event logs for full backup/restore milestones
...
Bug 16689703
Change-Id: If870f1b7b9cb3929ac1edc38affc688a37c2acfd
2014-08-06 19:24:33 +00:00
Matthew Xie
4565ded1a2
Merge "Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access" into lmp-dev
2014-08-06 02:12:24 +00:00
ztenghui
d1c89b1dd6
Add stroke related test to the VectorDrawableTest
...
Change-Id: I7dceebd58d9365cf8e2a31dfeec418aa439bacb6
2014-08-06 18:07:16 +00:00
Dan Sandler
52e5701eea
Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure.
...
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
2014-08-06 18:00:53 +00:00
Matthew Xie
6b93229a21
Add BLUETOOTH_MAP permission to give Bluetooth app exclusive access to email access
...
The permission is hidden. It's for Bluetooth app only. We may unhide it in the future.
Change-Id: Ibc6f7b71f0c79dc282a8e5fdc786e1c16be7a892
2014-08-06 00:11:05 -07:00
Deepanshu Gupta
505c675c3a
Fix SystemProperties in LayoutLib.
...
Not all System Properties were used via Build class. Also, properties
like SDK_INT which called SystemProperties directly were not initialized
properly.
This change is essentially cherry picking of the relevant parts from the
following commits:
984749bf75c9ce9d3401b8410ea7d6276544b6ee
167bc25bceea9280bbe4858db4cb8233f86ce325
Bug: http://b.android.com/73046
Change-Id: Ia0fb467ee6d5fdedda500d57d02be20006f115df
2014-08-05 17:47:30 -07:00
Eric Laurent
b634e1b6d6
AudioSystem: add API to query audio HW sync source
...
Add a method to query from the audio HAL the HW sync
source used for a given audio session.
Add an AudioAttributes flag to request an output with
HW sync source.
Bug: 16132368.
Change-Id: Ic31b2924b98f242c3aa0d58688879f05ea02d6f7
2014-08-05 16:56:12 -07:00
Andrew Lee
6d0da249ab
Merge ""Implement" formerly abstract methods VideoCallProvider." into lmp-dev
2014-08-05 00:29:22 +00:00
Andrew Lee
1f6bbd2920
"Implement" formerly abstract methods VideoCallProvider.
...
Provide null-op methods so there is greater flexibility for classes
which extend this base class, but might not support all its methods.
In the future, if we add more methods to the *.aidl interface, this
class can work with binaries which extend this class but don't
implement all the methods since the superclass now implements those
methods.
Left onSetPreviewSurface and onSetDisplaySurface as abstract.
Bug: 16842159
Change-Id: Ie7fea6ef5d473e3924ef370392f380603a568800
2014-08-06 14:37:06 -07:00
ztenghui
06eaf193bd
End the animator when stop() is called
...
bug:16830053
Change-Id: If27ba904b0f78ee8c59df3522a97f5f86509ca0e
2014-08-06 21:23:08 +00:00
Chris Craik
796475006f
Move bitmap transforms out of bitmap ops
...
bug:11359533
This allows us to deduplicate a lot between the two ops, and fixes the
shader coordinate space for the left,top argument drawBitmap to match
software.
Change-Id: I53da05af9ee74c74e9e70b4ab8053190ca220b16
2014-08-06 21:11:31 +00:00
Mathieu Chartier
d1a7fca145
Fix JNI error in exception reporting.
...
There was a JNI error where when you got an OOM and called
report_exception, it would call two NewStringUTF in a row without
checking the return values. This could mean that the first one
threw a new OOME and the second one would cause a JNI error when
it also attempted to throw an OOME with a pending OOME.
Bug: 16843627
(cherry picked from commit cf6775eece8628ac069a6d4803e7f20a017e7e62)
Change-Id: Ibdc7d0e55a48b2a61a1db0868a5d77c2ae53f6f3
2014-08-06 14:01:09 -07:00
John Reck
cd3a22cfec
Don't start RenderThread to do trimMemory
...
Bug: 16825138
Change-Id: I35f57898b14bc8526c3d93a3003bca6f5a3d7fbe
2014-08-06 20:39:47 +00:00
Igor Murashkin
5bd43d7145
Merge "camera2: (legacy) Support awb mode, test mode metadata keys" into lmp-dev
2014-08-06 17:19:40 +00:00
Igor Murashkin
733341bf0d
camera2: (legacy) Support awb mode, test mode metadata keys
...
Change-Id: Ic013aa820bbea02a662d546eb9f70baa20c0136e
2014-08-06 14:35:40 -07:00
Geoff Mendal
ea844f92a3
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-05 00:29:22 +00:00
Geoff Mendal
1375bf9316
Import translations. DO NOT MERGE
...
Change-Id: Ifcaa00a5e222bebdd9d9d2608d0c4fdeed236c42
Auto-generated-cl: translation import
2014-08-06 10:37:51 -07:00
Alexandra Gherghina
ff40ed3f8c
Merge "Fix resetAllModes call to act only on the calling user" into lmp-dev
2014-08-05 00:35:13 +00:00
Daniel Sandler
41da5ff98f
Debugging bad notification sorts.
...
Bug: 16626175
Change-Id: I6cc7ee5f853c846e3aed6f9750e8fb6bc5aed699
2014-08-06 13:26:04 +00:00
Jason Monk
256a22663d
Turn off/on wifi to correspond with hotspot
...
Add logic to act the same way Settings does. Without this sometimes
wifi is in the wrong state (on) and the hotspot wont turn on.
Bug: 16818232
Change-Id: Iaa7950a1c2097cfd798eddb604b49b3a152f1260
2014-08-06 13:04:06 +00:00
Sungsoo Lim
0831de10c8
Merge "TIF: Add a content rating system for Brazil" into lmp-dev
2014-08-05 00:07:36 +00:00
Sungsoo Lim
b4bbfbcef3
TIF: Add a content rating system for Brazil
...
- Add Brazil TV content ratings
- Remove Italy TV content rating since it doesn't have the official one.
References:
http://en.wikipedia.org/wiki/Brazilian_Advisory_Rating_System
http://portal.mj.gov.br/services/DocumentManagement/FileDownload.EZTSvc.asp?DocumentID=%7B25A80220-B0E3-47FD-923F-246B6184C3C6%7D&ServiceInstUID=%7B59D015FA-30D3-48EE-B124-02A314CB7999%7D
Change-Id: Ibed9b4be0871b50b9dcd95be3a015f5a1e58676d
2014-08-06 21:33:56 +09:00
Wonsik Kim
a08c1f6af4
Merge "TIF: fix JTvInputHal::removeStream issue" into lmp-dev
2014-08-04 23:56:40 +00:00
Wonsik Kim
b82de3600f
TIF: fix JTvInputHal::removeStream issue
...
Bug: 16803334
Change-Id: I3f92a12479cdded7a3bf572cc59e68367a0797ad
2014-08-05 07:30:51 +00:00
Jason Monk
e069779dea
When exiting lock task require authentication
...
When exiting lock task with screen locking on make sure to notify
that the credentials need to be entered again.
Bug: 16496374
Change-Id: I891a8a8a04a67aa70eba8ea78bd585ad0dd17808
2014-08-04 23:50:06 +00:00
John Reck
d2a9363208
Merge "clamp & round alpha" into lmp-dev
2014-08-04 23:48:34 +00:00
Fabrice Di Meglio
52ab18bc6c
Make SwitchPreference switch more Material
...
- remove the padding so that we behave the same way as the CheckBoxPreference
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Ie22f389820c4a48bcf4b018d7009a07140cb493b
2014-08-06 17:21:16 +00:00