Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,576 Commits 3 Branches 0 Tags
3bb64aa83a8ddd069a98700eae255db7f1a3db6e
Commit Graph

33463 Commits

Author SHA1 Message Date
Alan Viverette
3bb64aa83a Merge "Allow Views to specify a theme override" 2014-01-04 02:31:10 +00:00
Zhihai Xu
2208e652d6 Merge "NPE in BluetoothSocket.write()" 2014-01-04 00:54:02 +00:00
Alan Viverette
dd9233253b Allow Views to specify a theme override 
During inflation, any view with a theme attribute will wrap its context
with a theme override. Views inflated using a parent will inherit the
wrapped context.

BUG: 12178430
Change-Id: I3448e5174e94c19960a1e21df5bd6127d0d33c07
 2014-01-03 15:22:53 -08:00
Zhijun He
9e4b8e41fb Merge "Camera2: fix onClosed callback issue" 2014-01-03 00:46:55 +00:00
Zhijun He
b437428b3f Merge "Camera2: remove waitUntilIdle from Camera2 API" 2014-01-03 00:46:28 +00:00
Zhijun He
2db56026bf Camera2: fix onClosed callback issue 
The camera isClosed status shouldn't be checked to fire onClosed callback,
otherwise, onClosed callback is almost never fired when camera close is called
because the camera device is already closed.

Change-Id: I987242d53a12082828a992404ed55ee8a378f93f
 2014-01-02 15:12:00 -08:00
Eino-Ville Talvala
aa161c600d Merge "Camera2: Update android.blackLevel.lock" 2013-12-30 20:55:24 +00: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
Zhijun He
d842fcd3af Camera2: remove waitUntilIdle from Camera2 API 
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
 2013-12-26 14:14:04 -08: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
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
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
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
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
Alan Viverette
223622a50d Add reveal drawable, APIs for forwarding Drawable focus and touch 
Hotspot APIs are hidden pending finalization of how we handle IDs.

BUG: 11416827
Change-Id: Iecacb4b8e3690930d2d805ae65a50cf33482a218
 2013-12-17 21:33:38 +00:00
Zhihai Xu
610770d712 NPE in BluetoothSocket.write() 
If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.

bug:12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a
 2013-12-17 11:39:20 -08:00
Zhijun He
bd6877f968 Merge "Camera2: Update metadata java docs" 2013-12-17 18:38:54 +00:00
Zhijun He
2807936f5d Camera2: Update metadata java docs 
Java docs for below keys are updated:
- android.edge.mode
- android.noiseReduction.mode

Bug: 12135317
Change-Id: I950d46b90ece2f519e33719427801fc78b36b39c
 2013-12-17 10:35:40 -08:00
Tor Norbye
bbc75f34e6 Hide NonNull and Nullable. 
These should not be used in app code; instead, we will add
class-file retention versions of these to the support
library.

Change-Id: I13275bd28529f5da04d923688655be35c77dbb1c
 2013-12-17 08:44:38 -08:00
Alan Viverette
0dadf4d030 Merge "Replace auto-create in findViewById() with explicit create() API" 2013-12-17 01:20:22 +00:00
Zhijun He
f353742124 camera2: update java docs for metadata tag spec update 
Below tag spec java docs are updated:
- android.control.mode
- android.control.aeMode
- android.control.afMode
- android.control.awbMode

Bug: 12135317
Change-Id: I83f24c1816dfba1cc042e120fba43c5beb1bd2ae
 2013-12-16 16:56:35 -08:00
Chris Craik
6d384403d7 Merge "Create private properties on GLCanvas for experimentation with 3d" 2013-12-17 00:11:28 +00:00
Alan Viverette
add12e56d0 Merge "Don't cast FastScroller adapter to BaseAdapter" 2013-12-16 23:36:49 +00:00