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

42839 Commits

Author SHA1 Message Date
Wink Saville
9a353be5d4 am 94e9e8f1: am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev 
* commit '94e9e8f16a7a72d1491694b44006b96212d8076e':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
 2013-08-09 06:06:36 -07:00
Jeff Brown
c3a0e6acaa am 1c7799e2: am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 
* commit '1c7799e2f35b707c5f5d6544a6d94cd4892891da':
  Use new ISurfaceComposer::destroyDisplay method
 2013-08-09 06:06:33 -07:00
Martin Kosiba
24ee60be73 Merge "Add super_onDrawVerticalScrollBar to WebView.PrivateAccess." 2013-08-09 12:38:43 +00:00
Martin Kosiba
c95fbbf2ed Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. 
This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.

Change-Id: I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74
 2013-08-09 13:36:35 +01:00
Mathias Agopian
2464fcdf4c am 5893a97c: Merge "fix-up dependencies to gl headers" into klp-dev 
* commit '5893a97cbf398ca3e1bff5444454343d94e25a4c':
  fix-up dependencies to gl headers
 2013-08-09 04:46:15 -07:00
destradaa
95e57e7758 am b4430c5c: am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev 
* commit 'b4430c5c265a9456356aca71792d5d113f2454ab':
  Add FlpHal layer to support Location Batching.
 2013-08-09 02:37:16 -07:00
Dianne Hackborn
2dd43b0947 am 30d4de76: am 8a0de58e: Get ProcessStats callable from other processes. 
* commit '30d4de76b1ad224bd41c7581b5beb4ace2020398':
  Get ProcessStats callable from other processes.
 2013-08-09 02:37:13 -07:00
David Christie
8ffe6171c7 am 262f3ff2: am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev 
* commit '262f3ff288d7da3be8db4c38200e5501e87a3445':
  Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION.
 2013-08-09 02:37:08 -07:00
Vinit Deshapnde
dbbcc0ae7e am a87a28f3: am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev 
* commit 'a87a28f392cab40569fb17561539081c65cbff13':
  Use a single socket to communicate with supplicant
 2013-08-09 02:37:06 -07:00
Amith Yamasani
7d441b8f9d am 4458c200: am 672d323b: Merge "Developer option to force RTL layout" into klp-dev 
* commit '4458c20040ca41d32f982c1a1c971cc94017930b':
  Developer option to force RTL layout
 2013-08-09 02:36:51 -07:00
Daniel Sandler
e4eaaccea7 am 9a81e154: am f6971c80: Merge "OK, now it\'s a release." into klp-dev 
* commit '9a81e154cc1c46d67387d01d7bffb2451fdb7e7e':
  OK, now it's a release.
 2013-08-09 02:36:41 -07:00
Baligh Uddin
7bb1d9450a Import translations. DO NOT MERGE 
Change-Id: I4cb802f8f914abfb7789158cdb29fa454515db93
Auto-generated-cl: translation import
 2013-08-09 00:17:09 -07:00
Baligh Uddin
baa7002533 Import translations. DO NOT MERGE 
Change-Id: I264c3003f2c7cd3c079a7a4114c509c6909c6bfd
Auto-generated-cl: translation import
 2013-08-09 00:04:11 -07:00
Mathias Agopian
5893a97cbf Merge "fix-up dependencies to gl headers" into klp-dev 2013-08-09 04:39:55 +00:00
Mathias Agopian
e3eae73abb fix-up dependencies to gl headers 
Change-Id: I9f176847587db1f9ccee2bc425106d277ffceee6
 2013-08-08 21:09:16 -07:00
keunyoung
30f420fd6a add local focus mode and input event injection API to Window 
- This enables keyboard navigation for window without focus.
 - FLAG_LOCAL_FOCUS_MODE puts window into local focus mode.
 - Application needs to put window in local focus mode, control focus, and
   inject events to make dpad navigation work.
 - Window in local focus mode does not interact with window manager or ime
   regarding focus related events.
 - Also renamed ViewRootImpl.dispatchKey to dispatchInputEvent to allow both key and touch events injection.

Change-Id: I8e8561f29e0dade3797fb7ae3ee7690e6b7f8895
 2013-08-08 19:45:21 -07:00
Fabrice Di Meglio
4155e2e175 Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP 
This issue has been actually revealed by a fix for bug #7034321 (Need Drawable RTL support)
where I identified an issue with Drawables resolution in TextView (was missing a call to
resetResolvedDrawables() and resolveDrawables()).

- add missing resetResolvedDrawables() and resolveDrawables() in TextView.setRelativeDrawablesIfNeeded()
- fix View.resolveDrawables():

this was a bit trycky as View.resolveDrawables() was wrongly supposing that the layout direction was
resolved and it could access View.getLayoutDirection() and could position the PFLAG2_DRAWABLE_RESOLVED
bit.

Dont forget that resolution of RTL properties (layoutDirection, Drawables ...) is happening in
View.measure() but in our case (TexView constructor) we still need to resolve the Drawables.

So now, be sure that we cannot resolve the Drawable if layout direction has not being resolved and the
raw layout direction is LAYOUT_DIRECTION_INHERIT.

But we can also "cheat" if the raw layout direction is LAYOUT_DIRECTION_LTR or LAYOUT_DIRECTION_RTL
or LAYOUT_DIRECTION_LOCALE as its resolution will give the same value :-)

Change-Id: I7a242d918697e1e1c2febf229e8edf1866b855be
 2013-08-08 18:22:08 -07:00
Jeff Sharkey
87a61b838c am 8a65f5b8: Merge "Allow packages.list access with new GID." into klp-dev 
* commit '8a65f5b87139b90b35bae88e46ae442934ff6483':
  Allow packages.list access with new GID.
 2013-08-08 17:48:02 -07:00
Jeff Sharkey
8a65f5b871 Merge "Allow packages.list access with new GID." into klp-dev 2013-08-09 00:44:55 +00:00
Jonathan Dixon
de3ff4b485 am 42773328: Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev 
* commit '427733280b85663587bf0e61174103b0a3423691':
  Refactor Canvas.drawPicture() to delegate to Picture
 2013-08-08 17:40:17 -07:00
Jeff Sharkey
184a0100ab Allow packages.list access with new GID. 
The FUSE daemon is using packages.list to map from package name to
appId after it drops permissions, so create a new "package_info" GID
to grant read access.

Also switches FileUtils to use Libcore.os.

Change-Id: I9451ca4e90e8a985526805c6df0888a244a1db36
 2013-08-08 17:38:13 -07:00
Jonathan Dixon
427733280b Merge "Refactor Canvas.drawPicture() to delegate to Picture" into klp-dev 2013-08-09 00:36:03 +00:00
Jonathan Dixon
667fe1039f Refactor Canvas.drawPicture() to delegate to Picture 
Bug: 9814370

To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.

Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
 2013-08-08 17:22:48 -07:00
Wink Saville
8418a309a3 am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 
* commit '89d16f7597d9e03bf3cf9eb1ba91b590ab1ac892':
  If in a mobile captive portal is detected enable fail fast.
 2013-08-08 17:12:35 -07:00
Wink Saville
8eec0cbe01 am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 
* commit '292a92e337f0a1b28b83f990459393f0d368c164':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
 2013-08-08 17:12:33 -07:00
Wink Saville
94e9e8f16a am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev 
* commit 'f5f75cd8f22b3d2986d0e782f6ca4a6bbfeabc21':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
 2013-08-08 17:12:30 -07:00
Wink Saville
89d16f7597 am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev 
* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
  If in a mobile captive portal is detected enable fail fast.
 2013-08-08 17:10:34 -07:00
Wink Saville
292a92e337 am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev 
* commit '7c00be48fcb1986db14915beef549e925b5670d2':
  Have CaptivePortalTracker use gservices updateable provisioning urls.
 2013-08-08 17:10:32 -07:00
Wink Saville
f5f75cd8f2 Merge "Merge commit '81132d51' into fix-merge-conflict" into klp-dev 2013-08-09 00:09:25 +00:00
Wink Saville
f35f3201db Merge commit '81132d51' into fix-merge-conflict 
* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5
 2013-08-08 16:51:46 -07:00
Jeff Brown
1c7799e2f3 am 09335703: Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 
* commit '09335703572db7d6a9b43f3aba32074e473d6a0f':
  Use new ISurfaceComposer::destroyDisplay method
 2013-08-08 16:33:27 -07:00
Jeff Brown
0933570357 Merge "Use new ISurfaceComposer::destroyDisplay method" into klp-dev 2013-08-08 23:30:31 +00:00
destradaa
b4430c5c26 am 541ba710: Merge "Add FlpHal layer to support Location Batching." into klp-dev 
* commit '541ba710731c484926440fbb9b2c39d69f38b652':
  Add FlpHal layer to support Location Batching.
 2013-08-08 16:09:52 -07:00
Dianne Hackborn
30d4de76b1 am 8a0de58e: Get ProcessStats callable from other processes. 
* commit '8a0de58ece89c467c8e7415097d193e5f8db9db8':
  Get ProcessStats callable from other processes.
 2013-08-08 16:09:50 -07:00
destradaa
541ba71073 Merge "Add FlpHal layer to support Location Batching." into klp-dev 2013-08-08 22:57:25 +00:00
David Christie
262f3ff288 am 8ffe17ae: Merge "Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION." into klp-dev 
* commit '8ffe17ae32e72e5d872a36d5048bf912d28e766f':
  Update gps status icon to be a "high power" location icon. Move icon to right side of the screen and synchronize status with AppOpsManager.OP_MONITOR_HIGH_POWER_LOCATION.
 2013-08-08 15:55:58 -07:00
Vinit Deshapnde
a87a28f392 am ce65961d: Merge "Use a single socket to communicate with supplicant" into klp-dev 
* commit 'ce65961d4d54aa7a7c24074e79dea32dfa37ea2f':
  Use a single socket to communicate with supplicant
 2013-08-08 15:55:55 -07:00
Marco Nelissen
910ebd9ed3 am d6aa2471: am ca4553d3: am 7ffbcb28: am ca5d99ac: Merge "Guarantee that all db related files are deleted together." 
* commit 'd6aa247155221b42ac96daa9b633c2a63bd945ed':
  Guarantee that all db related files are deleted together.
 2013-08-08 15:55:45 -07:00
Amith Yamasani
4458c20040 am 672d323b: Merge "Developer option to force RTL layout" into klp-dev 
* commit '672d323bb49723f843e086dd03ef977f836c5214':
  Developer option to force RTL layout
 2013-08-08 15:55:43 -07:00
David Christie
0a2ad75d2a am 4104d329: Merge "Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don\'t have to find all the different parts of the code that use it (location settings, 
* commit '4104d3295203d8a1f2d15d572293fdc1171631c6':
  Add helper methods to set/query the location master switch. Consolidates the logic of exactly what the master switch means so that if we change in the future, we don't have to find all the different parts of the code that use it (location settings, location quick settings, power widget, etc).
 2013-08-08 15:55:41 -07:00
Daniel Sandler
9a81e154cc am f6971c80: Merge "OK, now it\'s a release." into klp-dev 
* commit 'f6971c80fd413cad8e5333cd3184f41fcf64e14b':
  OK, now it's a release.
 2013-08-08 15:55:33 -07:00
Craig Mautner
3282fa984a am bd6a6e60: Use package CompatibilityInfo as default. DO NOT MERGE 
* commit 'bd6a6e6019231621644e1701b6a95093abc40333':
  Use package CompatibilityInfo as default. DO NOT MERGE
 2013-08-08 15:55:31 -07:00
Ben Murdoch
cf67ae066f am 137e5a3b: Merge "Fix the build" 
* commit '137e5a3b5a4682cb57e462583346002b2e381778':
  Fix the build
 2013-08-08 15:55:20 -07:00
Matt Casey
2c18bc286e am 77ece7b1: Merge "Extend assist context to foreground services" 
* commit '77ece7b192d45351b313ee23270caab373d3c477':
  Extend assist context to foreground services
 2013-08-08 15:55:08 -07:00
Martijn Coenen
38cfa9358c am 81ba9784: Merge "NFC: Unify ApduServiceInfo for on/off host." 
* commit '81ba97841089bd23b82c7c6feadd3112ad22966c':
  NFC: Unify ApduServiceInfo for on/off host.
 2013-08-08 15:55:05 -07:00
Ying Wang
265bbb5613 am 610247fb: Merge "Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}." 
* commit '610247fbb9f0af8e7381b1e3c76c878fca41723d':
  Fix for build breakage. Correcting the documentatation link in Sensor.java. I added a wrong link {@link #SENSOR_TYPE_ROTATION_VECTOR} instead of {@link #TYPE_ROTATION_VECTOR}.
 2013-08-08 15:55:02 -07:00
Lorenzo Colitti
b9f1639965 am a50f4b1d: Merge "Simplify LinkPropertiesTest." 
* commit 'a50f4b1d0592d34547a4bb33e08915b171f954f6':
  Simplify LinkPropertiesTest.
 2013-08-08 15:55:00 -07:00
Satoshi Kataoka
acc497e4b7 am b3c21ac7: Reduce the transaction fee of getEnabledInputMethodSubtypeList 
* commit 'b3c21ac7c661022534135bf688a75ec35fe3a8f2':
  Reduce the transaction fee of getEnabledInputMethodSubtypeList
 2013-08-08 15:54:55 -07:00
Aravind Akella
d262fb60c9 am 52df1db3: Merge "Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR." 
* commit '52df1db3ce3da57dea6322196d4566b72e36f485':
  Adding new constants for STEP_DETECTOR, STEP_COUNTER and GEOMAGNETIC_ROTATION_VECTOR.
 2013-08-08 15:54:49 -07:00
Jeff Brown
cdd4269d84 am 16ae0cf1: Merge "Add more virtual display tests." 
* commit '16ae0cf1af7ef29210c0d9dee2db012f5cf81456':
  Add more virtual display tests.
 2013-08-08 15:54:47 -07:00