John Reck
7379b5209e
Merge "ViewPropAnimRT fixes"
2014-07-01 14:50:43 +00:00
Baligh Uddin
633910835f
am b77da19e: (-s ours) am b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit 'b77da19e59fee9dda1177aaf312551210bcdf679':
Import translations. DO NOT MERGE
2014-07-01 18:20:40 +00:00
Baligh Uddin
eafb6ae6a8
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2014-07-01 18:20:39 +00:00
Baligh Uddin
2ea6af4fca
am 5b3e66d0: (-s ours) am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
...
* commit '5b3e66d0f65f08de89980700f0b4f0764ae85bce':
Import translations. DO NOT MERGE
2014-07-01 18:20:31 +00:00
Baligh Uddin
9b7e74f473
am 3bb733ba: (-s ours) am 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE
...
* commit '3bb733baa2dc85ffb24a1e1d286a51ba7611dcac':
Import translations. DO NOT MERGE
2014-07-01 18:20:26 +00:00
Leon Scroggins III
57ee620ced
Read premultiplied status from the SkBitmap.
...
Replace the Java variable with mRequestPremultiplied, to better
reflect what it represents. In both native and Java, the SkBitmap
is used as the decision maker of whether a Bitmap is premultiplied.
When changing other settings, mRequestedPremultiplied is used to
determine whether it should be premultiplied (if the new config/
hasAlpha-ness etc supports it).
ChooseFromColorProc now reads both the colortype (instead of the
deprecated Config) and alphatype on the SkBitmap. Same with
ChooseToColorProc. In the process, this caught a bug, where the
wrong procs were being used for Index8.
Replace instances of SkBitmap::Config with SkColorType where I
was already changing code.
Use the new versions of setConfig/allocPixels that take an SkImageInfo
as a parameter.
Document isPremultiplied's return value for ALPHA_8.
BUG:13618134
Change-Id: I91fc1f1e46e9294364b1af0ab4bdb37c68d7058e
2014-07-01 14:05:37 -04:00
Hemant Gupta
8949bfb90c
Bluetooth: Support MAP Client role on Bluedroid.
...
Implementation changes to support MAP client and PBAP client
role on Bluedroid stack.
Change-Id: I1733a67bf5256bd7b181bd5e68e40b476994ebfd
2014-07-01 18:01:27 +00:00
Jorim Jaggi
29db1bd3d6
Merge "Fix jank in TextView.Marquee"
2014-07-01 17:52:42 +00:00
Jorim Jaggi
3aa422033a
Fix jank in TextView.Marquee
...
Use Choreographer animation callbacks to update the scrolling and
make the delta dependent on the time passed since the last update.
Change-Id: If6ce365014e8d32dadfc93bba0d4733050f673f7
2014-07-01 20:15:01 +02:00
John Reck
a0b13bddb2
ViewPropAnimRT fixes
...
* Fixes NPE in isNativeInterpolator
* Fixes null interpolator to mean LinearInterpolator instead of
the default interpolator which is AccelerateDecelerateInterpolator
Bug: 15991759
Change-Id: I66ff27154de1e227a07daaebc0519ee3cc0dd38f
2014-07-01 09:39:54 -07:00
Santos Cordon
e19a4fe32f
Merge "Move call-related SystemAPIs to TelecommManager. (1/3)"
2014-07-01 14:48:56 +00:00
Dianne Hackborn
a165e14d2f
Merge "Issue #15986092 : Add power tracking of flashlight."
2014-07-01 14:40:15 +00:00
Dianne Hackborn
abc7c49913
Issue #15986092 : Add power tracking of flashlight.
...
Not yet hooked up.
Change-Id: Id95e44ecc365e9f38169c0a629b0a48ddb29aa06
2014-07-01 10:02:45 -07:00
Martijn Coenen
e65c697805
Merge "Validate AIDs when registered."
2014-07-01 14:40:15 +00:00
Etan Cohen
1e98a77fff
IMS Framework and AIDL Changes to Support CLIR/P and COLR/P
...
Change-Id: I72626f016e87503e2d0e680c01e482bfbb592b06
2014-07-01 17:50:32 +00:00
Martijn Coenen
1bfc3d6249
Validate AIDs when registered.
...
Change-Id: Ib7140c30a8a7587f1809f529d3303e69933bb245
2014-07-01 17:37:59 +00:00
Andre Eisenbach
061cfd0049
LE: Fix GATT server documentation to reflect API updates
...
Change-Id: I21100dd55a7bf9e85a07742f571d5743bad5ece1
2014-07-01 17:16:11 +00:00
Narayan Kamath
37151b5032
Remove bogus 2 char limit for locales and countries.
...
Locale settings are persisted to system properties
and not to system settings, so the values read here
are used pretty much everywhere.
bug: 15873165
bug: 10090157
Change-Id: Ie7cda166439112c615afbd38253cf4fbb5791242
2014-07-01 13:50:18 +01:00
Narayan Kamath
8c1c0a6881
am 7f319c47: am 1dc550fa: Merge "Fix packing of values at offset 16."
...
* commit '7f319c47c8f5e947638eb1e5e73789ff83123bba':
Fix packing of values at offset 16.
2014-07-01 10:23:44 +00:00
Narayan Kamath
b27c137087
Fix broken assumptions in LocalePicker.
...
This code assumed that the locale is always 5 chars in
length and was of the form xx-YY. This is not necessarily
true. The language can be 3 letters in length and the locale
might have a script and variant.
Also cleans up several nasty pieces of code and eliminates
unnecessary array copies and improves readability by using
idiomatic java.
bug: 15873165
bug: 10090157
Change-Id: Iab1cfd7b78e5772b1245654f2153caf63a96033d
2014-07-01 11:12:24 +01:00
Narayan Kamath
7f319c47c8
am 1dc550fa: Merge "Fix packing of values at offset 16."
...
* commit '1dc550fa7333257a130d71866be37181f8ee553b':
Fix packing of values at offset 16.
2014-07-01 09:22:10 +00:00
Robert Ly
9baaf2ce84
am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev
...
* commit '7459dfed6c4353a9437f5c5fbbbc1738f465a432':
docs: add new UX images for notifications and wear
2014-07-01 02:52:30 +00:00
Santos Cordon
9eb45934c5
Move call-related SystemAPIs to TelecommManager. (1/3)
...
Bug: 15672803
Change-Id: I46e448fe93a9c5b4ae013e8b2fd6f0ce89b94e69
2014-06-30 16:30:10 -07:00
ztenghui
3994371aa3
Draw overlapping rectangles with color modulated.
...
Touch the screen to turn on / off depth test.
Disalbe the vsync to get the real performance.
Drawing 10 rectangles on N10 show almost 3x perf gain, in this setup.
Change-Id: I97bb84f744e90c35febad8cb853ed877cda5e64f
2014-06-30 15:42:49 -07:00
John Reck
d907e5b1ef
Merge "Fix onTrimMemory for HardwareRenderer"
2014-06-30 22:27:39 +00:00
John Reck
f47a594f52
Fix onTrimMemory for HardwareRenderer
...
Also fixes detachFunctor possibly drawing after return
Bug: 15189843
Bug: 15990672
Change-Id: I64c48cb674c461a8eeaba407b697e09f72c98ce3
2014-06-30 16:36:26 -07:00
Robert Ly
7459dfed6c
Merge "docs: add new UX images for notifications and wear" into klp-modular-dev
2014-06-30 22:24:07 +00:00
Robert Ly
bdc5428410
docs: add new UX images for notifications and wear
...
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
2014-06-30 19:33:37 -07:00
Quddus Chong
62395c9379
am 5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev
...
* commit '5212ee08f3061c07a6a323e9169b63b596c4c824':
docs: Add Javadocs for GMS Longhorn.
2014-06-30 21:51:32 +00:00
Quddus Chong
69fc782a8b
am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev
...
* commit '85a25e02004f77595e352e03c1fdb11b6126db69':
docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
2014-06-30 21:51:28 +00:00
Tim Kilbourn
6f1a231a0b
am 326b1857: Merge "Fix docs" into klp-modular-dev
...
* commit '326b1857a5ced49f249358751e05ce237bfaefc8':
Fix docs
2014-06-30 20:54:30 +00:00
Robert Ly
07fd3652aa
am e1e35d13: docs: fix notifications docs
...
* commit 'e1e35d13023224c22a54ce074c45d2f8729b1c60':
docs: fix notifications docs
2014-06-30 20:17:33 +00:00
ztenghui
b4dabadd89
Preparing the new GL depth test.
...
Right now, the code is just copied from ApiDemos for the initial setup.
Change-Id: I531f95faca744c7e91fadae189818af3d04a85ee
2014-06-30 13:11:40 -07:00
Robert Ly
e1e35d1302
docs: fix notifications docs
...
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
2014-06-30 13:11:39 -07:00
ztenghui
9cb5b4c2d9
Use AnimatedVectorDrawable for progress bar.
...
Change-Id: I419197ef38a611757f27ca3192350ad4bd403875
2014-06-30 12:43:52 -07:00
Quddus Chong
5212ee08f3
Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev
2014-06-30 17:43:33 +00:00
Brian Carlstrom
c30f36accb
Update preloaded-classes for ART DO NOT MERGE
...
Change-Id: If0b1bfa2fa1fc80351c11ff2936e1b204539aa64
2014-06-30 09:30:54 -07:00
Narayan Kamath
ec4516470d
Fix native crashes when APKs can't be opened.
...
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.
Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.
bug: 15563874
Change-Id: Ic71a10709eb82b8f53405bbfb2320e80aa96b771
2014-06-30 17:14:29 +01:00
Dirk Dougherty
7ec3cf540a
am 7ecb89fc: Merge "Change card title for admob." into klp-modular-dev
...
* commit '7ecb89fc1e2b07e51dcc52fe6e778855dfb92c15':
Change card title for admob.
2014-06-30 01:06:15 +00:00
Dirk Dougherty
d64ac2a67f
am 14ec9ade: Merge "Doc change: API diff 20." into klp-modular-dev
...
* commit '14ec9adefa1cad0c5444bc938f0edaebaf4d1eee':
Doc change: API diff 20.
2014-06-30 01:06:11 +00:00
Robert Ly
c32386ea44
am 4cdf8373: add api 20
...
* commit '4cdf83735de741bb44a9078b080dbdaf9db891a0':
add api 20
2014-06-30 01:00:08 +00:00
Robert Ly
7b7f68ec94
am 63234bf7: Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev
...
* commit '63234bf7ab9a05f2e8fb858a31af270ca82b33ad':
Revert "add API reference docs filtering for level 20"
2014-06-30 01:00:03 +00:00
Robert Ly
bc2b05299d
resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp
...
Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
2014-06-29 17:55:24 -07:00
Robert Ly
4cdf83735d
add api 20
...
DO NOT MERGE
Change-Id: Iae685158ac9c08e3a074e36d60004faf995fd1c7
2014-06-29 16:53:54 -07:00
Robert Ly
05759ef766
am 6fff230d: Merge "docs : fix broken links" into klp-modular-dev
...
* commit '6fff230d64b869ec9a3f3bb10ea5ae30b041a85a':
docs : fix broken links
2014-06-29 23:42:55 +00:00
Robert Ly
2b906dfb95
am 50b55d61: docs: update notifications docs
...
* commit '50b55d61af63098d0b95e38afdc5c381b3373cd6':
docs: update notifications docs
2014-06-29 23:42:50 +00:00
Robert Ly
50b55d61af
docs: update notifications docs
...
Change-Id: I0473c75c31c4012dbb3fc81d155da237f8f1f7fd
2014-06-29 16:20:28 -07:00
Scott Main
e2af77e635
am 7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev
...
* commit '7b5abd15ab15c9f36783dd00c1953d9cf16c33f7':
docs: fix L Preview G+ links (permanently)
2014-06-28 02:39:37 +00:00
smain@google.com
fa8e81135a
am d2b869d0: revisions to the app structure design guide
...
* commit 'd2b869d052e65958545f2dc49c3eef8ff0066280':
revisions to the app structure design guide
2014-06-28 02:32:24 +00:00
Robert Ly
49ba77b441
am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev
...
* commit '4c42ab4ba59d75eca4883ece2944c30ca36b760f':
Revert "Add api 20 to list used by reference docs."
2014-06-28 02:32:19 +00:00