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

112094 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
57685b6796 am e57d1174: Merge "add Noto Sans Khmer and Lao" into klp-dev 
* commit 'e57d11741049f32af648e92923ae1564b7bb0078':
  add Noto Sans Khmer and Lao
 2013-09-04 08:37:16 -07: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
70c2dd932b am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 
* commit '2cf8138b919e543032cebe7eeb5777acb3431aee':
  Add LocationManager.MODE_CHANGED_ACTION broadcast
 2013-09-04 07:19:05 -07: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
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
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
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
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
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