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

3264 Commits

Author SHA1 Message Date
Narayan Kamath
fbc10c258c am 61d94e0d: Merge "Add new Java 7 concurrent APIs." 
* commit '61d94e0d99589627baa5cb1bbc80299f75e1d660':
  Add new Java 7 concurrent APIs.
 2014-01-09 05:11:41 -08:00
Narayan Kamath
61d94e0d99 Merge "Add new Java 7 concurrent APIs." 2014-01-09 12:25:23 +00:00
Jeff Brown
cb5adbd23c am 7fa44e90: am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 
* commit '7fa44e90ed11cd35764f7f9efa587203c241fb27':
  Add flag to force public virtual display to show own content.
 2014-01-08 18:17:58 -08:00
Jeff Brown
7fa44e90ed am b6d9eb87: Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 
* commit 'b6d9eb875a0bf1bb655a90c88457689342eb0991':
  Add flag to force public virtual display to show own content.
 2014-01-09 02:14:56 +00:00
Jeff Brown
b6d9eb875a Merge "Add flag to force public virtual display to show own content." into klp-modular-dev 2014-01-09 02:12:59 +00:00
Adam Powell
201313d7e8 am 9e2694b5: Merge "Move ActionMenuView into android.widget and make it public" 
* commit '9e2694b5217be8c30a015c6254ee2ea70784958c':
  Move ActionMenuView into android.widget and make it public
 2014-01-08 14:46:55 -08:00
Adam Powell
fa18d182a3 Move ActionMenuView into android.widget and make it public 
Expose ActionMenuView as a way for applications to present
ActionBar-style menus in other embedded or repeating contexts.

Change-Id: I54b7ccd9b2116ca68bc72956da9262bca9d5085f
 2014-01-08 13:53:30 -08:00
Narayan Kamath
4f84552784 Add new Java 7 concurrent APIs. 
Change-Id: I93b5ac5eefbb38204fc9f3d8ce0f948bdda67915
 2014-01-08 17:38:59 +00:00
Mike Lockwood
831ede41dd am 7b925fbb: am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '7b925fbb87d7bfac17bf04e62ea786e96ee7e6d9':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 08:14:05 -08:00
Mike Lockwood
7b925fbb87 am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters" 
* commit '43bc1c07d25b7f278a860bbb9118f46ac732593a':
  Added missing USB device descriptor fields needed for intent filters
 2014-01-08 16:10:42 +00:00
Mike Lockwood
9607d78f51 Merge "Added missing USB device descriptor fields needed for intent filters" 2014-01-08 15:56:13 +00:00
Jeff Brown
d14c8c9039 Add flag to force public virtual display to show own content. 
Change-Id: I1039f2ef3154169ec90411a4c7ba2c94629f72c4
 2014-01-07 19:30:07 -08:00
Alan Viverette
6a5ff58d6b am e2802755: Merge "Add support for specifying Drawable color filter in XML" 
* commit 'e2802755b1a956466d0293ded6891afd8b2d149e':
  Add support for specifying Drawable color filter in XML
 2014-01-07 15:55:51 -08:00
Alan Viverette
e2802755b1 Merge "Add support for specifying Drawable color filter in XML" 2014-01-07 23:53:47 +00:00
Alan Viverette
d9e788c4f0 Add support for specifying Drawable color filter in XML 
BUG: 12178044
Change-Id: Ie118aebf56bb4580c97b625e20f4e76bed4b6f6f
 2014-01-07 11:30:24 -08:00
Alan Viverette
65f31d4104 Pushing in boilerplate Quantum and Quantum.Light styles 
Change-Id: I7f6dd1d9684db5282231f65469d74a695ff6458d
 2014-01-06 17:10:39 -08:00
Alan Viverette
203af24e4c Update smoothScrollToPosition to move faster for large offsets 
Adds a method to AbsListView for translating from position to row
and vice-versa.

BUG: 3434554
Change-Id: I08459a6545cd02ac4eb5007c59bda1f3fece9e9f
 2014-01-06 13:50:26 -08:00
Chong Zhang
bbcad09dec am f12aa45b: Merge "MediaRecorder: add getSurface() api and SURFACE video source" 
* commit 'f12aa45bcbcd3d41b51c70401fac5786d3d881a5':
  MediaRecorder: add getSurface() api and SURFACE video source
 2014-01-06 11:07:25 -08:00
Chong Zhang
f12aa45bcb Merge "MediaRecorder: add getSurface() api and SURFACE video source" 2014-01-06 19:05:09 +00:00
Chong Zhang
83cc994ba4 MediaRecorder: add getSurface() api and SURFACE video source 
Bug: 12305192
Change-Id: If833c5ac8a738ffa284307e0435b5cbd1b7379b1
 2014-01-06 10:42:51 -08:00
Zhijun He
7f82da18d3 am b437428b: Merge "Camera2: remove waitUntilIdle from Camera2 API" 
* commit 'b437428b3f2190951deeb580094054f6a4f09388':
  Camera2: remove waitUntilIdle from Camera2 API
 2014-01-02 16:48:26 -08:00
Zhijun He
b437428b3f Merge "Camera2: remove waitUntilIdle from Camera2 API" 2014-01-03 00:46:28 +00:00
Zhijun He
d842fcd3af Camera2: remove waitUntilIdle from Camera2 API 
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
 2013-12-26 14:14:04 -08:00
Chris Craik
f536488f47 am 1139d87b: Merge "Add initial APIs for 3d view manipulation." 
* commit '1139d87b3e6782af58b814bd28846a4eec79ad28':
  Add initial APIs for 3d view manipulation.
 2013-12-20 17:29:04 -08:00
Chris Craik
d863a10b28 Add initial APIs for 3d view manipulation. 
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
 2013-12-20 15:15:01 -08:00
Alan Viverette
97bede0843 am ca7a2576: Merge "Add APIs and implementation for additional caption edge types" 
* commit 'ca7a2576289f371acc28e39825a2fe05a587b29b':
  Add APIs and implementation for additional caption edge types
 2013-12-19 16:43:34 -08:00
Alan Viverette
ca7a257628 Merge "Add APIs and implementation for additional caption edge types" 2013-12-20 00:40:36 +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
Yorke Lee
004874ce35 am 710de6dc: Merge "PhoneNumberUtils API changes" 
* commit '710de6dc03ff4b3105638461cfc03313f60ba147':
  PhoneNumberUtils API changes
 2013-12-19 10:53:49 -08:00
Yorke Lee
710de6dc03 Merge "PhoneNumberUtils API changes" 2013-12-19 18:51:49 +00:00
Tor Norbye
aaceebe697 am 0c34ee69: Merge "Hide NonNull and Nullable." 
* commit '0c34ee698edcd3bdfa4a1d26224e1ed1b96a9238':
  Hide NonNull and Nullable.
 2013-12-18 14:24:38 -08:00
Tor Norbye
0c34ee698e Merge "Hide NonNull and Nullable." 2013-12-18 22:22:14 +00:00
Alan Viverette
ea0e2eda69 am 223622a5: Add reveal drawable, APIs for forwarding Drawable focus and touch 
* commit '223622a50db319d634616311ff74267cf49679e7':
  Add reveal drawable, APIs for forwarding Drawable focus and touch
 2013-12-17 13:40:10 -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
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
ec3df4c0f5 am 0dadf4d0: Merge "Replace auto-create in findViewById() with explicit create() API" 
* commit '0dadf4d03072c1e0d5ad67edcb35ec1bd48496dc':
  Replace auto-create in findViewById() with explicit create() API
 2013-12-16 17:39:30 -08:00
Alan Viverette
0dadf4d030 Merge "Replace auto-create in findViewById() with explicit create() API" 2013-12-17 01:20:22 +00:00
Shishir Agrawal
f12d269150 resolved conflicts for merge of c4d41755 to master-nova 
Change-Id: Ibc67673c8e1872c47848f4ea8860b0f7e1285f0c
 2013-12-16 17:12:45 -08:00
Shishir Agrawal
c4d41755d7 Merge "Adding support for SIM communication from Android over logical channels." 2013-12-17 00:44:40 +00:00
Shishir Agrawal
57f656b9f6 Adding support for SIM communication from Android over logical channels. 
Expose the folowing commands in ITelephony.aidl and TelephonyManager:
    - iccOpenLogicalChannel
    - iccCloseLogicalChannel
    - iccTransmitApduLogicalChannel

Also add a new SIM_COMMUNICATION permission (maked as dangerous) to control
access to the above commands.

Change-Id: I89c08adc6f9738907e3b547c749f3cc61f300710
 2013-12-12 16:57:38 -08:00
Yorke Lee
32b6ad9884 am 833a9e58: Merge "ContactsContract api changes" 
* commit '833a9e58ce7d4d9778edf7573a980928284a5a8a':
  ContactsContract api changes
 2013-12-12 16:15:40 -08:00
Yorke Lee
4d3059f045 am 6b86518c: Merge "Expose CallLog provider fields as public API" 
* commit '6b86518c57b9c637a17e34c16a848464f2bb1941':
  Expose CallLog provider fields as public API
 2013-12-12 16:12:15 -08:00
Yorke Lee
833a9e58ce Merge "ContactsContract api changes" 2013-12-13 00:11:53 +00:00
Yorke Lee
6b86518c57 Merge "Expose CallLog provider fields as public API" 2013-12-13 00:09:26 +00:00
Andres Morales
7113183c03 am ec31555d: Merge "Adding INfcUnlockSettings and NfcUnlock interface class." 
* commit 'ec31555d8822ad68bed6f478594d65e821b0851b':
  Adding INfcUnlockSettings and NfcUnlock interface class.
 2013-12-12 09:37:54 -08:00
Andres Morales
ec31555d88 Merge "Adding INfcUnlockSettings and NfcUnlock interface class." 2013-12-12 17:36:40 +00:00
Alan Viverette
af5fad585d am 92054079: Merge "Add caption window color attribute" 
* commit '920540799823689fe9d85464cfd8a76c843aefa6':
  Add caption window color attribute
 2013-12-11 17:21:49 -08:00
Alan Viverette
f34ef74eb2 Replace auto-create in findViewById() with explicit create() API 
Change-Id: Ib833cc23f4ae39b5d729db3d425faa7dfd5b3c4c
 2013-12-11 15:59:53 -08:00
Alan Viverette
55d70620d9 Add caption window color attribute 
The WebVTT rendering implementation interprets window color as region
color, since there is no window for non-region captions.

BUG: 12020757
Change-Id: Ie891e1343d718783fc32c712860f886de22558ec
 2013-12-11 15:22:14 -08:00
William Luh
53b3e6d3e3 am 35547409: Merge "Expose new API for querying whether a certificate was user added." 
* commit '3554740951b91b1487e72c2d2208302c29d43613':
  Expose new API for querying whether a certificate was user added.
 2013-12-11 10:12:26 -08:00