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

112094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
411af374f9 am dbb0b824: Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 
* commit 'dbb0b824a7e1dc6909988ec06a46158c05d26a92':
  wifi-display: add a global setting to force WPS config method
 2013-09-04 15:11:33 -07:00
Chong Zhang
954b3b8661 am 919559d4: Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev 
* commit '919559d447a47257531fbe47e32cd9f4889457ea':
  wifi-display: disable WFD IE when Wifi display is turned off
 2013-09-04 15:11:31 -07:00
Scott Main
847480c6d1 update dashboards for 9/13 
Change-Id: I50171e5448fa062ed59d585c603cb5ac80f80d47
 2013-09-04 15:08:40 -07:00
Chong Zhang
dbb0b824a7 Merge "wifi-display: add a global setting to force WPS config method" into klp-dev 2013-09-04 22:07:05 +00:00
Chong Zhang
919559d447 Merge "wifi-display: disable WFD IE when Wifi display is turned off" into klp-dev 2013-09-04 22:06:45 +00:00
Svetoslav Ganov
4cff92ac5b Fixing some minor RTL bugs in print dialog 
Change-Id: I164e3d3b643c885e9d6e65c24b1f5e2323e42c97
 2013-09-04 14:47:24 -07:00
Chet Haase
d82c8ac4db Transition API changes from API council recommendations 
Issue #10460684 KLP API Review: android.view.transition and android.animation
Issue #10570740 Transitions: inflate transition targets from xml

Change-Id: I7a3f6d3aece2fcafc5efd555d033f79e86635c98
 2013-09-04 14:46:38 -07:00
Lajos Molnar
a0d702908c am 171c63db: Merge "Add subtitle support to VideoView." into klp-dev 
* commit '171c63db9253e77c2bd11c53eb89b7c3c983669f':
  Add subtitle support to VideoView.
 2013-09-04 14:35:29 -07:00
Lajos Molnar
171c63db92 Merge "Add subtitle support to VideoView." into klp-dev 2013-09-04 21:32:43 +00:00
Fabrice Di Meglio
eb4ed48f77 am 3ab8e884: Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 
* commit '3ab8e8847d723fd3b114a4c895c5eeb4623412f4':
  Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child
 2013-09-04 14:31:37 -07:00
Lajos Molnar
ca2332001a am 2a59f3f2: Merge "Internal WebVtt subtitle support" into klp-dev 
* commit '2a59f3f24076d96cbb10e1c00c3264dec43f19b1':
  Internal WebVtt subtitle support
 2013-09-04 14:28:02 -07:00
Fabrice Di Meglio
3ab8e8847d Merge "Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child" into klp-dev 2013-09-04 21:26:55 +00:00
Deepanshu Gupta
88db0ee2af Fix layout rendering for RTL locales 
This changeset adds the framework resources for RTL locales and mirrors
the layout if the application is RTL aware.

Use ICU to check the character orientation of the locale - right to left
or left to right. Set the layout direction on the top level layout
accordingly. Also, load the RTL resources for Nav Bar when the locale is
RTL.

Change-Id: I1ed0d516ab64120a0abca413ba678036661508f8
 2013-09-04 14:23:53 -07:00
Lajos Molnar
2a59f3f240 Merge "Internal WebVtt subtitle support" into klp-dev 2013-09-04 21:22:46 +00:00
Alan Viverette
1d26f041ab am 3aa18248: Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 
* commit '3aa18248013c25b80586d90dba71145d9aae8baf':
  Implement drag-to-open in ActivityChooserView
 2013-09-04 14:21:09 -07:00
Romain Guy
1c5a86ab60 am cb039124: Merge "Don\'t draw with invalid display lists Bug #10301674" into klp-dev 
* commit 'cb039124c145f95bd46fa6c84b585fbad88cf036':
  Don't draw with invalid display lists Bug #10301674
 2013-09-04 14:21:05 -07:00
Chet Haase
e4d5c8815a am 5f25f7c3: Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 
* commit '5f25f7c37390e407b5c3d8545c5d6e0ef03b753a':
  Perform layout and invalidation after bringChildToFront()
 2013-09-04 14:17:25 -07:00
Alan Viverette
3aa1824801 Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 2013-09-04 21:17:00 +00:00
Romain Guy
cb039124c1 Merge "Don't draw with invalid display lists Bug #10301674" into klp-dev 2013-09-04 21:16:23 +00:00
Romain Guy
f66645671f Don't draw with invalid display lists 
Bug #10301674

Change-Id: I900322dcb9b53f0eb82741c94d4ab1eaf939259e
 2013-09-04 14:14:07 -07:00
Timothy Knight
73b0bdf1ad am 2629f273: Camera2: Clarified docs for 3A regions. 
* commit '2629f27362f1a35521501f3a28279ab05b9beb32':
  Camera2: Clarified docs for 3A regions.
 2013-09-04 14:13:53 -07:00
Chet Haase
5f25f7c373 Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 2013-09-04 21:13:31 +00:00
Vinit Deshapnde
6a2d32597a Rename LinkInfo to LinkQualityInfo 
This change renames the LinkInfo objects to LinkQuailtyInfo. The API is
still hidden; but it can be accessed via reflection.

Bug: 10342372

Change-Id: Ieccea87c467ceae5d7f76298b137573f67396cd6
 2013-09-04 14:11:24 -07:00
Timothy Knight
2629f27362 Camera2: Clarified docs for 3A regions. 
Bug: 10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
 2013-09-04 21:07:13 +00:00
Timothy Knight
232c39abc9 am 1b039b1d: Merge "Camera2: Updated Rational for denom=0." into klp-dev 
* commit '1b039b1d2e93cef528da3dcf01b328d6286e9d98':
  Camera2: Updated Rational for denom=0.
 2013-09-04 13:27:28 -07:00
Timothy Knight
1b039b1d2e Merge "Camera2: Updated Rational for denom=0." into klp-dev 2013-09-04 20:25:35 +00:00
Dianne Hackborn
f9be242afa am 3cd28adc: Merge "Fix issue #10427108: Google+ has long running process" into klp-dev 
* commit '3cd28adc5df3cbf4a5269e30351e1f767b974036':
  Fix issue #10427108: Google+ has long running process
 2013-09-04 13:24:01 -07:00
Dianne Hackborn
3cd28adc5d Merge "Fix issue #10427108: Google+ has long running process" into klp-dev 2013-09-04 20:22:27 +00:00
Fabrice Di Meglio
2bd961ae38 Fix bug #10514694 Specifying android:gravity="center_vertical|left" results in negative vertical positioning of child 
- related to "wrap_content"
- self bounds should include childs horizontal / vertical margin too
- so make height / width  computation follow similar pattern as top / bottom computation

Passing CTS tests: RelativeLayoutTest / RelativeLayout_LayoutParamsTest

Change-Id: Id019c2536e89d2d8a4991aaabf6de60aae2e263b
 2013-09-04 12:30:19 -07:00
David Christie
55e4889cea am 61edc94a: Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev 
* commit '61edc94ab58354381ab381cd9b92faf0a337742b':
  Make location QuickSettings multi-user compatible (b/10563313)
 2013-09-04 12:25:37 -07:00
David Christie
61edc94ab5 Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev 2013-09-04 19:22:54 +00:00
Lajos Molnar
76935a5890 Internal WebVtt subtitle support 
Change-Id: Ia55673a68a99c277dd6e3246e6f1913c8eb476d8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-04 12:17:10 -07:00
Ruben Brunk
6462be7fa0 Fix CameraService error flag when running HAL1 with API2. 
Bug: 10620944
Change-Id: I72517a25bfe0e891ed150c568c37e04a9d6cc38c
 2013-09-04 12:09:23 -07:00
John Spurlock
d2af67f974 am 48a278ae: Merge "Change semi-transparent system bar from 33 to 40% black." into klp-dev 
* commit '48a278aeaf9735a66d2948243e1eb764ed6b1878':
  Change semi-transparent system bar from 33 to 40% black.
 2013-09-04 12:07:12 -07:00
John Spurlock
48a278aeaf Merge "Change semi-transparent system bar from 33 to 40% black." into klp-dev 2013-09-04 19:03:52 +00:00
Lajos Molnar
1f899810da am 4958c9d6: Merge "Add MediaTimeProvider to MediaPlayer" into klp-dev 
* commit '4958c9d616e9f21750559d097fad66ea7bb79420':
  Add MediaTimeProvider to MediaPlayer
 2013-09-04 12:02:32 -07:00
Lajos Molnar
4958c9d616 Merge "Add MediaTimeProvider to MediaPlayer" into klp-dev 2013-09-04 18:58:12 +00:00
John Spurlock
51a28a211d Change semi-transparent system bar from 33 to 40% black. 
Bug:10502089
Change-Id: I045dab25e16a2711ed48659412022bee0fd4e2b2
 2013-09-04 14:47:17 -04:00
David Christie
b12ba933f3 Make location QuickSettings multi-user compatible (b/10563313) 
Change-Id: I8ae5238e66fa2d6890ffe5697d3e6d5f50413c3e
 2013-09-04 11:36:17 -07:00
Chet Haase
cb96db8d14 Perform layout and invalidation after bringChildToFront() 
Previously, calls to ViewGroup.bringChildToFront() or View.bringToFront()
would need to be followed by calls to requestLayout() and invalidate()
to force the container to redraw with the new child ordering. This
change calls requestLayout() and invalidate() automatically.

Issue #8667065 bringtoTop does not work

Change-Id: Id37ce7a64dead82119e49f7a1b28385cf0d1f20d
 2013-09-04 11:28:57 -07:00
John Spurlock
3c87566c11 SystemUI demo mode. 
Control the status bar visuals via a simple intent protocol.
Useful for comprehensive visual testing reachable assets
and the various bar modes.

Protected behind a global system setting.  To enable:
  adb shell settings put global sysui_demo_allowed 1

Remove obsolete sync failing asset, and tighten up
BluetoothController to represent reality.

Bug:10502089
Change-Id: I28443af3d6b22fcb7b367ef70e1d95fc23ebd407
 2013-09-04 14:09:17 -04:00
Derek Sollenberger
22f36b1a8d am 4c92f7ce: Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev 
* commit '4c92f7cec761f1e6550a1cf3dd1305a186ce0e05':
  Revert workaround for Skia bug now that Skia has been fixed.
 2013-09-04 10:37:49 -07:00
Derek Sollenberger
4c92f7cec7 Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev 2013-09-04 17:36:22 +00:00
Timothy Knight
23c8809568 Camera2: Updated Rational for denom=0. 
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.

This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.

Bug: 10337323

Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
 2013-09-04 16:58:58 +00:00
Scott Main
b0b5ec777d am 7f043de9: am c6ed9ff7: am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit '7f043de9a9eb0b071b93ddfffdc5ba0f6d1c7309':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:26:15 -07:00
Scott Main
7f043de9a9 am c6ed9ff7: am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:23:13 -07:00
Scott Main
eec4cb1fea am 703b34bb: am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit '703b34bb13e009b8d82f96f17626f806007bd042':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:22:48 -07:00
Scott Main
c6ed9ff77a am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'ca0d88b841db52fc926027f412003a8bf6efdf39':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:20:31 -07:00
Scott Main
703b34bb13 am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'f579f134ee9495571899be958983a1a242457603':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:19:46 -07:00
Scott Main
ca0d88b841 am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'c3adcf9dc745932bf3a059a7201644dd96b97750':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:18:23 -07:00