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

163172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
6708ac40f2 Move layer-list to be top-level element in seek bar progress 
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:35:27 +00:00
Zhijun He
6bafb86655 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 02:15:49 +00:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress 
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
 2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 01:13:06 +00:00
Alan Viverette
f89e06fa58 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
automerge: 721a957

* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 01:11:28 +00:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Alan Viverette
80252a92e5 Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3 Allow top-level drawable container in progressDrawable 
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
 2015-02-04 16:44:02 -08:00
Alan Viverette
721a95784e Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 2015-02-05 00:20:15 +00:00
George Mount
23eef1ec5e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
automerge: c3a043c

* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:15:50 +00:00
George Mount
c3a043cf0e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
 2015-02-04 15:27:56 -08:00
Alan Viverette
b0d672376d Replace ic_clear with vector icon 
Fixes the clear icon being really tiny.

Bug: 19248473
Change-Id: I2c87aa9e055d04d96fa6ccf458cfcc642a4d55ab
 2015-02-04 22:49:02 +00:00
Zhijun He
f1745ce8a8 Camera2: relax the EV compensation requirements 
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
 2015-02-04 13:59:43 -08:00
Geoff Mendal
140a22de8e Import translations. DO NOT MERGE 
Change-Id: Ibdc0a2c8927af8036040a542f6484db1ea65880d
Auto-generated-cl: translation import
 2015-02-04 06:28:45 -08:00
Wonsik Kim
015fdf3923 Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev 
automerge: d7310bd

* commit 'd7310bd1499c0b48594a8fbbcbe0c7e80c1e5832':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
 2015-02-03 23:44:34 +00:00
Wonsik Kim
d7310bd149 Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev 2015-02-03 23:39:59 +00:00
Lajos Molnar
6999ef3488 camera2: limit flexYUV array size in DngCreator 
automerge: fdb2112

* commit 'fdb2112bbc140aab869aac047454cd2f67809df1':
  camera2: limit flexYUV array size in DngCreator
 2015-02-03 23:16:28 +00:00
Lajos Molnar
fdb2112bbc camera2: limit flexYUV array size in DngCreator 
corrected overread

Bug: 19211135
Change-Id: I373b84dd9e2dc6219a305bf2d0308119668fab2a
 2015-02-03 14:57:09 -08:00
Paul Jensen
f1b78d0469 Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 
automerge: 39ae054

* commit '39ae0547ca5a1e7cfe24a945b2f8a910e09b7f3c':
  Facilitate network validation on networks with a per-network PAC.
 2015-02-03 21:11:51 +00:00
Paul Jensen
39ae0547ca Merge "Facilitate network validation on networks with a per-network PAC." into lmp-mr1-dev 2015-02-03 21:08:59 +00:00
Paul Jensen
8fe1742946 Facilitate network validation on networks with a per-network PAC. 
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY.  This will fail on networks where Internet
access is only permitted via the proxy.  Always failing network
validation has the potential to disable WiFi auto-join.  Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.

bug:19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
 2015-02-03 11:28:55 -05:00
Svetoslav
b6b526eaaf Fix broken activation of the selected view in accessibility mode. 
automerge: ded133c

* commit 'ded133c446fa9d0d23e6bde19a66fb2ce3980491':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:20:34 +00:00
Svetoslav
ded133c446 Fix broken activation of the selected view in accessibility mode. 
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.

This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.

The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.

bug:18986806
bug:18889611

Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
 2015-02-02 23:17:17 +00:00
Joe Fernandez
d99924d556 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
* commit '175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
  docs: February 2015 Dashboard updates
 2015-02-02 19:35:00 +00:00
Jorim Jaggi
2ffb3400f7 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
  Send accessibility event when bouncer is shown
 2015-02-02 19:25:34 +00:00
Joe Fernandez
175ddbcf2e am d14b6432: am eba583e3: docs: February 2015 Dashboard updates 
automerge: c6ca860

* commit 'c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
  docs: February 2015 Dashboard updates
 2015-02-02 19:24:38 +00:00
Jorim Jaggi
515148dcaa Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 2015-02-02 19:19:24 +00:00
Jorim Jaggi
c1dff8cee8 Send accessibility event when bouncer is shown 
Bug: 18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
 2015-02-02 20:18:26 +01:00
Joe Fernandez
c6ca8600a4 am d14b6432: am eba583e3: docs: February 2015 Dashboard updates 
* commit 'd14b64323ff92be9db804d66a1146693c27150a6':
  docs: February 2015 Dashboard updates
 2015-02-02 17:44:26 +00:00
Joe Fernandez
d14b64323f am eba583e3: docs: February 2015 Dashboard updates 
* commit 'eba583e3930891f7a8a0e48a961a4a2471fc757c':
  docs: February 2015 Dashboard updates
 2015-02-02 17:20:35 +00:00
Joe Fernandez
eba583e393 docs: February 2015 Dashboard updates 
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
 2015-02-02 08:48:42 -08:00
Tyler Gunn
235f60bc13 am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
* commit '4143b796bc20072a12fe31cbfdf4f1918dff0728':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 15:53:00 +00:00
Tyler Gunn
4143b796bc Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 2015-02-02 15:48:53 +00:00
Geoff Mendal
c6fc528713 Import translations. DO NOT MERGE 
Change-Id: I1151a10a47c8545c3db3445a2cdbe6edffa6c177
Auto-generated-cl: translation import
 2015-02-02 08:39:50 -06:00
Jon Larimer
4f78e0b1e8 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 
automerge: dcce25a

* commit 'dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
 2015-01-31 05:27:30 +00:00
Jon Larimer
dcce25a9a7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a 
automerge: 4a82635

* commit '4a826358e769e697ec329cf14edeb049981a11a9':
 2015-01-31 05:19:19 +00:00
Jon Larimer
4a826358e7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af 
automerge: 27d099a

* commit '27d099a7e128744b7a11ce09b469a3396e872d33':
 2015-01-31 05:03:24 +00:00
Joe Fernandez
f4b2bd4c41 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da 
automerge: 346a9a2

* commit '346a9a2f364f7cdabf06944014594b299d384082':
  docs: training intent doc error update
 2015-01-31 04:01:11 +00:00
Deepanshu Gupta
c053438286 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 
automerge: 580937f

* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support
 2015-01-31 03:59:37 +00:00
Deepanshu Gupta
862cdd6f11 am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd 
automerge: 1575ca6

* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.
 2015-01-31 03:58:26 +00:00
Jon Larimer
27d099a7e1 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de 
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':
 2015-01-31 03:39:19 +00:00
Joe Fernandez
346a9a2f36 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 
automerge: cacf7da

* commit 'cacf7da1c4d078641f099bab717e155609c5dc99':
  docs: training intent doc error update
 2015-01-31 03:04:16 +00:00
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
 2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
 2015-01-31 03:01:20 +00:00
Joe Fernandez
cacf7da1c4 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
automerge: f02a8d9

* commit 'f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
  docs: training intent doc error update
 2015-01-31 02:50:57 +00:00
Joe Fernandez
f02a8d9ffc am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update
 2015-01-31 01:59:54 +00:00
Wonsik Kim
b561ccedd8 audio: allow audio port cache update even when audio patches contain invalidated sources/sinks 
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.

Bug: 18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
 2015-01-31 01:51:28 +00:00
Joe Fernandez
1a9bf5c100 Merge "docs: training intent doc error update" into lmp-docs 2015-01-31 01:00:16 +00:00
Rich Slogar
367bfb3b50 docs: training intent doc error update 
b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
 2015-01-30 16:55:55 -08:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
 2015-01-31 00:54:10 +00:00