Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,770 Commits 3 Branches 0 Tags
5ea9303651ae9c1412eef42b59fb427f177f842e
Commit Graph

33783 Commits

Author SHA1 Message Date
Geoffrey Borggaard
5ea9303651 am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev 
* commit '4cf435a038be4731c06602785f7dab8bee0b55af':
  UX improvements to the restrictions PIN
 2013-09-03 17:43:47 -07:00
Geoffrey Borggaard
4cf435a038 Merge "UX improvements to the restrictions PIN" into klp-dev 2013-09-04 00:41:26 +00:00
Alan Viverette
751176ef39 am 6416729c: Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 
* commit '6416729c4732be6bcdbc5f303752a9d1885f86d0':
  Add methods for managing subtitle overlays in VideoView
 2013-09-03 16:52:54 -07:00
Alan Viverette
6416729c47 Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 2013-09-03 23:51:35 +00:00
Alan Viverette
b29cb9ec4c am de59baab: Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 
* commit 'de59baab31271a186a2f32719abd19a8adbda1e3':
  Ensure list scrolling API is in parity with view scrolling API
 2013-09-03 16:35:56 -07:00
Alan Viverette
de59baab31 Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 2013-09-03 23:33:03 +00:00
Alan Viverette
de213f708f Add methods for managing subtitle overlays in VideoView 
Overlays are added directly to the VideoView, laid out to the
size of the video view, and rendered in draw().

BUG: 10260603
Change-Id: Ie8c30e5e6dcd5c6e1a2063af898afce0108a87bf
 2013-09-03 16:18:42 -07:00
Alan Viverette
ba29906334 Ensure list scrolling API is in parity with view scrolling API 
Change-Id: Icaf533c0085b80f3c52cc026e0da7468698724f9
 2013-09-03 16:01:51 -07:00
Lajos Molnar
a7cd8835bb am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev 
* commit 'a861245f06e854d47ff44155ebd3ac0e31c0cb2c':
  VideoView: add addSubtitleSource
 2013-09-03 15:53:28 -07:00
Lajos Molnar
a861245f06 Merge "VideoView: add addSubtitleSource" into klp-dev 2013-09-03 22:51:32 +00:00
Matthew Xie
171f8be412 am 02a25a97: Merge "Block ble adv api based on resource config" into klp-dev 
* commit '02a25a97a24e06768159ddc2b680c253a2ce71c7':
  Block ble adv api based on resource config
 2013-09-03 15:40:14 -07:00
Matthew Xie
02a25a97a2 Merge "Block ble adv api based on resource config" into klp-dev 2013-09-03 22:36:09 +00:00
Dianne Hackborn
2f3a88b4df am f0abed57: Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 
* commit 'f0abed57397c18f71efe47f02aa69a719390adb5':
  Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY
 2013-09-03 15:06:05 -07:00
Dianne Hackborn
f0abed5739 Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 2013-09-03 22:04:44 +00:00
Dianne Hackborn
d318e0b19f Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY 
Maybe adding more words will make it more clear. :)

Change-Id: Ie729eaba1df542d4ffcd0502ccba3807d641fd72
 2013-09-03 14:55:01 -07:00
Romain Guy
3d179241bf am 3e8105e2: Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 
* commit '3e8105e212e65005c0ef0ecc345b47eb0bf129bd':
  Update Bitmap.Config.ARGB_4444 documentation Bug #10510122
 2013-09-03 14:46:25 -07:00
Romain Guy
3e8105e212 Merge "Update Bitmap.Config.ARGB_4444 documentation Bug #10510122" into klp-dev 2013-09-03 21:41:39 +00:00
Amith Yamasani
882bfb9dda am 7eed075a: Merge "Don\'t call setLastChosen if it\'s a chooser activity instance" into klp-dev 
* commit '7eed075a43479ea646821c798b61b49bf53945b3':
  Don't call setLastChosen if it's a chooser activity instance
 2013-09-03 13:24:52 -07:00
Amith Yamasani
7eed075a43 Merge "Don't call setLastChosen if it's a chooser activity instance" into klp-dev 2013-09-03 20:22:15 +00:00
Martijn Coenen
e22cb840d5 am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev 
* commit 'b143c66987d596d9101a5b12fcd7572d4a6026fb':
  Add drawable for Apdu Services, fix build.
 2013-09-03 12:32:07 -07:00
Amith Yamasani
588dd2a3d6 Don't call setLastChosen if it's a chooser activity instance 
Bug: 10605359
Change-Id: If76f5cf2f45442dc25f9bfbd20a4d671b9caa358
 2013-09-03 12:31:42 -07:00
Martijn Coenen
b143c66987 Merge "Add drawable for Apdu Services, fix build." into klp-dev 2013-09-03 19:29:46 +00:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build. 
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
 2013-09-03 12:24:18 -07:00
Kristian Monsen
b5539b68fc am 073ff1a6: Merge "Add tracing to WebView API methods and callbacks" into klp-dev 
* commit '073ff1a6634b36727af4d00db1a3aef3c8a62568':
  Add tracing to WebView API methods and callbacks
 2013-09-03 11:57:17 -07:00
Kristian Monsen
073ff1a663 Merge "Add tracing to WebView API methods and callbacks" into klp-dev 2013-09-03 18:54:50 +00:00
Romain Guy
25ba1c8694 Update Bitmap.Config.ARGB_4444 documentation 
Bug #10510122

ARGB_4444 is deprecated and always replaced with ARGB_8888.

Change-Id: I0da96216af701a7df00ad35913066fbfa997d790
 2013-09-03 11:50:23 -07:00
Martijn Coenen
a3c92d65de am fb2f8337: NFC: @hide and remove abstract from processCommandApdu(). 
* commit 'fb2f8337f6fca9809156ddbaf0a7fe468bc1329f':
  NFC: @hide and remove abstract from processCommandApdu().
 2013-09-03 11:49:27 -07:00
Martijn Coenen
fb2f8337f6 NFC: @hide and remove abstract from processCommandApdu(). 
Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
 2013-09-03 11:40:35 -07:00
Svetoslav Ganov
38c5b2b879 am ad0ec16f: Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 
* commit 'ad0ec16fbe27e69e22b90ad9f1b9e322d8c20e8d':
  Bug fixes in the printer dialog activity and fused printer loader.
 2013-09-03 11:04:19 -07:00
Svetoslav Ganov
ad0ec16fbe Merge "Bug fixes in the printer dialog activity and fused printer loader." into klp-dev 2013-09-03 18:02:58 +00:00
Mindy Pereira
197602ded7 am 510caf30: Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 
* commit '510caf30d2f7b240ee0cb470f52299af8576ea8d':
  Add doubletap swipe to scalegesturedetector
 2013-09-03 10:49:12 -07:00
Mindy Pereira
510caf30d2 Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 2013-09-03 17:38:36 +00:00
Kenny Root
7e0609eb67 Merge changes Ic710807d,I88dfcc8c into klp-dev 
* changes:
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
 2013-09-03 17:28:41 +00:00
Martijn Coenen
ca12d4556c am dd592e2a: Merge "HCE API review." into klp-dev 
* commit 'dd592e2a0d731c061d316a2286084a6a59633390':
  HCE API review.
 2013-09-03 10:28:26 -07:00
Martijn Coenen
dd592e2a0d Merge "HCE API review." into klp-dev 2013-09-03 17:25:01 +00:00
Svetoslav Ganov
9186d0cb2b Bug fixes in the printer dialog activity and fused printer loader. 
1. Fused printers loader was not using the discovered printers to update the
    historical ones. Now if a historical printer is discovered we update its state
    with the discovered, i.e. most recent, information.

2. Fixed a bug in the destination adapter of the print job config dialog that
    was leading to a crash if all printers item is selected when there are no
    discovered printers.

3.  Updated the add printers asset in the all printers screen.

4. Historical printers were not persisted by the print dialog activity.

5. Reduced the number of printers we send per transation to avoid the binder
   transaction size limit. Added sending of printers in chunks in a place
   this was missing.

Change-Id: I88b54888360bc0e53b06bd260c2b832d0d6454b6
 2013-09-03 08:42:17 -07:00
Kenny Root
a39859889b Add support for DSA and ECDSA key types 
(cherry picked from commit f64386fc26)

Bug: 10600582
Change-Id: I88dfcc8ca602f55fad54bd8bf043aee460c0de24
 2013-09-03 00:53:04 -07:00
Svetoslav Ganov
9d4620c423 am 96661c42: Merge "System print service enabled after every system reboot" into klp-dev 
* commit '96661c42d0643c129fed60678aa0b8f99d32b456':
  System print service enabled after every system reboot
 2013-09-03 00:26:51 -07:00
Svetoslav Ganov
96661c42d0 Merge "System print service enabled after every system reboot" into klp-dev 2013-09-03 07:24:57 +00:00
Kenny Root
c62a8b71b4 am 333bd17e: am 7adc233c: Merge "Add support for DSA and ECDSA key types" 
* commit '333bd17eec47a78d3ae8081d828ab1440e621e03':
  Add support for DSA and ECDSA key types
 2013-09-03 00:18:40 -07:00
Kenny Root
333bd17eec am 7adc233c: Merge "Add support for DSA and ECDSA key types" 
* commit '7adc233cf8f6f9e2a83a4549a9295d1a3933beab':
  Add support for DSA and ECDSA key types
 2013-09-03 00:15:43 -07:00
Kenny Root
7adc233cf8 Merge "Add support for DSA and ECDSA key types" 2013-09-03 07:11:36 +00:00
Jeff Sharkey
92c7406b85 am 7c925042: Merge "New recents behavior to match spec." into klp-dev 
* commit '7c925042061bf4b80cf80a7e6d94995c62eca7e1':
  New recents behavior to match spec.
 2013-09-02 20:51:44 -07:00
Jeff Sharkey
7c92504206 Merge "New recents behavior to match spec." into klp-dev 2013-09-03 03:50:27 +00:00
Jeff Sharkey
8c58b79243 am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev 
* commit 'cd6d7deec8742e257a670db8e027f628afdf337e':
  Refactoring of DocumentsContract.
 2013-09-02 17:09:15 -07:00
Jeff Sharkey
cd6d7deec8 Merge "Refactoring of DocumentsContract." into klp-dev 2013-09-03 00:07:17 +00:00
Svetoslav Ganov
6bd20bc46c System print service enabled after every system reboot 
The system was overriding the user on every boot by turing of all system
print services, i.e. service that are on the system image. Now the system
print service are enabled by default only once per user, the user can later
disable them and the system does not override that. We now have a system
setting with the services we enabled once by default so we never do
default enabling again (unless device is wiped).

bug:10594775

Change-Id: Id3129ccfba95bf57375ea9fec0b5ca0e51bda199
 2013-09-02 15:35:06 -07:00
Jeff Sharkey
251097b378 New recents behavior to match spec. 
Updated behavior queries each documents root for recently modified
documents.  It uses a new variant of DirectoryLoader which limits the
maximum number of parallel queries to relieve memory pressure.  When
first started, it waits up to 500ms for everyone to finish, then
publishes whatever results are ready, and then refreshes results as
each straggler finishes.

New RootCursorWrapper that always blends in authority and rootId
columns, which are used for binding root details from blended cursors.

Bug: 10593596, 10329994
Change-Id: Icc0d4a2f1b6166edc72f78a4c88f444eeba6f2f0
 2013-09-02 15:33:57 -07:00
Przemyslaw Szczepaniak
0b16214593 am 61dda198: Fix SynthesisRequest javadoc 
* commit '61dda198598e95971ca224e3bcb7393f30e45657':
  Fix SynthesisRequest javadoc
 2013-09-02 09:47:51 -07:00
Przemyslaw Szczepaniak
61dda19859 Fix SynthesisRequest javadoc 
Bug: 10548784
Change-Id: I76a89bb9accdeee00c60a668adbdd789b995cd92
 2013-09-02 16:41:05 +01:00