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

123578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Alan Viverette
d5694f02d5 Fix RelativeLayout measurement 
BUG: 12993953
Change-Id: Idf82734eb9a06ea7610e8eb42705da9f4a4639e9
 2014-02-12 15:49:18 -08:00
Craig Mautner
d3df99c474 am 4b79f838: Merge "Add debug for 12987986." into klp-modular-dev 
* commit '4b79f8380c47b0da89348e1115ea70e7898997ca':
  Add debug for 12987986.
 2014-02-12 23:48:15 +00:00
Craig Mautner
4b79f8380c Merge "Add debug for 12987986." into klp-modular-dev 2014-02-12 23:44:56 +00:00
Dirk Dougherty
958a7f725d am 35ad8886: am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:43:56 +00:00
Craig Mautner
1646832219 Add debug for 12987986. 
For bug 12987986.

Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
 2014-02-12 15:43:40 -08:00
Dirk Dougherty
35ad8886f2 am acec746b: am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit 'acec746b8963410d4a9324df46272ac91f846868':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:37:57 +00:00
Dirk Dougherty
acec746b89 am 55362018: am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '55362018c9dfadff5eb1a138a1d90187110c253e':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:34:35 +00:00
Joe Fernandez
577570f299 am e5dc0c39: am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
  MediaRouter Developer Guide
 2014-02-12 23:33:43 +00:00
Dirk Dougherty
55362018c9 am 271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 
* commit '271c8f12c88e87563ed17f4ad29610037bd300be':
  Doc change: minor edits to support easier extraction of document summaries.
 2014-02-12 23:30:19 +00:00
Joe Fernandez
e5dc0c3991 am 5b97ec6f: am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
  MediaRouter Developer Guide
 2014-02-12 23:29:38 +00:00
John Spurlock
3024f10224 Merge "Remove unused output array in QuickSettingsModel." 2014-02-12 23:21:16 +00:00
Dirk Dougherty
271c8f12c8 Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs 2014-02-12 23:20:41 +00:00
Joe Fernandez
5b97ec6fa0 am 3885b00a: am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit '3885b00ae12df9f56e922ceda12326e922be1414':
  MediaRouter Developer Guide
 2014-02-12 23:19:10 +00:00
Nick Kralevich
20b5fd98fb am 93994e9d: am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '93994e9db44a30402bd596764163d81ee1b1fd30':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 23:19:05 +00:00
Joe Fernandez
3885b00ae1 am f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs 
* commit 'f25bc75f591fbb04733b9cc33fabee2293973b8c':
  MediaRouter Developer Guide
 2014-02-12 23:15:50 +00:00
Joe Fernandez
f25bc75f59 Merge "MediaRouter Developer Guide" into klp-docs 2014-02-12 23:13:01 +00:00
Nick Kralevich
93994e9db4 am a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit 'a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-02-12 15:12:08 -08:00
Dave Platt
34cc9f9056 am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
 2014-02-12 23:10:36 +00:00
Nick Kralevich
a9bb594da6 Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 2014-02-12 23:09:37 +00:00
Dave Platt
53c7608aef am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem" 
* commit 'a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
  Finish fixing Zygote descriptor leakage problem
 2014-02-12 15:07:07 -08:00
Dave Platt
a3c3533b1d Merge "Finish fixing Zygote descriptor leakage problem" 2014-02-12 23:03:48 +00:00
Ricardo Cervera
0815f499ae am d3417283: am 481993e9: am 3cb62db2: am 640e0c89: am 36547014: am 670944aa: Merge "docs: Added missing elements in uses-feature. Bug: 12913153" into klp-docs 
* commit 'd34172830cf4ce3524be500d77dc26e80f0f8190':
  docs: Added missing elements in uses-feature. Bug: 12913153
 2014-02-12 23:02:05 +00:00
Ricardo Cervera
1239405637 am 131c2e13: am 6fc66187: am 7d3344fd: am 58305f88: am bff7db19: am 521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs 
* commit '131c2e13bac619144f2780baf229c34b33b0c674':
  docs: Added notes for Build Tools Revision 19.0.2
 2014-02-12 23:02:00 +00:00
Ricardo Cervera
b134b0ae45 am 6bc06c81: am 49968bb5: am 6960ad58: am ac74a524: am 566e4df8: am ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs 
* commit '6bc06c815f47021e49e191740caeb8ee2c846c5a':
  docs: Added Revision 3 of Google APIs System Image.
 2014-02-12 23:01:56 +00:00
Craig Mautner
4cfd54eaf0 am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev 
* commit '69481d54c2c6da6ec931bb7435bddf7be1aba0af':
  Don't add windows from exiting app tokens twice.
 2014-02-12 23:01:52 +00:00
John Spurlock
1182a111ec am 5788f2ba: am ae5708db: am c4aee98a: Improve error handling in listener services. 
* commit '5788f2ba9b634ecc35a861d53b086bee1384d0b0':
  Improve error handling in listener services.
 2014-02-12 23:01:48 +00:00
Narayan Kamath
7de20e6950 am efe6e05c: am 3caed58a: am 8fa3f443: am 54e7f53f: Merge "Fix build." 
* commit 'efe6e05ca849ab479240fcf508b4d7af189a2c11':
  Fix build.
 2014-02-12 23:01:43 +00:00
Paul Duffin
5ea06c59be am 4de91118: am 0741e11c: am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays" 
* commit '4de9111819638b70dd6fb58094d7a61477fc59da':
  Improve Parcel's handling of non-primitive arrays
 2014-02-12 23:01:39 +00:00
Narayan Kamath
5a42b10baa am 34281966: am fc268eca: am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap" 
* commit '342819663c15db09dc60477167c5bdf1a5a877ae':
  Use size_t* in AssetManager::createIdmap
 2014-02-12 23:01:35 +00:00
Dianne Hackborn
f75f6e323c am 32acb5e9: am 97de064a: am 133f6826: am 89492190: Merge "Runtime resource overlay, iteration 2, test cases" 
* commit '32acb5e9d130ac858f34d83526e7460c624b41c7':
  Runtime resource overlay, iteration 2, test cases
 2014-02-12 23:01:30 +00:00
Adam Powell
7a5427bbf5 Point to the correct voice search icons in themes 
Update the preloaded drawables lists for previous asset import

Change-Id: Ia7be297f6387a14829717f64561c41fe0810a51c
 2014-02-12 14:44:44 -08:00