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

183905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
b1febc7f89 Merge "Add a timeout state to frozen windows" 2015-03-10 17:41:54 +00:00
Alan Viverette
7d6bc4f022 Merge "Revert RelativeLayout's baseline view to API 22 and below behavior" 2015-03-10 17:19:53 +00:00
Elliott Hughes
126d89bb79 Merge "resolved conflicts for merge of 7545accf to master" 2015-03-10 17:15:42 +00:00
Elliott Hughes
c0b8f647ca resolved conflicts for merge of 7545accf to master 
Change-Id: I7a9264e818fdd14bf59f0dec63ab83985f9e66fb
 2015-03-10 10:14:42 -07:00
Chris Craik
edacf22ca1 Merge "Glop based composeLayerRegion/Rect" 2015-03-10 16:29:14 +00:00
Chris Craik
ddd72599bf Merge "Rename and simplify DisplayList Canvas classes" 2015-03-10 16:29:01 +00:00
Luan Nguyen
2fb1d06600 am b219eac8: am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'b219eac8e827b034472cf885071b7e76ed6e4d60':
  docs: Add new partners to Wear index page
 2015-03-10 15:49:12 +00:00
Geoff Mendal
c26921538d am c90aa638: (-s ours) am 535bf0f8: (-s ours) am d7852b66: (-s ours) Import translations. DO NOT MERGE 
* commit 'c90aa638f6465f383e40b2063d38496aab7b8914':
  Import translations. DO NOT MERGE
 2015-03-10 15:47:51 +00:00
Eric Gilmore
2977c05fec am 89d0c0fb: am bcea1fcd: am f1eab6f5: am 39d47c7c: am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs 
* commit '89d0c0fbaec976b8b06c81a2950aed3a3c5e5b1b':
  Reworking geofencing training to new API and sample.
 2015-03-10 15:47:43 +00:00
Glenn Kasten
c9f94b9c81 am f507759e: am e442d914: am ad97ca81: am 4c0b2345: am 8f9ae232: am 36d008c5: am 5afdc97f: Fix USB typos 
* commit 'f507759eea9aaf5eb9aeaef9d93ab4914c1c5b25':
  Fix USB typos
 2015-03-10 15:47:34 +00:00
Rubin Xu
ba4df96297 Merge "Document behavior change of isUninstallBlocked() since L MR1" 2015-03-10 12:34:57 +00:00
Rubin Xu
e1e6faad7b Document behavior change of isUninstallBlocked() since L MR1 
Bug: 17914630
Change-Id: I39ee2775c104e4dca7ca583b83deef0aa0e4d1e3
 2015-03-10 12:22:16 +00:00
Chris Craik
c9070ebd13 Rename and simplify DisplayList Canvas classes 
Change-Id: I49fd2ce02e01401209fe2a378e9f9547c7b27c61
 2015-03-09 19:09:55 -07:00
Mike Lockwood
7f602b75ee Merge "MIDI Manager changes:" 2015-03-10 02:03:00 +00:00
Alan Viverette
53776a2b3c Merge "Refactor ripple components, simplify background animation" 2015-03-10 01:51:59 +00:00
Adam Lesinski
216f3edcb9 Merge "BatteryStats: Record energy info stats from WiFi and Bluetooth controllers" 2015-03-10 01:35:54 +00:00
Alan Viverette
f872ee0057 Refactor ripple components, simplify background animation 
Moves animation lifecycle and software/hardware hand-off into a unified
RippleComponent class, which makes it easier to maintain the components.
Adds better javadocs and comments to explain what's going on.

Bug: 19431322
Change-Id: Ifb9b9a7dcc24238719ef12293493ca3df107679f
 2015-03-09 18:25:21 -07:00
Glenn Kasten
a080050e42 Merge "Revert "soundpool: reuse channel for same sample if available"" 2015-03-10 01:07:32 +00:00
Chris Craik
182952f5ee Glop based composeLayerRegion/Rect 
Change-Id: I69440cabca84948e8aaead9479d616ebc2496517
 2015-03-09 18:06:32 -07:00
Glenn Kasten
01771a9f7d Merge "Revert "soundpool: update sample rate when reusing audiotrack"" 2015-03-10 01:06:29 +00:00
Roozbeh Pournader
d1eca77c3c Merge "Fix: Drag handles are not shown for selection/insertion" 2015-03-10 01:06:03 +00:00
Alan Viverette
0e14a85768 Revert RelativeLayout's baseline view to API 22 and below behavior 
The previous behavior used the top-start-most view, rather than the view
with the bottom-most baseline. Which doesn't really make sense, but
that's what it did.

Bug: 19653790
Change-Id: Ia23476f1d2de5313fd82aac037e90d45b0af8972
 2015-03-09 18:01:19 -07:00
Andy Hung
0e9a8f6a8e Merge "Fix SoundPool playback of multichannel files." 2015-03-10 00:38:06 +00:00
Adam Lesinski
33dac55935 BatteryStats: Record energy info stats from WiFi and Bluetooth controllers 
Surface some of this information in BatteryStatsHelper. If we are given a
total energy from the WiFi controller, we normalize the computed
energy of each app and blame them for a fraction of the real energy.

Change-Id: I64051b600f5d9f6ac4580d56ef0977971eb4be2d
 2015-03-09 17:36:13 -07:00
Alan Viverette
b5c4623b7f Merge "Copy ViewPager and PagerAdapter into framework-internal widgets" 2015-03-10 00:22:39 +00:00
Eino-Ville Talvala
62d9670e98 Merge "Add DEPTH image formats, support in ImageReader" 2015-03-10 00:16:16 +00:00
Eric Laurent
68c265c74d Merge "enable FM tuner and hotword capture for system apps." 2015-03-10 00:06:12 +00:00
Adrian Roos
6f59787d2f Merge "Add prototype of Inline Reply behind debug flag" 2015-03-09 23:53:57 +00:00
Eino-Ville Talvala
805f3c9428 Add DEPTH image formats, support in ImageReader 
- Add an explicit mapping between public ImageFormat/
  PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
  formats

Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
 2015-03-09 16:42:25 -07:00
Eino-Ville Talvala
a72d640134 Merge "Camera2: Add hidden depth stream configuration tags" 2015-03-09 23:29:28 +00:00
Eino-Ville Talvala
7e443fbe85 Merge "Camera2: Remove unused parameters in ICameraDeviceUser#createStream" 2015-03-09 23:29:10 +00:00
Alan Viverette
f44b94c2ad Merge "Make TypedArray and LayoutInflater exceptions more useful" 2015-03-09 22:53:55 +00:00
Alan Viverette
75fd8f9fdc Copy ViewPager and PagerAdapter into framework-internal widgets 
Converted all compat references to native implementations. Removed all
backwards compatibility SDK version checks.

Bug: 19431364
Change-Id: Ia79ed65bd2d041e4c0de6839b64707b9dba3ac22
 2015-03-09 15:51:10 -07:00
Alan Viverette
93795053da Make TypedArray and LayoutInflater exceptions more useful 
Include unresolved TypedValue data in TypedArray exceptions, wrap all
LayoutInflater exceptions with the parser position.

Bug: 19658760
Change-Id: I8965bdc4d0c58c082cb7129c3b692a3e5418cfdb
 2015-03-09 15:32:50 -07:00
Adam Lesinski
488caeb702 Change WiFi and Bluetooth ActivityEnergyInfo classes 
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
 2015-03-09 15:28:29 -07:00
Chris Craik
0a75d4e96c Merge "Rewrite glop texture asserts" 2015-03-09 20:40:08 +00:00
Dianne Hackborn
442361c500 Merge "Battery stats issues: fix jiffy handling, print scan counts." 2015-03-09 20:36:58 +00:00
Chris Craik
eb911c2b0e Rewrite glop texture asserts 
bug:19641517

Also switch Glop VertexAttribFlags to use int for group of flags.

Change-Id: Ib7b1934197a62206a55baa6ab484ac59f5bec816
 2015-03-09 13:36:35 -07:00
Eric Laurent
00a009204e enable FM tuner and hotword capture for system apps. 
AudioRecord constructor with AudioAttributes and session ID as well
as HOTWORD and RADIO_TUNER audio sources are now system APIs.
Renamed MediaRecorder.AudioSource.FM_TUNER to
MediaRecorder.AudioSource.RADIO_TUNER.

Change-Id: I231c20c21e3e8cffe1837482976ebe284c9af541
 2015-03-09 13:06:05 -07:00
Mike Lockwood
be215dd572 MIDI Manager changes: 
Add CloseGuard support to MidiDevice and MidiDeviceServer
Make MidiDevice.close() thread safe
Make non-subclassable API classes final
Other misc cleanup

Change-Id: I7a5d31b06b8c2403cfbc5597c5c1395f0ac90194
 2015-03-09 11:58:04 -07:00
John Spurlock
5844bd4096 Merge "AudioService: Fix device dump in dumpsys output." 2015-03-09 18:49:58 +00:00
John Spurlock
1ff1e6edf1 AudioService: Fix device dump in dumpsys output. 
Bug: 19653026
Change-Id: Id09a502f1507477403c49be32ee0ed0f00ab288f
 2015-03-09 14:46:18 -04:00
Elliott Hughes
7545accf1f am 6291bedd: am 63d43949: Merge "Use the icu:: namespace for icu4c API." 
* commit '6291beddfcdf843f07f12a6d4551301e5fcff73c':
  Use the icu:: namespace for icu4c API.
 2015-03-09 18:26:51 +00:00
Elliott Hughes
6291beddfc am 63d43949: Merge "Use the icu:: namespace for icu4c API." 
* commit '63d43949047eaed1cddf10bb4f666df6807618ce':
  Use the icu:: namespace for icu4c API.
 2015-03-09 18:20:42 +00:00
Dianne Hackborn
62793e4382 Battery stats issues: fix jiffy handling, print scan counts. 
Issue #19431959: Framework incorrectly assumes that kernel
clock_ticks are 10ms

We now retrieve the time of a jiffy from the kernel, and all CPU
times are now handled in milliseconds.

Issue #19571810: Add per-app breakdown of number of WiFi scans
in batterystats checkin data

Added to the report (the information was already being tracked).

Change-Id: If1702d6b9bcf851704129f1811471e68ed576a5d
 2015-03-09 11:15:41 -07:00
Eino-Ville Talvala
24c369e025 Camera2: Add hidden depth stream configuration tags 
Change-Id: Iec1ceb894d90210bc3ab06acc92dcbbe42b74465
 2015-03-09 11:15:31 -07:00
Eino-Ville Talvala
864005b026 Camera2: Remove unused parameters in ICameraDeviceUser#createStream 
- width, height, format are unused

Change-Id: I26540aab1118108b0325df69cfa2dd23da41849b
 2015-03-09 11:15:30 -07:00
Luan Nguyen
b219eac8e8 am a05634ff: am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit 'a05634ffd99dad2225435f5907735c7afdfec10c':
  docs: Add new partners to Wear index page
 2015-03-09 18:12:52 +00:00
Elliott Hughes
63d4394904 Merge "Use the icu:: namespace for icu4c API." 2015-03-09 18:10:24 +00:00
Luan Nguyen
a05634ffd9 am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs 
* commit '408800c3aca72d150dacb646d0a455b248fc3db0':
  docs: Add new partners to Wear index page
 2015-03-09 18:03:19 +00:00