drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,679 Commits 1 Branch 0 Tags
Commit Graph

121679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
e58a49e411 Merge commit '817ec49e' into manualmerge 
Conflicts:
	services/print/java/com/android/server/print/PrintManagerService.java

Change-Id: I1b9bf364ca50ee3c48f53d87ae0ce23e7f3c2bc2
 2013-12-20 16:36:48 -08:00
quddusc
2a19129718 am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs 
* commit 'cbc5f5410ff7c2b91e13f80a930f22944ce2ed88':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-21 00:15:55 +00:00
quddusc
5d98ddf2f7 am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit 'fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-21 00:15:49 +00:00
quddusc
cbc5f5410f Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs 2013-12-21 00:13:56 +00:00
quddusc
fca563a2d6 docs: Fixed code snippet for unbinding from IAB v3 service. 
Bug: 11858905

Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd
 2013-12-20 15:21:38 -08:00
Chris Craik
d863a10b28 Add initial APIs for 3d view manipulation. 
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
 2013-12-20 15:15:01 -08:00
quddusc
be64abc025 docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. 
Bug: 11926096
Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-20 15:14:42 -08:00
quddusc
e94bca2d84 am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit '70b96ec7303c1b34ff9d63a03359efadeec075c2':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-20 23:10:33 +00:00
quddusc
34dbf7c323 am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-20 23:10:28 +00:00
quddusc
70b96ec730 Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 2013-12-20 23:08:08 +00:00
quddusc
ad7b5993b5 Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 2013-12-20 23:07:35 +00:00
quddusc
8b03f63a0f docs: Added missing elements under "can contain:" list in manifest-element.html. 
Bug: 5793521

Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8
 2013-12-20 15:02:24 -08:00
quddusc
5ad0e62891 am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '12182bc236dd8e120a1f25d1a1862db744425558':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-20 23:01:28 +00:00
quddusc
12182bc236 Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 2013-12-20 22:59:05 +00:00
quddusc
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. 
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
 2013-12-20 14:55:09 -08:00
Amith Yamasani
817ec49e79 Wrap some services into a SystemService 
These services can now be excluded by modifying the list of REQUIRED_SERVICES (TB renamed)

Changed appwidget, devicepolicy, backup and print services.

Change-Id: Id8e2855d5c045cd57bdb02dca9ed75172803bce7
 2013-12-20 14:46:56 -08:00
quddusc
8f5434183e docs: Fixed deprecated constructor. 
Bug: 10581815

Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6
 2013-12-20 14:07:45 -08:00
Chris Craik
3c8a529b3c Merge "Move GLES20DisplayList functionality into DisplayList" 2013-12-20 22:06:02 +00:00
Chris Craik
5438979e49 Move GLES20DisplayList functionality into DisplayList 
Removes unneeded indirection layer

Change-Id: I75d3e369eda2788cbc52a3575c4e1c521e842f59
 2013-12-20 13:53:50 -08:00
Zhijun He
ba9c2d9e83 Merge "ExifInterface: fix class load failure" 2013-12-20 21:32:21 +00:00
Zhijun He
934349e8ad ExifInterface: fix class load failure 
libexif_jni was renamed as libjhead_jni

Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
 2013-12-20 13:28:00 -08:00
quddusc
52604aadaa am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit '240aca333e340445f977d2a0e268a7c8d3a591e0':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-20 20:37:30 +00:00
quddusc
240aca333e docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
Change-Id: Icc640ffffc553c5e8825178453515cedcdc8a63f
 2013-12-20 12:05:01 -08:00
Michael Jurka
1971963fbe Merge "Change wallpaper sizing" 2013-12-20 20:01:00 +00:00
Wei Wang
39a122c0b3 Merge "BLE peripheral mode (3/4): Add peripheral mode API." 2013-12-20 19:37:49 +00:00
Glenn Kasten
44e26f2f5c Merge "Prepare for additional formats beyond 8-bit and 16-bit PCM" 2013-12-20 15:37:16 +00:00
David Christie
3bc26143dc Fix issue where gps "on" stats continue to run when gps is disabled. 
-Shows up in Settings->Battery->app_detail_page
-Bug: 12015795

Change-Id: Id1485eed72e22cffb3e6e306495fac37a4d348cc
 2013-12-19 17:22:23 -08:00
Alan Viverette
ca7a257628 Merge "Add APIs and implementation for additional caption edge types" 2013-12-20 00:40:36 +00:00
Wei Wang
18c76934f6 BLE peripheral mode (3/4): Add peripheral mode API. 
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java
 2013-12-19 16:33:32 -08:00
Michael Jurka
824a4b5ea4 Change wallpaper sizing 
- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary

Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
 2013-12-19 15:42:50 -08:00
Marco Nelissen
e754e7880a Merge "libexif is now libjhead" 2013-12-19 23:36:10 +00:00
Amith Yamasani
1f4bf364b2 Merge "Move files to new directory structure of framework services" 2013-12-19 23:32:03 +00:00
Amith Yamasani
49782e46c0 am 9158825f: Move some system services to separate directories 
* commit '9158825f9c41869689d6b1786d7c7aa8bdd524ce':
  Move some system services to separate directories
 2013-12-19 23:30:35 +00:00
Amith Yamasani
9158825f9c Move some system services to separate directories 
Refactored the directory structure so that services can be optionally
excluded. This is step 1. Will be followed by another change that makes
it possible to remove services from the build.

Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
 2013-12-19 15:25:37 -08:00
Amith Yamasani
19c662b3df Move files to new directory structure of framework services 
Change-Id: I6239d90fa0b813e37878f8fc31caf7a2d70fa3ba
 2013-12-19 15:20:43 -08:00
Dianne Hackborn
4dace6f66d Merge "Improvements to battery stats." 2013-12-19 22:51:35 +00:00
John Spurlock
8ab172e8d9 Add rotation-lock to Quick Settings on phones. 
Make the rotation-lock QS tile available for display on phones.

Devices < sw600dp are only allowed to lock rotation to their
natural orientation (i.e. portrait on most phones), so tweak
the QS tile label to make this clear.  e.g. "Locked to Portrait"
instead of "Rotation Locked" on portrait phones.

Simplify RotationLockController now that the sw600 check is no
longer hardcoded in RotationPolicy.

Remove redundant sw600dp check in SystemUI, everything driven
from the RotationPolicy helper, though SystemUI can still
choose not to display the tile at all with a resource config.

Clean up some of the docs in RotationPolicy to make clear the
subtle distinction between the two ways of locking rotation:
 - From Accessibility (locks to natural orientation on all devices)
 - From System UI (locks to natural < sw600dp, else current rotation)

Bug:11062710

Change-Id: I5caa4485c9501315da9fed964d6667d3012b43cb
 2013-12-19 17:47:20 -05:00
Marco Nelissen
7f6abf84ab libexif is now libjhead 
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
 2013-12-19 14:21:19 -08:00
David Friedman
e32599375e am 30d03292: am cdfed85a: am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit '30d032928a294fbb6f385e9d0367a75b7bf2649b':
  NDK release notes for r9c for review
 2013-12-19 22:05:42 +00:00
David Friedman
30d032928a am cdfed85a: am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit 'cdfed85aa4f8e540d3b7079922a09e05ddd4c944':
  NDK release notes for r9c for review
 2013-12-19 21:59:11 +00:00
David Friedman
cdfed85aa4 am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit '51834f74e627dda63f3868fc51fd29a26cda5492':
  NDK release notes for r9c for review
 2013-12-19 21:56:58 +00:00
David Friedman
51834f74e6 am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit 'c18061d5351fa4170b0b446fbea6300283789403':
  NDK release notes for r9c for review
 2013-12-19 13:53:58 -08:00
David Friedman
c18061d535 am 7cd6cd31: NDK release notes for r9c for review 
* commit '7cd6cd3178b8fb3b25a2c2ddeaff2733bfab9f43':
  NDK release notes for r9c for review
 2013-12-19 21:51:22 +00:00
Glenn Kasten
a5a4238436 Prepare for additional formats beyond 8-bit and 16-bit PCM 
Factor out code that converts from Java ENCODING_PCM_* to native
AUDIO_FORMAT_* into a new function audioFormatToNative().

Also use audio_bytes_per_sample() from <system/audio.h>
instead of hard-coding the size of various formats.

Use size_t for memory sizes.

Change-Id: Ic3525f049e939bdf125d9f87ed39abd2690dcf9f
 2013-12-19 13:50:54 -08:00
David Friedman
7cd6cd3178 NDK release notes for r9c for review 
Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html

Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4
(cherry picked from commit 51501634c7d530d691f4345990a2434a00603ba2)
 2013-12-19 21:47:46 +00:00
Alan Viverette
ce32ea7345 Add APIs and implementation for additional caption edge types 
Change-Id: I62d97a0b3e3b751d698a889eec80dc79fb908d7a
 2013-12-19 13:42:28 -08:00
RoboErik
8d9802d98e Merge "b/12068020 Add a way to add uniqueness to device descriptors" 2013-12-19 21:15:17 +00:00
Dianne Hackborn
57ed6a6440 Improvements to battery stats. 
Now collect per-network packet usage data.

Big reworking of history to be able to start adding more events to it.
Also rework how the checking dump is done to make it more compact, so
maybe we can start uploading it.

Change-Id: I2b29e049ebe073671d0dbe38324223cc2ec0d043
 2013-12-19 13:09:51 -08:00
Craig Mautner
40432bdf15 Merge "Restore parameter lost in merge." 2013-12-19 21:07:47 +00:00
Craig Mautner
7426684948 Restore parameter lost in merge. 
Fixes build.

Change-Id: I40489334ca5dc10d0041b78a82535c41e13def11
 2013-12-19 13:02:30 -08:00