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

111818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
05aafe7221 am 40de3917: Merge "Icon updates: location, settings, cdma roaming" into klp-dev 
* commit '40de39171b9ddf49c20600d750b99e4033416665':
  Icon updates: location, settings, cdma roaming
 2013-09-04 06:39:39 -07:00
John Spurlock
a92623f776 am 20c9606f: Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 
* commit '20c9606f5770496ffef45dd3d02a9885d3bed6b6':
  Remove unused status bar icon stat_sys_secure.
 2013-09-04 06:36:07 -07:00
John Spurlock
40de39171b Merge "Icon updates: location, settings, cdma roaming" into klp-dev 2013-09-04 13:35:07 +00:00
John Spurlock
20c9606f57 Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 2013-09-04 13:32:18 +00:00
John Spurlock
43701dbfa0 Icon updates: location, settings, cdma roaming 
Bug:10502089
Change-Id: I2cc1b6bd8e1998830228b1d174cd4af13a1f1b6e
 2013-09-04 09:23:40 -04:00
Adam Skory
1b6d08916c am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev 
* commit '11254adec733956085567af38036ab0e1e0e300f':
  Add provideAssistData attr to public.xml
 2013-09-04 05:24:11 -07:00
Adam Skory
11254adec7 Merge "Add provideAssistData attr to public.xml" into klp-dev 2013-09-04 12:22:10 +00:00
Ben Murdoch
9062bca653 am 29565900: Fix the build. 
* commit '295659002ae490481798a16e39b5f88e80a8151e':
  Fix the build.
 2013-09-04 05:13:20 -07:00
Ben Murdoch
295659002a Fix the build. 
Fix javadoc typo.

Change-Id: I3e5f8f43650ce7b0958512bacc36e0ee744efa40
 2013-09-04 13:09:10 +01:00
Adam Skory
16731d4dc0 Add provideAssistData attr to public.xml 
http://ag/323631 added the provideAssistData
attribute to the Service manifest tag.

It did not, however, add that attribute to
public.xml - making it impossible to actually
build a service that defines said tag.

So, add it.

Now that the attribute is where it should be,
restore @link notation to ServiceInfo.java
without breaking the offline docs build
( see http://ag//340279 ).

Also, make some log warnings related to
providing assist data slightly more verbose.

Bug: 10573008
Change-Id: Ie2bcb411c182d69738a2fa4a74de3171b9b9c455
 2013-09-04 12:30:47 +01:00
Lajos Molnar
50010c8713 am 87399fc2: SubtitleController: update to new CaptioningManager APIs 
* commit '87399fc21b642688a690be5869f14a7ba020afdb':
  SubtitleController: update to new CaptioningManager APIs
 2013-09-03 23:05:11 -07:00
Lajos Molnar
87399fc21b SubtitleController: update to new CaptioningManager APIs 
This resolves the build issue.

Change-Id: I4db018c1abd9677ceb6d355921e4f7fa4be3b037
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-03 22:54:38 -07:00
Baligh Uddin
79127cbedf am 85e479b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '85e479b3d709ab4f3b5372380a4463506340ebe7':
  Import translations. DO NOT MERGE
 2013-09-03 21:46:12 -07:00
Baligh Uddin
2774202a9f am df8fe744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'df8fe74455ca1ecccc0604cef0d36e101fe735be':
  Import translations. DO NOT MERGE
 2013-09-03 21:46:10 -07:00
Baligh Uddin
35011468e7 am b414cbdd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b414cbddb9d64c400d2bbd307c62317a8f529bcd':
  Import translations. DO NOT MERGE
 2013-09-03 21:46:07 -07:00
Baligh Uddin
85e479b3d7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 04:44:27 +00:00
Baligh Uddin
df8fe74455 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 04:43:51 +00:00
Baligh Uddin
b414cbddb9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 04:43:28 +00: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
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
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
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
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
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
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