141160 Commits

Author SHA1 Message Date
Yorke Lee
e49dd7dda2 Merge "Clean up SearchSnippetColumns API (1/3)" 2014-07-01 16:28:20 +00:00
Yorke Lee
eaf09493b3 Clean up SearchSnippetColumns API (1/3)
Renamed SearchSnippetColumns to SearchSnippets to be more consistent
with ContactsContract naming conventions (Data, Groups, StatusUpdates, etc).

Fix some stale documentation, add more documentation and examples

Bug: 6948882

Change-Id: I614e8d7506a4a291a57d693043481557c975f7f7
2014-07-01 14:23:52 -07:00
Nick Kralevich
3edb62a5ad am db32fb64: am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit 'db32fb646d90abb5e2281bd145d9d9615c65cbed':
  Allow different SELinux policies for third party apps.
2014-07-01 21:21:55 +00:00
ztenghui
dc3d9f1237 Merge "Make sure the indeterminate progress bar rotate correctly." 2014-07-01 19:15:58 +00:00
ztenghui
c8ffb0d3a5 Make sure the indeterminate progress bar rotate correctly.
Now the rotation is following a star pattern.

bug:16010534

Change-Id: I6c1b863d6a4e7b8bcb8621ffd4ad828628739d71
2014-07-01 14:14:48 -07:00
Yuhao Zheng
a0de0e59c0 Merge "Hotspot 2.0 fix launch browser method" 2014-07-01 19:22:38 +00:00
Yuhao Zheng
1be1a134c8 Hotspot 2.0 fix launch browser method
Change-Id: I484b526fa92c4e3651e8fe6ae5614f22ba8134d4
2014-07-01 13:48:09 -07:00
Dianne Hackborn
c70a8cf955 Merge "Add network access blocking when in battery save mode." 2014-07-01 14:50:43 +00:00
Jean-Michel Trivi
8df982dfa5 Java MediaPlayer: add support for setting audio attributes
Change-Id: Ia638107a5e67c20c46c2f5f1800db9da57d6f698
2014-07-01 16:45:29 +00:00
Dianne Hackborn
be7c50e0a1 Add network access blocking when in battery save mode.
The network policy manager now monitors battery save mode and,
when in battery save, uses its facility to block access to metered
networks to block access to all networks.  That is, it tells the
network management service that all networks have an (infinite)
quota, and puts various app uids to be restricted under quota
interfaces as appropriate.

This new network blocking needs a new facility to be able to white
list apps, such as GmsCore.  To do this, I refactored the package
manager's permission configuration stuff into a separate SystemConfig
class that can be used by others, and it now has a new tag to
specify package names that should be white-listed for power save
mode.  These are retrieved by the network policy manager and used
to build a whitelist of uids.

The new general config files can now go in system/etc/config,
though currently everything still remains in the permissions dir.

Still left to be done is changing the semantics of what uids are
allowed in this mode, to include all perceptable uids.  (So that we
can still do things like background music playback.)  This will be
done in a follow-on CL.

Change-Id: I9bb7029f61dae62e6236da5ca60765439f8d76d2
2014-07-01 09:22:57 -07:00
Junda Liu
2416bab78b Merge "add setCdmaSubscription to telephonymanager." 2014-07-01 14:48:56 +00:00
Junda Liu
ddb74d8eb0 add setCdmaSubscription to telephonymanager.
Bug: b/12799863

Change-Id: Ieeb3e800cd7757335135901b1e4e94aaf6f4ede7
2014-07-01 11:59:40 -07:00
Marco Nelissen
a4d4c200e4 am 1ed64c65: am 899c15ef: am db816cef: Merge "Make sure we clean up"
* commit '1ed64c65a7b4d33799ca42cb4422d8382929cac2':
  Make sure we clean up
2014-07-01 18:28:56 +00:00
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