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

111304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
c6ed9ff77a am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'ca0d88b841db52fc926027f412003a8bf6efdf39':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:20:31 -07:00
Scott Main
703b34bb13 am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'f579f134ee9495571899be958983a1a242457603':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:19:46 -07:00
Scott Main
ca0d88b841 am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'c3adcf9dc745932bf3a059a7201644dd96b97750':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:18:23 -07:00
Scott Main
f579f134ee am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'e0718c044bc81db0334f2973b9884b968c18ce07':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:17:05 -07:00
Scott Main
c3adcf9dc7 Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 2013-09-04 16:15:00 +00:00
Scott Main
e0718c044b am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit '605d56c0492536488c997c6ca0b85fd38fd4e19a':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:13:57 -07:00
Scott Main
605d56c049 Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 2013-09-04 16:10:59 +00:00
Victoria Lease
e57d117410 Merge "add Noto Sans Khmer and Lao" into klp-dev 2013-09-04 15:34:57 +00:00
John Spurlock
5e777f6685 Re-@hide activity-level FLAG_IMMERSIVE and helpers. 
Un-@hidden in api 18, but probably should not have been.

The framework currently takes no action based on the flag,
making the docs misleading.

Bug:10460791
Change-Id: If6cc8791a85710897c8fe77cf6682d1460e3416e
 2013-09-04 15:28:50 +00:00
Derek Sollenberger
2696797939 Revert workaround for Skia bug now that Skia has been fixed. 
bug: 7170836
Change-Id: If357767a5f66d539f775bce766e963b3d0df38bf
 2013-09-04 10:50:06 -04:00
John Spurlock
fcc901c10b Remove signal/wifi activity indicator icon overlays. 
Bug:10607423
Change-Id: Ib58c5a6759b54f5c84aa2de414bef0f7f3d9b21d
 2013-09-04 10:36:27 -04:00
Tom O'Neill
2cf8138b91 Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 2013-09-04 14:16:12 +00: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
11254adec7 Merge "Add provideAssistData attr to public.xml" into klp-dev 2013-09-04 12:22:10 +00: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
484ff7a922 Add subtitle support to VideoView. 
Change-Id: Ibfde491a624272c4f9733098529ad70c6aa93fe0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-03 23:33:05 -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
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
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
bb45c8ac20 Merge "Internal subtitle base support" into klp-dev 2013-09-04 04:28:01 +00: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
Lajos Molnar
3d99856f80 Add MediaTimeProvider to MediaPlayer 
Change-Id: Ie56331ef4eb4bdffa606598f241edb1cb2c2e2dc
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-03 19:23:25 -07:00
Dianne Hackborn
ae36b236d2 Fix issue #10427108: Google+ has long running process 
There was a bug in counting the number of starting services
in a process that would cause it to count too many (it would
increment at any state change while the service is started, not
just when starting/stopping).

Also reduce dumpsys output -- only print summaries for old
data.  There is probably no utility in printing the long details
of all that data.

Change-Id: I1c1e901b0214c01eb7d071f23166fc6f3702ca67
 2013-09-03 18:12:53 -07:00
Tom O'Neill
40a86c24d2 Add LocationManager.MODE_CHANGED_ACTION broadcast 
- Currently redundant with PROVIDERS_CHANGED_ACTION, but that may
change in the future

- Part of fix for b/10409275

Change-Id: I12daaf20e6546fd9e9dc71c599967fa0ad95e27f
 2013-09-03 18:07:10 -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
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
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
6416729c47 Merge "Add methods for managing subtitle overlays in VideoView" into klp-dev 2013-09-03 23:51:35 +00:00
Wink Saville
ce1e37981c Add provisioning apn timeout. 
Bug: 10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
 2013-09-03 16:41:44 -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
a861245f06 Merge "VideoView: add addSubtitleSource" into klp-dev 2013-09-03 22:51:32 +00: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
f0abed5739 Merge "Fix issue #10461469: KLP API Review: EXTRA_SHUTDOWN_USERSPACE_ONLY" into klp-dev 2013-09-03 22:04:44 +00:00