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

123611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
6b1a93fcb9 am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
  Don't null class member before using it.
 2014-02-13 19:24:23 +00:00
Craig Mautner
3816fa8bee am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.
 2014-02-13 19:21:41 +00:00
Craig Mautner
21ab13ff74 am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev 
* commit '474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
  Don't null class member before using it.
 2014-02-13 19:18:04 +00:00
Craig Mautner
474f1fbe8d Merge "Don't null class member before using it." into klp-modular-dev 2014-02-13 19:14:17 +00:00
Craig Mautner
3e5ce55fde am 4dd83975: am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev 
* commit '4dd839756ce032cb6db613f08b9a28e5cd20bbe9':
  Update DimLayer sizes on rotation.
 2014-02-13 19:13:02 +00:00
Craig Mautner
991146f8ef Don't null class member before using it. 
Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.

Fixes bug 12823709.

Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
 2014-02-13 11:12:42 -08:00
Craig Mautner
4dd839756c am d14fa78d: am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev 
* commit 'd14fa78dc84507fbdee8507205a3aff40296d328':
  Update DimLayer sizes on rotation.
 2014-02-13 19:10:15 +00:00
Craig Mautner
d14fa78dc8 am 0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev 
* commit '0af894d25133890e7765e6c582b3ac4829070de8':
  Update DimLayer sizes on rotation.
 2014-02-13 19:05:18 +00:00
Craig Mautner
0af894d251 Merge "Update DimLayer sizes on rotation." into klp-modular-dev 2014-02-13 19:02:02 +00:00
Craig Mautner
b660b9d8cf Update DimLayer sizes on rotation. 
Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.

Fixes bug 12780687.

Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
 2014-02-13 10:59:16 -08:00
Guang Zhu
831663d8fa Merge "reduce error logs from disconnected AccessibilityNodeInfo's" 2014-02-13 18:45:25 +00:00
Dianne Hackborn
d39ccd0ad9 Merge "Start tracking radio up time." 2014-02-13 17:56:12 +00:00
Dianne Hackborn
e13c4c0b66 Start tracking radio up time. 
We now always turn on network state tracking for mobile,
and push this information down to battery stats.

In battery stats we use this to both log the changes in
the history and keep track of the total time the mobile
radio was active.

Power computation is switched over to using this information
to help determine power use, which will hopefully make it
more accurate (not counting inaccuracies in knowing when it
actually goes down).

Note yet done is aggregating this data per-uid, to better
emphasize which apps are causing the radio to be up.  Right
now we just spread the total time across all uids weighted
by the total number of packets they have sent and received.

Also put in the battery stats infrastructure for bluetooth to
address issue #12973036: Improve power_profile.xml

Change-Id: I39d11b7ff6ae4f336f253d1cba308d8569de7e0d
 2014-02-13 17:55:40 +00:00
Andreas Huber
d430354c6b Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."" 2014-02-13 17:22:49 +00:00
Andreas Huber
9ae000ca8c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.

Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
 2014-02-13 17:22:33 +00:00
Andreas Huber
04f0cab79d Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." 2014-02-13 16:35:03 +00:00
John Spurlock
f6475c7204 Merge "Fix NPE in BaseStatusBar." 2014-02-13 14:47:53 +00:00
John Spurlock
70cf4c104c Fix NPE in BaseStatusBar. 
Bug:12996414
Change-Id: Icded809ce14ca6fc5d11bee1c2470152d507cee2
 2014-02-13 09:39:14 -05:00
Narayan Kamath
0051514845 resolved conflicts for merge of 396b9e79 to master 
Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
 2014-02-13 11:48:48 +00:00
Dirk Dougherty
5da502a5b2 am b9378d81: am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit 'b9378d8108555c920880d7ec7ec4122b04fb2960':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 11:27:30 +00:00
Wink Saville
396b9e792f am 27bf55c8: am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '27bf55c8159e7f883ddc839453d5a12374ddc50a':
  Telephony API extension v2
 2014-02-13 08:49:13 +00:00
Wink Saville
27bf55c815 am 16c0b295: am bba3a694: Merge "Telephony API extension v2" 
* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
 2014-02-13 08:44:55 +00:00
Baligh Uddin
35fbb9f9e5 Merge "Import translations. DO NOT MERGE" 2014-02-13 05:14:35 +00:00
Baligh Uddin
bc95e990bd Merge "Import translations. DO NOT MERGE" 2014-02-13 05:14:33 +00:00
Wink Saville
16c0b295ef am bba3a694: Merge "Telephony API extension v2" 
* commit 'bba3a694b8400fd340c0400bf42ef3d79a4285b1':
  Telephony API extension v2
 2014-02-12 20:29:01 -08:00
Wink Saville
bba3a694b8 Merge "Telephony API extension v2" 2014-02-13 04:26:33 +00:00
Dirk Dougherty
b9378d8108 am 321cd18a: am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '321cd18ab21966383d75ba1e9c09b0adf932383b':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:57:19 +00:00
Dirk Dougherty
321cd18ab2 am 820bb4bd: am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '820bb4bdd358bfaac446b8ce4af5474dcfc77613':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:53:48 +00:00
Dirk Dougherty
820bb4bdd3 am 9c50271d: am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '9c50271dc34e48d527db7da85c3b3474574faee2':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:50:08 +00:00
Dirk Dougherty
9c50271dc3 am 257f6724: am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '257f67249afb017c9a3d0a79e545da567aa5bd02':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:47:02 +00:00
Dirk Dougherty
257f67249a am 35cb4e49: Doc change: add new samples TOC groups and landing pages. 
* commit '35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
  Doc change: add new samples TOC groups and landing pages.
 2014-02-13 03:44:38 +00:00
Dirk Dougherty
35cb4e4936 Doc change: add new samples TOC groups and landing pages. 
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
 2014-02-12 19:38:51 -08:00
Craig Mautner
1c5010a566 am f24ee132: am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev 
* commit 'f24ee13254b544b7e73ea1b28facc1996b8185ab':
  Add debug for 12987986.
 2014-02-13 03:34:56 +00:00
Dirk Dougherty
a97e177857 Merge commit '47d3eaf6' into manualmerge 
Conflicts:
	docs/html/design/patterns/accessibility.jd
	docs/html/design/patterns/actionbar.jd
	docs/html/design/patterns/compatibility.jd
	docs/html/design/patterns/multi-pane-layouts.jd
	docs/html/design/style/iconography.jd

Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
 2014-02-12 19:31:15 -08:00
Guang Zhu
32569caa6a reduce error logs from disconnected AccessibilityNodeInfo's 
ChromeView generates a large amount of such logs; while the real
root cause is being fixed, reduce the verbosity so other
interesting logs won't get overwritten.

Bug: 10871032
Change-Id: If42116671062d7b2cc2a13384424575da499c493
 2014-02-12 17:27:15 -08:00
Joe Fernandez
c462073b24 am 8853b9c4: am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '8853b9c4b478df6ac8286d3dc825aa821f375afa':
  MediaRouter Developer Guide
 2014-02-13 01:11:51 +00:00
Nick Kralevich
edb03c7d6d am 4f2d02fb: am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '4f2d02fb0073c4129957c0d2ac6e0c0055f4dad8':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-13 01:11:47 +00:00
Dave Platt
2c7c0a8527 am 5137fa03: am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '5137fa03c3e416c6f68c36f3ec922621853609b1':
  Finish fixing Zygote descriptor leakage problem
 2014-02-13 01:11:41 +00:00
Michael Wright
111d6fef3a Merge changes I8f4249da,I012bd99f 
* changes:
  Extract automatic brightness strategy
  New ambient light level filtering for automatic brightness
 2014-02-13 00:46:59 +00:00
Michael Wright
639c8becc6 Extract automatic brightness strategy 
Pull the strategy for determining the automatic brightness levels
into its own class. This cleans up DisplayPowerController a bit and
lets us experiment with different automatic brightness strategies
more easily.

Change-Id: I8f4249da511e38f63260dbef81f97f5507aac948
 2014-02-12 16:44:37 -08:00
Adam Powell
c1d388fa0a Merge "Point to the correct voice search icons in themes" 2014-02-13 00:43:26 +00:00
ztenghui
b67ca78d97 Merge "Fix one flag setting bug" 2014-02-13 00:16:37 +00:00
Craig Mautner
f24ee13254 am d3df99c4: am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev 
* commit 'd3df99c474b8e267cead8382912b083b6f6ebe3d':
  Add debug for 12987986.
 2014-02-13 00:13:10 +00:00
Dirk Dougherty
47d3eaf6b1 am 958a7f72: am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '958a7f725d9d01415fe33ed2ec35eec72a6d66e3':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-13 00:13:06 +00:00
Joe Fernandez
8853b9c4b4 am 577570f2: am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '577570f29919da32e2b616dbab1e52fadabcb315':
  MediaRouter Developer Guide
 2014-02-13 00:13:02 +00:00
Nick Kralevich
4f2d02fb00 am 20b5fd98: am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '20b5fd98fb9c80ed29d57d67eb706a36b02708da':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-13 00:12:55 +00:00
Dave Platt
5137fa03c3 am 34cc9f90: am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '34cc9f9056e8736143e82891ccd01a85106a4518':
  Finish fixing Zygote descriptor leakage problem
 2014-02-13 00:12:50 +00:00
Alan Viverette
71c6ca2a75 Merge "Update smoothScrollToPosition to move faster for large offsets" 2014-02-12 23:51:56 +00:00
Alan Viverette
5aa944d998 Merge "Fix RelativeLayout measurement" 2014-02-12 23:51:11 +00:00
Michael Wright
41a5cdf986 New ambient light level filtering for automatic brightness 
This new filtering method maintains a ring buffer of all light sensor
measurements within the last ten seconds. Once all of the
measurements are either above the brightening threshold or below the
darkening threshold, adjust the screen brightness to the average of
the recorded measurements.

Change-Id: I012bd99f86149e02f03b05f19722aef9a07aba31
 2014-02-12 15:50:54 -08:00