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

112635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timothy Knight
23c8809568 Camera2: Updated Rational for denom=0. 
Handle NaN and INF using the same semantics as Java floats. No longer
throw an exception if a rational is constructed with a zero-denominator.

This commit is required for the ITS pdk app, since without it, the app
fails when it tries to deserialize rational values that are
(incorrectly) set to 0/0.

Bug: 10337323

Change-Id: I890ec2092f2945abc0f531fc46f9a7f5c71d2dbf
 2013-09-04 16:58:58 +00:00
Scott Main
1eaa66559c am b0b5ec77: am 7f043de9: am c6ed9ff7: am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'b0b5ec777d7bf578e742f51e5ced43cf32285c3a':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:29:02 -07:00
Scott Main
b0b5ec777d am 7f043de9: am c6ed9ff7: am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit '7f043de9a9eb0b071b93ddfffdc5ba0f6d1c7309':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:26:15 -07:00
Scott Main
8241cb8239 am eec4cb1f: am 703b34bb: am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit 'eec4cb1fea2549082b778c519534158ea2e08fd1':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:25:35 -07:00
Scott Main
7f043de9a9 am c6ed9ff7: am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs 
* commit 'c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42':
  replace instances of Wi-Fi Direct with Wi-Fi P2P
 2013-09-04 09:23:13 -07:00
Scott Main
eec4cb1fea am 703b34bb: am f579f134: am e0718c04: am 605d56c0: Merge "clarify javadoc for constructors. bug: 10563421" into jb-mr2-docs 
* commit '703b34bb13e009b8d82f96f17626f806007bd042':
  clarify javadoc for constructors. bug: 10563421
 2013-09-04 09:22:48 -07:00
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
4aa7bf0ab5 am 57685b67: am e57d1174: Merge "add Noto Sans Khmer and Lao" into klp-dev 
* commit '57685b67963d911679215b6fe54d9cf41f47a89f':
  add Noto Sans Khmer and Lao
 2013-09-04 08:38:39 -07: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
7275ecc509 am 70c2dd93: am 2cf8138b: Merge "Add LocationManager.MODE_CHANGED_ACTION broadcast" into klp-dev 
* commit '70c2dd932bd585ed578ea684db06f17c4e5d24d3':
  Add LocationManager.MODE_CHANGED_ACTION broadcast
 2013-09-04 07:21:16 -07: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
2a63a4a253 am 05aafe72: am 40de3917: Merge "Icon updates: location, settings, cdma roaming" into klp-dev 
* commit '05aafe72219d1c0c527e48718f5f40fe428dd1ba':
  Icon updates: location, settings, cdma roaming
 2013-09-04 06:43:53 -07:00
John Spurlock
30331c97bb am a92623f7: am 20c9606f: Merge "Remove unused status bar icon stat_sys_secure." into klp-dev 
* commit 'a92623f7763ee31e14566cfbed727e722d4e5689':
  Remove unused status bar icon stat_sys_secure.
 2013-09-04 06:40:19 -07: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
d3effc3941 am 1b6d0891: am 11254ade: Merge "Add provideAssistData attr to public.xml" into klp-dev 
* commit '1b6d08916c88827839416afd2ac264d422c469e7':
  Add provideAssistData attr to public.xml
 2013-09-04 05:27:10 -07: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
3b2b75be86 am 9062bca6: am 29565900: Fix the build. 
* commit '9062bca653b800aeb6e1fb53d997a8e452a706fc':
  Fix the build.
 2013-09-04 05:16:14 -07: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
cec667c83d am 50010c87: am 87399fc2: SubtitleController: update to new CaptioningManager APIs 
* commit '50010c8713e8154183edeb8bd56d7de35baa43a8':
  SubtitleController: update to new CaptioningManager APIs
 2013-09-03 23:07:41 -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
c5d241af31 am 79127cbe: (-s ours) am 85e479b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '79127cbedf4d28393b1bb6ca39677b52622ee8fa':
  Import translations. DO NOT MERGE
 2013-09-03 21:51:39 -07:00
Baligh Uddin
5e2edfbb58 am 2774202a: (-s ours) am df8fe744: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2774202a9fbe171e12d63692230ef51b4791ddca':
  Import translations. DO NOT MERGE
 2013-09-03 21:51:36 -07:00
Baligh Uddin
91542089b6 am 35011468: (-s ours) am b414cbdd: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '35011468e7e9e1b078be15b1c505666b4f2bd000':
  Import translations. DO NOT MERGE
 2013-09-03 21:51:33 -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
002564b727 Merge "Import translations. DO NOT MERGE" 2013-09-04 04:44:46 +00:00
Baligh Uddin
f273c2fca7 Merge "Import translations. DO NOT MERGE" 2013-09-04 04:44:36 +00:00
Baligh Uddin
85e479b3d7 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-09-04 04:44:27 +00:00
Baligh Uddin
367176b567 Merge "Import translations. DO NOT MERGE" 2013-09-04 04:44:04 +00:00