Andres Morales
ce3a35f41f
am 3df55fc3: NFC Unlock api changes
...
* commit '3df55fc32ec023f40a1cb22653d50915e05316c4':
NFC Unlock api changes
2014-07-31 01:13:48 +00:00
Andres Morales
11d2e53dc0
NFC Unlock api changes
...
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
2014-07-31 01:09:02 +00:00
destradaa
b9d8f99fdd
am 823ac05c: Add support for sources in Geofencing APIs.
...
* commit '823ac05cce1c324b8d9c8688b89a439fdfae6600':
Add support for sources in Geofencing APIs.
2014-07-30 23:42:50 +00:00
destradaa
f9a274c9b8
Add support for sources in Geofencing APIs.
...
Support setting the source when adding geofences.
b/14117199
Surface the source when FLP geofence changes state.
b/14119200
Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
2014-07-30 23:35:08 +00:00
Ruben Brunk
0c1a5a8d59
am e95f2a0e: camera2: Implement request templates for LEGACY.
...
* commit 'e95f2a0ee4f3062ca42dc4fc1c128172df651969':
camera2: Implement request templates for LEGACY.
2014-07-30 23:18:07 +00:00
Ruben Brunk
6a7d8c4289
camera2: Implement request templates for LEGACY.
...
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
2014-07-30 23:15:16 +00:00
Ruben Brunk
2b776ec710
am 3916e3ba: camera2: Add scene and effect mode for LEGACY.
...
* commit '3916e3ba989cae92246c35c02f8230bc2cdc2505':
camera2: Add scene and effect mode for LEGACY.
2014-07-30 22:15:04 +00:00
Ruben Brunk
3fe9eba904
camera2: Add scene and effect mode for LEGACY.
...
Bug: 15116722
Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
2014-07-30 22:09:41 +00:00
Behdad Esfahbod
6dea9bec3f
am 8bbd753a: Support FontFeatureSettings in Paint
...
* commit '8bbd753a20cc3fdcc4e92fb99e807b5a69cae6b2':
Support FontFeatureSettings in Paint
2014-07-30 21:42:22 +00:00
Behdad Esfahbod
805f6ebf17
Support FontFeatureSettings in Paint
...
New API is hidden.
Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
2014-07-30 21:38:23 +00:00
Andres Morales
8d249222c7
am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev
...
* commit 'bdb800965afbb3a4b94ed5a43ef3662d703ebb31':
Revert "NFC Unlock api changes"
2014-07-30 21:34:36 +00:00
Alan Viverette
0e0d9ac023
am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev
...
* commit '077daef9a28827318790f134adae6d8cd56fd1d3':
Update switch assets, fix SearchView asset 9-patch areas
2014-07-30 21:26:24 +00:00
keunyoung
d099c80959
am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev
...
* commit '4d2751c5596b9a8e85635db483ffd91091ccc557':
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
2014-07-30 21:26:20 +00:00
Andres Morales
cc4fe46e58
am 9fef5fbc: NFC Unlock api changes
...
* commit '9fef5fbcd6d47ef86823b3a2d82d34801f9be335':
NFC Unlock api changes
2014-07-30 21:21:22 +00:00
Andres Morales
131197aa6e
NFC Unlock api changes
...
Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed
2014-07-30 21:17:06 +00:00
Martijn Coenen
8330103ccf
am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev
...
* commit 'e5996ff428d5adb5d523878d67db347b1676b3bc':
Make some NFC APIs @systemAPI.
2014-07-30 21:16:45 +00:00
Raph Levien
8dbb94a899
am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev
...
* commit 'c4445abba696f199eca2ad9943b51e84d016d494':
Bump refcount of canvas created for Picture
2014-07-30 21:16:41 +00:00
Raph Levien
ed1e6962ba
Merge "Bump refcount of canvas created for Picture" into lmp-dev
2014-07-30 20:38:44 +00:00
Raph Levien
febccd05f2
Bump refcount of canvas created for Picture
...
Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.
Bug: 16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8
2014-07-30 13:41:10 -07:00
Christoph Studer
9226f8a3b2
am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev
...
* commit '6b8a27343fec2c72074adde1687d45d43fbb95d9':
SysUI: Display group children when no summary is present
2014-07-30 20:21:08 +00:00
Julia Reynolds
d133e05e5f
am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev
...
* commit '72746e415e325a9d54a19f8c82fdbd98b9d3658b':
API council - DISALLOW_APPS_CONTROL -- need better documentation.
2014-07-30 20:08:15 +00:00
Christoph Studer
0de6eb9db8
am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev
...
* commit '572532d089d15057c5e00a1d7fcf926d7555299f':
Strip RemoteViews from Notifications, re-create them in SysUI
2014-07-30 19:36:45 +00:00
Derek Sollenberger
f875fdf4fc
am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev
...
* commit '673af5582dda0d0cb8a3667fbadef747d22193f1':
Disable fallback chaining in Skia.
2014-07-30 19:36:41 +00:00
Andres Morales
e9a8927662
Merge "Revert "NFC Unlock api changes"" into lmp-dev
2014-07-30 19:31:16 +00:00
Andres Morales
92b4b3c64d
Revert "NFC Unlock api changes"
...
This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.
Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3
2014-07-30 21:30:50 +00:00
Sandeep Siddhartha
3aebb32267
am 059ffa19: Merge "Make startRecognition async" into lmp-dev
...
* commit '059ffa19ae00611f53da5c817ad21587e2057149':
Make startRecognition async
2014-07-30 19:07:20 +00:00
Jose Lima
9b51ad4d30
am 28ba97e3: Added LEANBACK_SETTINGS Intent category
...
* commit '28ba97e3c095f61765504435c7f8725e48ab09ff':
Added LEANBACK_SETTINGS Intent category
2014-07-30 19:00:05 +00:00
Jose Lima
73915cf2ca
Added LEANBACK_SETTINGS Intent category
...
- Added new Intent category (as a hidden/system API) to be
used to identify Leanback settings activities that should
be listed in the Leanback launcher.
Change-Id: Ia31244fb87a66f63ddad562e02e577111573d728
2014-07-30 18:56:25 +00:00
Paul Jensen
ca9fb9c69f
am 43293a8b: Merge "Use a new socket for each of the host\'s IP addresses." into lmp-dev
...
* commit '43293a8b947508b66efdc36f7d52435d537dddb6':
Use a new socket for each of the host's IP addresses.
2014-07-30 18:43:36 +00:00
Nicolas Prevot
bfb22aeaf0
am 58e96946: Using the selector to check if an intent can be forwarded.
...
* commit '58e9694623705b3916f0256c26c88ea3ae18b47b':
Using the selector to check if an intent can be forwarded.
2014-07-30 18:35:46 +00:00
Nicolas Prevot
ce673ffd22
Using the selector to check if an intent can be forwarded.
...
In IntentFowarderActivity, if the selector of an intent is defined,
use it to check if the intent can be forwarded.
Change-Id: Ic77f70bca5596e0a5fb0fec9b7a693afaa649089
2014-07-30 18:23:43 +00:00
Chris Craik
3994a00e59
am 9e364150: Use RoundRect clipping for circle reveal animation
...
* commit '9e3641505c18d661f513250fa945787663f3adfb':
Use RoundRect clipping for circle reveal animation
2014-07-30 17:21:24 +00:00
Chris Craik
af4d04cab6
Use RoundRect clipping for circle reveal animation
...
bug:16630975
Also, remove inverse clipping feature from reveal animator.
Change-Id: I770a4eb48cd123b0ca0f39d16a0f3eefd1be3653
2014-07-30 17:15:50 +00:00
Behdad Esfahbod
7de9f33a8b
am 7e7b8c80: Merge "Clean up Minikin includes" into lmp-dev
...
* commit '7e7b8c80571a0dd725ec23e7b3f3e64a2b67d64a':
Clean up Minikin includes
2014-07-30 17:13:07 +00:00
Xia Ying
0a64663c15
am 7fc2aaaf: SMS 8-bit GSM characters decoding support
...
* commit '7fc2aaaf1649decacb34ac56fbaf5ab79c8f11cb':
SMS 8-bit GSM characters decoding support
2014-07-30 17:13:03 +00:00
Xia Ying
482c6e7db4
SMS 8-bit GSM characters decoding support
...
Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet
string that's stored in 8-bit unpacked format) characters.
Change-Id: I790dd448a8aaed952d5e24961d9fc509112f7486
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
2014-07-30 10:03:31 -07:00
ztenghui
b488d13860
am da818af6: API Review: VectorDrawable. Remove clipToPath, add MiterLimit
...
* commit 'da818af60ab36d6f5cc3e71b1024fa9b7afe4dd0':
API Review: VectorDrawable. Remove clipToPath, add MiterLimit
2014-07-30 16:53:52 +00:00
ztenghui
d511fc2fa4
API Review: VectorDrawable. Remove clipToPath, add MiterLimit
...
bug:16488254
Change-Id: I693fd46eaf9af016ea9cefe44b559e0aee7c8f03
2014-07-30 16:47:19 +00:00
Yorke Lee
954f358f04
am f4c289dc: Merge "ContactsContract API changes" into lmp-dev
...
* commit 'f4c289dc2bb5085eb8a01d7546f7d5e2a6e301d5':
ContactsContract API changes
2014-07-30 16:43:37 +00:00
Geoff Mendal
4dfd455d49
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-07-30 16:17:51 +00:00
Geoff Mendal
e061d44997
Import translations. DO NOT MERGE
...
Change-Id: Ie02a99d4e746803f482713fe8a35ef31fdb5fdcb
Auto-generated-cl: translation import
2014-07-30 11:04:05 -07:00
Chris Wren
b0d07db5ce
am 6d23f4fd: Merge "Add a log and statistics for notification expansion." into lmp-dev
...
* commit '6d23f4fdbe2c191000628e963d14fa8288a06d12':
Add a log and statistics for notification expansion.
2014-07-30 15:36:54 +00:00
Nicolas Prevot
f288907d05
am 4bb6ae67: Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev
...
* commit '4bb6ae67b08ad4d0d508c269e97ae4d1c7be0e79':
Fixing a NullPointerException in isProfileOwnerApp.
2014-07-30 14:30:22 +00:00
Christoph Studer
fa00735f92
am 6d28d0cc: NoListener: Optimize RankingMap
...
* commit '6d28d0cc4e0fe97fd7841f402766d38e29a739cc':
NoListener: Optimize RankingMap
2014-07-30 14:30:16 +00:00
Kenny Guy
9804485717
am 7d31e8dc: Merge "Add optional handler to LauncherApps callback" into lmp-dev
...
* commit '7d31e8dc1469e0768bd5fcd856275238950fc589':
Add optional handler to LauncherApps callback
2014-07-30 14:30:12 +00:00
Christoph Studer
f89cb25366
am 64130a59: Notification: Forward setUser() call to publicVersion
...
* commit '64130a59d2fbc7175a846c0e38be7534b413e25b':
Notification: Forward setUser() call to publicVersion
2014-07-30 14:30:08 +00:00
Adrian Roos
d6f3e3cf9f
am a8ef647d: Trust: Make setEnabledFeatures asynchronous
...
* commit 'a8ef647d5b4c44f51026682dccd94790e97077bd':
Trust: Make setEnabledFeatures asynchronous
2014-07-30 14:30:03 +00:00
Adrian Roos
0a338b4243
am 33d3756f: Add setManagingTrust and expose it on lockscreen
...
* commit '33d3756f394b7c697c47851fb0980a766c661f83':
Add setManagingTrust and expose it on lockscreen
2014-07-30 14:29:58 +00:00
Christoph Studer
dda48f1221
NoListener: Optimize RankingMap
...
Cache ranks and interception bits instead of re-calculating
them every time they're accessed.
Change-Id: I2c6bbeaa01648d03ff8b3690b7f21cef4e2b9d97
2014-07-30 13:48:04 +00:00
Christoph Studer
fd19326c6b
Notification: Forward setUser() call to publicVersion
...
Change-Id: I82715d69664fcbf57ca0599994004a8630f8587c
2014-07-30 13:16:57 +00:00