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

105163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
662c49e671 Update aip/current.txt to fix build. 
Change-Id: I3644995bce6102c05b356a709e517c812eca0570
 2013-04-18 18:54:57 -07:00
Dianne Hackborn
9df0fb3c8d am a4430894: am f06396da: Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev 
* commit 'a44308945ee23ab0ffca80f71c3f8897510a73f1':
  Fix issue #8656537: API review: styles, assist
 2013-04-18 18:34:02 -07:00
Dianne Hackborn
a44308945e am f06396da: Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev 
* commit 'f06396dae8ad9f6ac2ca2a6afb459f0e106cd786':
  Fix issue #8656537: API review: styles, assist
 2013-04-18 18:30:02 -07:00
Dianne Hackborn
f06396dae8 Merge "Fix issue #8656537: API review: styles, assist" into jb-mr2-dev 2013-04-19 01:26:57 +00:00
Fabrice Di Meglio
1ae3b6aedd Fix bug #8654490 android:paddingStart doesn't override android:paddingLeft 
- in RTL mode only and if you have left/start or right/end at the same time,
the initial left/right padding (coming from the background drawable or from
some explicit definition) was still used.

- now, override the background left/right initial pading by the left/right one
only and only if there is no start/end padding defined at the same time
(because when start/end are defined, we do not care about left/right padding
except the background ones)

Change-Id: Icc6e69c95ace1307b0c5e9673cbdf3b611b62733
 2013-04-18 18:23:01 -07:00
Svetoslav
5c0bd520b8 am ab3f5903: am 688a6977: Replacing accessibility service permissions with capability attributes. 
* commit 'ab3f5903fc4cefbaed6c5cf2242703d56f80028e':
  Replacing accessibility service permissions with capability attributes.
 2013-04-18 18:05:27 -07:00
Jean-Michel Trivi
521e68e76c Anti-drift in RCC playback position 
Periodically verify that the reported playback position hasn't
 drifted from the estimated playback position.
If a drift is noticed, re-synchronize registered
 IRemoteControlDisplay implementations.

bug 8120740

Note that this implementation updates the playback position
 of  all IRemoteControlDisplay implementations,
 and always causes the OnGetPlaybackPositionListener to be
 called. This might be undesirable in some circumstances
 and will be addressed in a subsequent CL.

Change-Id: Ib9f40e1b000e912f6c35fa03e41adf81efadc894
 2013-04-18 18:01:49 -07:00
Svetoslav
ab3f5903fc am 688a6977: Replacing accessibility service permissions with capability attributes. 
* commit '688a6977cf7673ed0542ab3d839053c4e38a4dbd':
  Replacing accessibility service permissions with capability attributes.
 2013-04-18 18:01:34 -07:00
Svetoslav
688a6977cf Replacing accessibility service permissions with capability attributes. 
Accessibility services can perform special operations such as retrieve
the screen content, enable explore by touch, etc. To ensure the user
is aware that the service will perform special operations we were using
permissions. However, the special operations cannot be performed unless
the service is really enabled by the user and it is at this point that
we want to notify the user about the service capabilities.

This change adds capability attributes to the accessibility service's
meta-data XML file. The service has to declare the capability and when
it is enabled we show the user the capabilities in the warining dialog.

bug:8633951

Change-Id: Id3442dc71dad018e606888afdc40834682fdb037
 2013-04-18 17:45:44 -07:00
Svetoslav Ganov
732b92db59 am 4d4a0250: am a407994b: Merge "Reload accessibility service infos for reisntalled packages." into jb-mr2-dev 
* commit '4d4a02509fec98c63b254b4af8ffab46eee39dc0':
  Reload accessibility service infos for reisntalled packages.
 2013-04-18 17:36:02 -07:00
Svetoslav Ganov
4d4a02509f am a407994b: Merge "Reload accessibility service infos for reisntalled packages." into jb-mr2-dev 
* commit 'a407994bad9f6d5c2b9a8446e7c3354b753279a1':
  Reload accessibility service infos for reisntalled packages.
 2013-04-18 17:31:57 -07:00
Svetoslav Ganov
a407994bad Merge "Reload accessibility service infos for reisntalled packages." into jb-mr2-dev 2013-04-19 00:26:02 +00:00
Dirk Dougherty
6c5a2e72bd am e0495912: am 5a02663d: Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev 
* commit 'e0495912246495d784736cad7d5e4fa87ed788d8':
  Doc change: Eat some permissions group comments.
 2013-04-18 17:01:19 -07:00
Dirk Dougherty
e049591224 am 5a02663d: Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev 
* commit '5a02663d08a4a52a73a2bd181969cac4a3fb10e1':
  Doc change: Eat some permissions group comments.
 2013-04-18 16:58:58 -07:00
Dirk Dougherty
5a02663d08 Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev 2013-04-18 23:56:05 +00:00
Dirk Dougherty
f6878b009a Doc change: Eat some permissions group comments. 
Change-Id: I6db06ed80fbc9e3d71c2a029cc50a6fa954d35b9
 2013-04-18 16:55:21 -07:00
Jeff Tinker
665bcd96b7 am a393c2a2: am c884a08e: Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev 
* commit 'a393c2a2f7a6a3153b82b1e43bfffa1a040d56b5':
  Improve error handling for DRM errors reported by plugins
 2013-04-18 16:26:55 -07:00
Daniel Sandler
16edf57069 am 6800dde2: am 9bc3386e: Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev 
* commit '6800dde2fcf4aeec358feb52831933089978edb0':
  Once again, cancel all when notifications canceled for pkg.
 2013-04-18 16:23:24 -07:00
Jeff Tinker
a393c2a2f7 am c884a08e: Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev 
* commit 'c884a08e8c450682f3fe83576fb9e89f8337146e':
  Improve error handling for DRM errors reported by plugins
 2013-04-18 16:23:17 -07:00
Daniel Sandler
6800dde2fc am 9bc3386e: Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev 
* commit '9bc3386e1dfacf6544039dc9f66d07b827632f23':
  Once again, cancel all when notifications canceled for pkg.
 2013-04-18 16:19:47 -07:00
Jeff Tinker
c884a08e8c Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev 2013-04-18 23:18:46 +00:00
Daniel Sandler
9bc3386e1d Merge "Once again, cancel all when notifications canceled for pkg." into jb-mr2-dev 2013-04-18 23:15:51 +00:00
Eino-Ville Talvala
2661bbd219 Merge "Camera: Add hidden camera preview to renderscript allocation API" 2013-04-18 22:44:47 +00:00
Dianne Hackborn
f977201257 Fix issue #8656537: API review: styles, assist 
Change-Id: I5542fb548805fc885b51a1dd1133a3ac226df96b
 2013-04-18 15:35:16 -07:00
Satoshi Kataoka
a1d7a123c4 am f09993ca: am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 
* commit 'f09993ca1d01823f9c60c0be45a8169e09dd27d7':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
 2013-04-18 15:32:50 -07:00
Satoshi Kataoka
f09993ca1d am 1a546dca: Merge "Fixed the problem ime invisible status despite being the icon that appears in the statusbar." 
* commit '1a546dca77b47b86c87ddf4de7a76662ef8bd48b':
  Fixed the problem ime invisible status despite being the icon that appears in the statusbar.
 2013-04-18 15:28:18 -07:00
Andreas Huber
ba9269a585 Add some documentation to MediaCodecInfo 
Change-Id: Ia94cde04af37e46b5d4b9c171dc50112134042b8
related-to-bug: 8657165
 2013-04-18 15:27:20 -07:00
Jeff Brown
653dbd1f1c am 253bc750: am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev 
* commit '253bc7505c890d57466ce251369367ac384cff67':
  Sent hint to Wifi driver when enabling WFD.
 2013-04-18 15:22:25 -07:00
Mathias Agopian
b93a961703 am 9f168425: am d2fe47fc: Merge "don\'t trigger a render when setting the rendermode" into jb-mr2-dev 
* commit '9f1684258954f5741f8460dd03c785bee00687e1':
  don't trigger a render when setting the rendermode
 2013-04-18 15:22:22 -07:00
Jeff Brown
253bc7505c am a454c573: Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev 
* commit 'a454c5732cacffdda53ae277b1e43d87b43044b1':
  Sent hint to Wifi driver when enabling WFD.
 2013-04-18 15:17:53 -07:00
Mathias Agopian
9f16842589 am d2fe47fc: Merge "don\'t trigger a render when setting the rendermode" into jb-mr2-dev 
* commit 'd2fe47fcbe329ada690e8e66d8d359813597c459':
  don't trigger a render when setting the rendermode
 2013-04-18 15:17:50 -07:00
Jeff Brown
a454c5732c Merge "Sent hint to Wifi driver when enabling WFD." into jb-mr2-dev 2013-04-18 22:16:05 +00:00
Mathias Agopian
d2fe47fcbe Merge "don't trigger a render when setting the rendermode" into jb-mr2-dev 2013-04-18 22:15:22 +00:00
Adam Powell
4173a89d12 am 61a826ef: am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 
* commit '61a826eff10c4b275a9569a0edd6301924a6d4e7':
  Fix ActionBar#setHomeActionContentDescription(0)
 2013-04-18 14:50:42 -07:00
Mathias Agopian
78bc203312 don't trigger a render when setting the rendermode 
also don't cache the rendermode, to mimic the older
behaviour.

Bug: 8656076
Change-Id: Id9383852bed073927db2364f7ac30a1be28b4cd8
 2013-04-18 14:47:44 -07:00
Adam Powell
61a826eff1 am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 
* commit '70e376964be45525f1f0e90f35570415dce6d1df':
  Fix ActionBar#setHomeActionContentDescription(0)
 2013-04-18 14:46:17 -07:00
Alon Albert
82d11c847e am d2b8cd75: am adff8b75: Merge "Add Javadoc" into jb-mr2-dev 
* commit 'd2b8cd75ed4ec9d9076699792bd78152885e304f':
  Add Javadoc
 2013-04-18 14:43:40 -07:00
Adam Powell
70e376964b Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev 2013-04-18 21:42:22 +00:00
Alon Albert
d2b8cd75ed am adff8b75: Merge "Add Javadoc" into jb-mr2-dev 
* commit 'adff8b7577490bbeaedcd584a19eb5310f6ccbc5':
  Add Javadoc
 2013-04-18 14:39:25 -07:00
Alon Albert
adff8b7577 Merge "Add Javadoc" into jb-mr2-dev 2013-04-18 21:36:33 +00:00
Craig Mautner
7bb0ae0d45 Merge "Add null test and remove redundant call." 2013-04-18 21:31:27 +00:00
Alon Albert
d35bf1f5eb Add Javadoc 
Bug: 8657225
Change-Id: Id3cc191ea67011460604a691214b9b09075c5938
 2013-04-18 14:28:38 -07:00
Craig Mautner
f06b8c1788 Add null test and remove redundant call. 
- Did not handle the case where mTaskIdToTask returned null.
Fixes bug 8646178.
- updateInputWindowsLw() was being called in removeWindows
immediately after it was called in performLayoutAndUpdateSurfaces.

Change-Id: I1b8bcfadcc93f8c6638fd4247b426af77feeee23
 2013-04-18 14:27:28 -07:00
Chet Haase
7504beda6e Merge "Fix build due to transition test errors" 2013-04-18 21:21:03 +00:00
Chet Haase
797b7559d6 Fix build due to transition test errors 
erroneous inclusion of R file for test files is causing build breakage
on the server. Remove the offending lines.

Change-Id: I1948facc1b5e3f8b7415e0e6c4290b53a54f12af
 2013-04-18 14:18:35 -07:00
Craig Mautner
709393fc8c Merge "Fix launching logic." 2013-04-18 21:16:04 +00:00
Matthew Xie
53302fcc8a am bf3e7d9e: am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 
* commit 'bf3e7d9efceb7b4232c5cc6f4dd2e2ea25e0f714':
  Remove BluetoothAdapterCallback. Simplify leScan Api
 2013-04-18 14:07:04 -07:00
Matthew Xie
bf3e7d9efc am b2df0b60: Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 
* commit 'b2df0b60d0995c760fc7ee3776caa0fc7f84066a':
  Remove BluetoothAdapterCallback. Simplify leScan Api
 2013-04-18 14:03:55 -07:00
Matthew Xie
b2df0b60d0 Merge "Remove BluetoothAdapterCallback. Simplify leScan Api" into jb-mr2-dev 2013-04-18 20:59:43 +00:00
Adam Powell
2eeb419e55 Fix ActionBar#setHomeActionContentDescription(0) 
This call should be analogous to calling
setHomeActionContentDescription(null) and not throw an exception.

Bug 8657256

Change-Id: Ifa9c7b999f4bf1a31fba43f869e234b1f1861512
 2013-04-18 13:56:22 -07:00