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

46819 Commits

Author SHA1 Message Date
Chris Craik
539394ec3a Merge "Create abstract base class for OpenGLRenderer" 2013-12-30 21:55:47 +00:00
Eino-Ville Talvala
aa161c600d Merge "Camera2: Update android.blackLevel.lock" 2013-12-30 20:55:24 +00:00
Baligh Uddin
2aec0d413e Import translations. DO NOT MERGE 
Change-Id: If0e9986ff948df22a01cac35ad4fe8ebf40570ef
Auto-generated-cl: translation import
 2013-12-30 09:50:54 -08:00
Chris Craik
91fcb7d7e3 Merge "Avoid implicit parameter/return value casting of pointers." 2013-12-28 00:51:19 +00:00
Chris Craik
9f66ea06ac Avoid implicit parameter/return value casting of pointers. 
Change-Id: I88123a75c87bf9a88de9ef9fc3e9af70d6a18d7d
 2013-12-27 16:45:05 -08:00
Chris Craik
7a02ea3eaa Avoid implicit parameter casting of pointers. 
Change-Id: I568c4b38ce05f948e2456c54ae69921d328f3010
 2013-12-27 16:43:22 -08:00
Chris Craik
b458942bb6 Create abstract base class for OpenGLRenderer 
This will eventually serve as a base class to allow
DisplayListRenderer to split off from OpenGLRenderer, and could
eventually support other rendering approaches, such as an
SkCanvas/SkPicture.

This will also be the main source of (implementation-independent)
documentation of the canvas/renderer methods.

Change-Id: I52047f338f5cf86a3b0b3002af7154bff5c3c227
 2013-12-27 14:40:06 -08:00
quddusc
7999170276 am 6208ef25: am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '6208ef25fd9b570770065edbfa71bbb2de8aa511':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:54:15 +00:00
quddusc
6208ef25fd am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'c609cb0d62b25b2526b8401e576df4dce5aa5a92':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:49:51 +00:00
quddusc
b889885e9b am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 15:33:47 -08:00
Zhijun He
aeb18a8eda Merge "Camera2: Update availableThumbnailSizes java doc" 2013-12-26 22:32:00 +00:00
Eino-Ville Talvala
0956af56a2 Camera2: Update android.blackLevel.lock 
Change-Id: I4b3ebdf2043c4b242ac1c851a3be90f795f69a00
 2013-12-26 13:19:10 -08:00
Zhijun He
5a9ff37923 Camera2: Update availableThumbnailSizes java doc 
Bug: 12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
 2013-12-26 11:49:09 -08:00
Baligh Uddin
773cb5e728 Import translations. DO NOT MERGE 
Change-Id: I2ca69fa39fbc71249e47fc90b569a7de69b8a7c3
Auto-generated-cl: translation import
 2013-12-26 10:37:08 -08:00
Chris Craik
d863a10b28 Add initial APIs for 3d view manipulation. 
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
 2013-12-20 15:15:01 -08: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
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. 
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
 2013-12-20 14:55:09 -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
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
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
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
Dianne Hackborn
4dace6f66d Merge "Improvements to battery stats." 2013-12-19 22:51:35 +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
Alan Viverette
ce32ea7345 Add APIs and implementation for additional caption edge types 
Change-Id: I62d97a0b3e3b751d698a889eec80dc79fb908d7a
 2013-12-19 13:42:28 -08: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
ff288f7f57 resolved conflicts for merge of b7bba718 to master 
Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac
 2013-12-19 10:55:17 -08:00
Craig Mautner
ed6649f89f DO NOT MERGE: Eliminate StackBox. 
StackBox is too constraining. Adding size and position to TaskStacks
directly makes stack positioning and management more flexible and
prepares for ActivityView.

Change-Id: I33c6b4e1c23a5a8069fd507c160bcb34e4d287b2
 2013-12-19 10:51:23 -08:00
Craig Mautner
b7bba718a8 Merge "Pair ActivityStacks with Displays" into klp-modular-dev 2013-12-19 18:29:50 +00:00
Brian Carlstrom
0c2a8c7f27 am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit '67fa194ecb9e1d28ae3c60110bef671a3312b13b':
  Track Looper decoupling from ALooper
 2013-12-19 07:58:25 +00:00
Brian Carlstrom
67fa194ecb am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'ee767548ba2b4d70e7c7bdc6c56dc0c6634e85d3':
  Track Looper decoupling from ALooper
 2013-12-19 07:27:24 +00:00
Brian Carlstrom
d938681216 am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839':
  Track Looper decoupling from ALooper
 2013-12-18 23:21:50 -08:00
Brian Carlstrom
82b007d757 Track Looper decoupling from ALooper 
Change-Id: I54f4d36f105e60eaaa453ae60f591d634c681fd7
 2013-12-18 17:56:35 -08:00
Baligh Uddin
0b96c6ce3f Merge "Import translations. DO NOT MERGE" 2013-12-19 00:14:29 +00:00
Baligh Uddin
3c5fe29ed2 Import translations. DO NOT MERGE 
Change-Id: I8ece286ac0320cfbc03a0149fdb44675d425c062
Auto-generated-cl: translation import
 2013-12-18 16:01:23 -08:00
Craig Mautner
4a1cb22056 Pair ActivityStacks with Displays 
- Introduce concept of ActivityStacks residing on Displays and able
to be decoupled and moved around.
- Add a new interface, IActivityContainer for clients to handle
ActivityStacks.
- Abandon ordering of stacks based on mStackState and instead use
ActivityDisplayInfo.stacks<ActivityStack> ordering.

Progress towards closing bug 12078972.

Change-Id: I7785b61c26dc17f432a4803eebee07c7415fcc1f
 2013-12-18 15:08:15 -08:00
Tor Norbye
0c34ee698e Merge "Hide NonNull and Nullable." 2013-12-18 22:22:14 +00:00
Alan Viverette
217694199f Merge "Correctly report isOpaque() from ImageView" 2013-12-18 02:53:20 +00:00
Alan Viverette
92f33b0754 Merge "Peek the fast scroll thumb when it transitions to enabled state" 2013-12-18 02:44:32 +00:00
Alan Viverette
63567e3829 Merge "Ensure transient state views are consistently temporarily detached" 2013-12-18 02:31:40 +00:00
Scott Main
418312f44c am 991ba3b7: am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '991ba3b7f2d7164fab956b54c711d5ea523b2ba5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:53:57 +00:00
Scott Main
991ba3b7f2 am 74e9e698: am 7d1f8e65: am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '74e9e698260c16c41dab38de302db6e3e807ddd5':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:50:59 +00:00
Scott Main
7d1f8e6570 am efe10233: am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit 'efe102332861bd05f0cba60e729661607546de34':
  fix typos bug: 11693951 bug: 12118617
 2013-12-17 16:44:31 -08:00
Scott Main
efe1023328 am 5dcb75e6: Merge "fix typos bug: 11693951 bug: 12118617" into klp-docs 
* commit '5dcb75e67b7a3401aa501126bc8401f78c181a68':
  fix typos bug: 11693951 bug: 12118617
 2013-12-18 00:41:23 +00:00
Scott Main
688342f98c fix typos 
bug: 11693951
bug: 12118617

Change-Id: I7a3ab4c6d7bc124ff9ed8779700e77c87409569d
 2013-12-17 13:55:02 -08:00