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

112409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
80454d693d Merge "Import translations. DO NOT MERGE" 2013-09-04 04:43:06 +00:00
Jeff Sharkey
063a7462a6 am 8dd4bee2: am 5b3f4aa8: Merge "Show loading, error, and info messages as footers." into klp-dev 
* commit '8dd4bee2405aa6d1868130c3cc02f68d627987f7':
  Show loading, error, and info messages as footers.
 2013-09-03 21:39:17 -07:00
Jeff Sharkey
597e7e0f21 am fe0a0873: am 100558ec: Merge "Updated documents UX around action bar." into klp-dev 
* commit 'fe0a0873f9a321d2602950378cb1ad117836784a':
  Updated documents UX around action bar.
 2013-09-03 21:39:14 -07:00
Jeff Sharkey
8dd4bee240 am 5b3f4aa8: Merge "Show loading, error, and info messages as footers." into klp-dev 
* commit '5b3f4aa84fe3f97075f4ed0763c9ee8a3dd2065d':
  Show loading, error, and info messages as footers.
 2013-09-03 21:36:12 -07:00
Jeff Sharkey
fe0a0873f9 am 100558ec: Merge "Updated documents UX around action bar." into klp-dev 
* commit '100558ec646f729fd59ad7cec161febb8d09dac3':
  Updated documents UX around action bar.
 2013-09-03 21:36:09 -07:00
Jeff Sharkey
5b3f4aa84f Merge "Show loading, error, and info messages as footers." into klp-dev 2013-09-04 04:34:18 +00:00
Jeff Sharkey
100558ec64 Merge "Updated documents UX around action bar." into klp-dev 2013-09-04 04:34:15 +00:00
Lajos Molnar
60eb0bae24 am 71c7fc7f: am bb45c8ac: Merge "Internal subtitle base support" into klp-dev 
* commit '71c7fc7f16d6f04acf226c16051c093e93d12b8c':
  Internal subtitle base support
 2013-09-03 21:31:37 -07:00
Lajos Molnar
71c7fc7f16 am bb45c8ac: Merge "Internal subtitle base support" into klp-dev 
* commit 'bb45c8ac20dfee4a94cadd01d8e126c99918d426':
  Internal subtitle base support
 2013-09-03 21:29:35 -07:00
Lajos Molnar
bb45c8ac20 Merge "Internal subtitle base support" into klp-dev 2013-09-04 04:28:01 +00:00
Aravind Akella
49cbf9c438 am f41e223e: am 1f519d46: Fix for build breakage. Remove documentation link to hidden registerListener API. 
* commit 'f41e223efef6b270ff27fe2035914ab3528f3a5f':
  Fix for build breakage. Remove documentation link to hidden registerListener API.
 2013-09-03 20:50:36 -07:00
Aravind Akella
f41e223efe am 1f519d46: Fix for build breakage. Remove documentation link to hidden registerListener API. 
* commit '1f519d46828f11413c70653ce5c31eba25b3f633':
  Fix for build breakage. Remove documentation link to hidden registerListener API.
 2013-09-03 20:48:45 -07:00
Aravind Akella
1f519d4682 Fix for build breakage. Remove documentation link to hidden registerListener API. 
Change-Id: Iba5d623bf12f1b6654f570febcc65d591d309038
 2013-09-03 19:37:24 -07:00
Martijn Coenen
070cfb2da0 am a5259f62: am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev 
* commit 'a5259f6261ed4521d70d02328807aab34275a706':
  Reader mode NFC API: move to callback model.
 2013-09-03 17:53:53 -07:00
Christopher Tate
513459da2d am 3fabe12b: am d0688beb: Merge "Sanity check users before committing new Android ID" into klp-dev 
* commit '3fabe12bf8a16540af38d1934d6590949c9d1fff':
  Sanity check users before committing new Android ID
 2013-09-03 17:53:50 -07:00
Igor Murashkin
afb0317fa0 am 6cbd7a8f: am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 
* commit '6cbd7a8f4fd921ea1b0ad3d1da0580b384a1855e':
  camera2: Don't NPE when closing the CameraDevice
 2013-09-03 17:53:46 -07:00
Alan Viverette
c80531ae5f am f37fb4d9: am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 
* commit 'f37fb4d95b6ed790b7c2de5268bd3e20d76aa146':
  Fix pre tag formatting in getDragToOpenListener documentation
 2013-09-03 17:53:43 -07:00
Martijn Coenen
a5259f6261 am f48416de: Merge "Reader mode NFC API: move to callback model." into klp-dev 
* commit 'f48416dede08b243c90738ec108a08041d7609c2':
  Reader mode NFC API: move to callback model.
 2013-09-03 17:51:23 -07:00
Christopher Tate
3fabe12bf8 am d0688beb: Merge "Sanity check users before committing new Android ID" into klp-dev 
* commit 'd0688beb6890ca3888d08d250ad33655a2a588d5':
  Sanity check users before committing new Android ID
 2013-09-03 17:51:18 -07:00
Martijn Coenen
f48416dede Merge "Reader mode NFC API: move to callback model." into klp-dev 2013-09-04 00:48:20 +00:00
Christopher Tate
d0688beb68 Merge "Sanity check users before committing new Android ID" into klp-dev 2013-09-04 00:48:06 +00:00
Igor Murashkin
6cbd7a8f4f am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev 
* commit '979cf8e461c6790747b2bb6dcc4c0784ca34dbdd':
  camera2: Don't NPE when closing the CameraDevice
 2013-09-03 17:47:43 -07:00
Alan Viverette
f37fb4d95b am 40fbaa79: Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 
* commit '40fbaa79bc31aadefc5dacb314f66b5bcb6d52ae':
  Fix pre tag formatting in getDragToOpenListener documentation
 2013-09-03 17:47:39 -07:00
Aravind Akella
567753c895 am ce025258: am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 
* commit 'ce025258ed12d1885150bae41f367248c0f65f97':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
 2013-09-03 17:45:24 -07:00
Geoffrey Borggaard
ae1010646d am 5ea93036: am 4cf435a0: Merge "UX improvements to the restrictions PIN" into klp-dev 
* commit '5ea9303651ae9c1412eef42b59fb427f177f842e':
  UX improvements to the restrictions PIN
 2013-09-03 17:45:21 -07:00
Igor Murashkin
979cf8e461 Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev 2013-09-04 00:44:31 +00:00
Alan Viverette
40fbaa79bc Merge "Fix pre tag formatting in getDragToOpenListener documentation" into klp-dev 2013-09-04 00:44:11 +00:00
Aravind Akella
ce025258ed am 14abafa1: Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 
* commit '14abafa10853d979d184e2e934253aaded105137':
  Sensor batching. Implementation for registerListener(with batch support) and flush APIs.
 2013-09-03 17:43:50 -07:00
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
Aravind Akella
14abafa108 Merge "Sensor batching. Implementation for registerListener(with batch support) and flush APIs." into klp-dev 2013-09-04 00:41:52 +00:00
Geoffrey Borggaard
4cf435a038 Merge "UX improvements to the restrictions PIN" into klp-dev 2013-09-04 00:41:26 +00:00
Lajos Molnar
03c25794b6 Internal subtitle base support 
Change-Id: I3fc57d6280773dc24f4822be21c9497ae70f7374
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-03 17:19:56 -07:00
Jeff Sharkey
954be02326 Show loading, error, and info messages as footers. 
A provider can include extras in their Cursors to indicate that
loading is ongoing, or include an error or informational message,
which are now shown in footer views.

Fix registration to always get change notifications.

Test provider that verifies common provider behavior of holding
a reference to "cloud" resources that are released by GC when the
remote Cursor is closed.  Also used to validate Recents behavior
for slow providers.

Bug: 10599268
Change-Id: I331c31058dbb80261e7d279b851197c65ac87e32
 2013-09-03 17:02:47 -07:00
Aravind Akella
b4c76b18a3 Sensor batching. Implementation for registerListener(with batch support) and flush APIs. 
Bug: 10109508
Change-Id: I6dfdd986bd8c3368cb568fa7d90abf9c03de9aef
 2013-09-03 17:02:41 -07:00
Christopher Tate
38e7a60fd7 Sanity check users before committing new Android ID 
In creation/deletion cycling we can wind up racing and attempting
to establish the Android ID on first access *after* the user has
already been deleted.  Cope gracefully with this outcome.

Bug 10608503

Change-Id: I169d5052e5a2e354ce0e1f61258e45e31f5ba171
 2013-09-03 16:57:34 -07:00
Alan Viverette
84ae8913a7 am 751176ef: am 6416729c: Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 
* commit '751176ef3903239dc2de55664c3c1c273917201e':
  Add methods for managing subtitle overlays in VideoView
 2013-09-03 16:57:11 -07: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
419c8ebbdc am b29cb9ec: am de59baab: Merge "Ensure list scrolling API is in parity with view scrolling API" into klp-dev 
* commit 'b29cb9ec4c343248dfd06b130459db13ae61142d':
  Ensure list scrolling API is in parity with view scrolling API
 2013-09-03 16:38:58 -07:00
Romain Guy
b6c4324fba am 9a160a52: am e182bfd4: Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev 
* commit '9a160a52b9edfc32e2fe444b3925534ae21ed5bc':
  Prevent NPE when cloning gradients Bug #10436856
 2013-09-03 16:38:55 -07: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
Romain Guy
9a160a52b9 am e182bfd4: Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev 
* commit 'e182bfd4dcf35d5009bcae72356b999b5ead0433':
  Prevent NPE when cloning gradients Bug #10436856
 2013-09-03 16:35:53 -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
Romain Guy
e182bfd4dc Merge "Prevent NPE when cloning gradients Bug #10436856" into klp-dev 2013-09-03 23:32:33 +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
Romain Guy
9622adf6e8 Prevent NPE when cloning gradients 
Bug #10436856

Change-Id: I98cbce941a06842112b8caa3753a3fa32b227da9
 2013-09-03 16:08:00 -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
3e63d77837 am a7cd8835: am a861245f: Merge "VideoView: add addSubtitleSource" into klp-dev 
* commit 'a7cd8835bb1392d5512012160bc8bd2ccad3efaf':
  VideoView: add addSubtitleSource
 2013-09-03 15:54:54 -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