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

111162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
2a59f3f240 Merge "Internal WebVtt subtitle support" into klp-dev 2013-09-04 21:22:46 +00:00
Alan Viverette
3aa1824801 Merge "Implement drag-to-open in ActivityChooserView" into klp-dev 2013-09-04 21:17:00 +00:00
Romain Guy
cb039124c1 Merge "Don't draw with invalid display lists Bug #10301674" into klp-dev 2013-09-04 21:16:23 +00:00
Romain Guy
f66645671f Don't draw with invalid display lists 
Bug #10301674

Change-Id: I900322dcb9b53f0eb82741c94d4ab1eaf939259e
 2013-09-04 14:14:07 -07:00
Chet Haase
5f25f7c373 Merge "Perform layout and invalidation after bringChildToFront()" into klp-dev 2013-09-04 21:13:31 +00:00
Timothy Knight
2629f27362 Camera2: Clarified docs for 3A regions. 
Bug: 10545568
Change-Id: I0a76e7d063ceccb68707973abd312a1b909155ec
 2013-09-04 21:07:13 +00:00
Timothy Knight
1b039b1d2e Merge "Camera2: Updated Rational for denom=0." into klp-dev 2013-09-04 20:25:35 +00:00
Dianne Hackborn
3cd28adc5d Merge "Fix issue #10427108: Google+ has long running process" into klp-dev 2013-09-04 20:22:27 +00:00
David Christie
61edc94ab5 Merge "Make location QuickSettings multi-user compatible (b/10563313)" into klp-dev 2013-09-04 19:22:54 +00:00
Lajos Molnar
76935a5890 Internal WebVtt subtitle support 
Change-Id: Ia55673a68a99c277dd6e3246e6f1913c8eb476d8
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
 2013-09-04 12:17:10 -07:00
John Spurlock
48a278aeaf Merge "Change semi-transparent system bar from 33 to 40% black." into klp-dev 2013-09-04 19:03:52 +00:00
Lajos Molnar
4958c9d616 Merge "Add MediaTimeProvider to MediaPlayer" into klp-dev 2013-09-04 18:58:12 +00:00
John Spurlock
51a28a211d Change semi-transparent system bar from 33 to 40% black. 
Bug:10502089
Change-Id: I045dab25e16a2711ed48659412022bee0fd4e2b2
 2013-09-04 14:47:17 -04:00
David Christie
b12ba933f3 Make location QuickSettings multi-user compatible (b/10563313) 
Change-Id: I8ae5238e66fa2d6890ffe5697d3e6d5f50413c3e
 2013-09-04 11:36:17 -07:00
Chet Haase
cb96db8d14 Perform layout and invalidation after bringChildToFront() 
Previously, calls to ViewGroup.bringChildToFront() or View.bringToFront()
would need to be followed by calls to requestLayout() and invalidate()
to force the container to redraw with the new child ordering. This
change calls requestLayout() and invalidate() automatically.

Issue #8667065 bringtoTop does not work

Change-Id: Id37ce7a64dead82119e49f7a1b28385cf0d1f20d
 2013-09-04 11:28:57 -07:00
Derek Sollenberger
4c92f7cec7 Merge "Revert workaround for Skia bug now that Skia has been fixed." into klp-dev 2013-09-04 17:36:22 +00:00
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
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
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
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
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
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