OSDN Git Service
Alan Viverette [Fri, 14 Feb 2014 01:48:59 +0000 (01:48 +0000)]
Merge "Refactor AbsListView position scrollers for better abstraction"
Alan Viverette [Fri, 14 Feb 2014 01:47:38 +0000 (17:47 -0800)]
Refactor AbsListView position scrollers for better abstraction
The AbsListView sub-scroller knows nothing about layout. That's now
handled by ListView and GridView, with subclasses of AbsListView using
the default PositionScroller. Removes unnecessary (unreleased) APIs.
Also fixes a bounds check that was using the item position rather than
the child view position.
BUG:
13006641
Change-Id: I2adb0f15623e32295facf81f5ada974083ba03ce
Fabrice Di Meglio [Fri, 14 Feb 2014 01:42:35 +0000 (01:42 +0000)]
Merge "Fix bug #
12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
Alan Viverette [Fri, 14 Feb 2014 01:15:03 +0000 (01:15 +0000)]
Merge "Add selection properties to CollectionInfo, CollectionItemInfo"
Fabrice Di Meglio [Fri, 14 Feb 2014 01:02:11 +0000 (17:02 -0800)]
Fix bug #
12993929 Screen orientation change replaces wifi password dialog with Add network dialog
- do not make inactive the fragment when its transition animation is ending.
Long explanation:
Context: you need to have a first fragment pushed and then a second one replacing
the first one, and then create a DialogFragment on top of it. The FragmentManager
has then three "active" Fragments.
The mActive ArrayList of the FragmentManager is then containing:
mActive[0] = first fragment
mActive[1] = second fragment (parent of the dialog fragment)
mActive[2[ = dialog fragment
Then suppose you are changing the orientation.
During the restoration of the FragmentManager states, you will see that the
first Fragment is marked "inactive" and the mActive ArrayList is looking like:
mActive[0] = dialog fragment
mActive[1] = second fragment
which leads first to have a call to onCreateDialog() for the DialogFragment and
before it can be able to restore its state thru the calls to onCreate() and
onCreateView() for the parent (the second fragment).
Change-Id: I0268bdf13e4bdd07a783c2c82a13b431d0c5c8e4
David Christie [Thu, 13 Feb 2014 20:25:00 +0000 (20:25 +0000)]
Merge "Log history of location requests in LocationManager. -Assists with debugging power issues. Bug:
12824233"
Craig Mautner [Thu, 13 Feb 2014 19:24:23 +0000 (19:24 +0000)]
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.
Craig Mautner [Thu, 13 Feb 2014 19:21:41 +0000 (19:21 +0000)]
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.
Craig Mautner [Thu, 13 Feb 2014 19:18:04 +0000 (19:18 +0000)]
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.
Craig Mautner [Thu, 13 Feb 2014 19:14:17 +0000 (19:14 +0000)]
Merge "Don't null class member before using it." into klp-modular-dev
Craig Mautner [Thu, 13 Feb 2014 19:13:02 +0000 (19:13 +0000)]
am
4dd83975: am
d14fa78d: am
0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '
4dd839756ce032cb6db613f08b9a28e5cd20bbe9':
Update DimLayer sizes on rotation.
Craig Mautner [Thu, 13 Feb 2014 19:12:42 +0000 (11:12 -0800)]
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
Craig Mautner [Thu, 13 Feb 2014 19:10:15 +0000 (19:10 +0000)]
am
d14fa78d: am
0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '
d14fa78dc84507fbdee8507205a3aff40296d328':
Update DimLayer sizes on rotation.
Craig Mautner [Thu, 13 Feb 2014 19:05:18 +0000 (19:05 +0000)]
am
0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '
0af894d25133890e7765e6c582b3ac4829070de8':
Update DimLayer sizes on rotation.
Craig Mautner [Thu, 13 Feb 2014 19:02:01 +0000 (19:02 +0000)]
Merge "Update DimLayer sizes on rotation." into klp-modular-dev
Craig Mautner [Thu, 13 Feb 2014 18:59:16 +0000 (10:59 -0800)]
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
Guang Zhu [Thu, 13 Feb 2014 18:45:24 +0000 (18:45 +0000)]
Merge "reduce error logs from disconnected AccessibilityNodeInfo's"
Dianne Hackborn [Thu, 13 Feb 2014 17:56:11 +0000 (17:56 +0000)]
Merge "Start tracking radio up time."
Dianne Hackborn [Wed, 12 Feb 2014 01:18:35 +0000 (17:18 -0800)]
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
Andreas Huber [Thu, 13 Feb 2014 17:22:48 +0000 (17:22 +0000)]
Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.""
Andreas Huber [Thu, 13 Feb 2014 17:22:33 +0000 (17:22 +0000)]
Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit
7825334929b098b36e1144872200e75ba6d24b13.
Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
Andreas Huber [Thu, 13 Feb 2014 16:35:02 +0000 (16:35 +0000)]
Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
John Spurlock [Thu, 13 Feb 2014 14:47:52 +0000 (14:47 +0000)]
Merge "Fix NPE in BaseStatusBar."
John Spurlock [Thu, 13 Feb 2014 14:39:14 +0000 (09:39 -0500)]
Fix NPE in BaseStatusBar.
Bug:
12996414
Change-Id: Icded809ce14ca6fc5d11bee1c2470152d507cee2
Narayan Kamath [Thu, 13 Feb 2014 11:48:48 +0000 (11:48 +0000)]
resolved conflicts for merge of
396b9e79 to master
Change-Id: Ie71a79699be57f5af6069559068bf6253835d805
Dirk Dougherty [Thu, 13 Feb 2014 11:27:30 +0000 (11:27 +0000)]
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.
Wink Saville [Thu, 13 Feb 2014 08:49:13 +0000 (08:49 +0000)]
am
27bf55c8: am
16c0b295: am
bba3a694: Merge "Telephony API extension v2"
* commit '
27bf55c8159e7f883ddc839453d5a12374ddc50a':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 08:44:55 +0000 (08:44 +0000)]
am
16c0b295: am
bba3a694: Merge "Telephony API extension v2"
* commit '
16c0b295ef069e128a4e01fd2f72da06784950a1':
Telephony API extension v2
Baligh Uddin [Thu, 13 Feb 2014 05:14:35 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 13 Feb 2014 05:14:33 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE"
Wink Saville [Thu, 13 Feb 2014 04:29:01 +0000 (20:29 -0800)]
am
bba3a694: Merge "Telephony API extension v2"
* commit '
bba3a694b8400fd340c0400bf42ef3d79a4285b1':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 04:26:33 +0000 (04:26 +0000)]
Merge "Telephony API extension v2"
Dirk Dougherty [Thu, 13 Feb 2014 03:57:19 +0000 (03:57 +0000)]
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.
Dirk Dougherty [Thu, 13 Feb 2014 03:53:48 +0000 (03:53 +0000)]
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.
Dirk Dougherty [Thu, 13 Feb 2014 03:50:08 +0000 (03:50 +0000)]
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.
Dirk Dougherty [Thu, 13 Feb 2014 03:47:02 +0000 (03:47 +0000)]
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.
Dirk Dougherty [Thu, 13 Feb 2014 03:44:38 +0000 (03:44 +0000)]
am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Sat, 8 Feb 2014 05:05:43 +0000 (21:05 -0800)]
Doc change: add new samples TOC groups and landing pages.
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
Craig Mautner [Thu, 13 Feb 2014 03:34:56 +0000 (03:34 +0000)]
am
f24ee132: am
d3df99c4: am
4b79f838: Merge "Add debug for
12987986." into klp-modular-dev
* commit '
f24ee13254b544b7e73ea1b28facc1996b8185ab':
Add debug for
12987986.
Dirk Dougherty [Thu, 13 Feb 2014 03:31:15 +0000 (19:31 -0800)]
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
Guang Zhu [Thu, 13 Feb 2014 01:27:15 +0000 (17:27 -0800)]
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
Joe Fernandez [Thu, 13 Feb 2014 01:11:51 +0000 (01:11 +0000)]
am
8853b9c4: am
577570f2: am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
8853b9c4b478df6ac8286d3dc825aa821f375afa':
MediaRouter Developer Guide
Nick Kralevich [Thu, 13 Feb 2014 01:11:47 +0000 (01:11 +0000)]
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.
Dave Platt [Thu, 13 Feb 2014 01:11:41 +0000 (01:11 +0000)]
am
5137fa03: am
34cc9f90: am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
5137fa03c3e416c6f68c36f3ec922621853609b1':
Finish fixing Zygote descriptor leakage problem
Michael Wright [Thu, 13 Feb 2014 00:46:58 +0000 (00:46 +0000)]
Merge changes I8f4249da,I012bd99f
* changes:
Extract automatic brightness strategy
New ambient light level filtering for automatic brightness
Michael Wright [Sat, 18 Jan 2014 02:29:12 +0000 (18:29 -0800)]
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
Adam Powell [Thu, 13 Feb 2014 00:43:26 +0000 (00:43 +0000)]
Merge "Point to the correct voice search icons in themes"
Alan Viverette [Thu, 13 Feb 2014 00:38:10 +0000 (16:38 -0800)]
Add selection properties to CollectionInfo, CollectionItemInfo
BUG:
12552541
Change-Id: Iae10abc02eeffea7c7fcb25020b343181e1e3482
ztenghui [Thu, 13 Feb 2014 00:16:36 +0000 (00:16 +0000)]
Merge "Fix one flag setting bug"
Craig Mautner [Thu, 13 Feb 2014 00:13:10 +0000 (00:13 +0000)]
am
d3df99c4: am
4b79f838: Merge "Add debug for
12987986." into klp-modular-dev
* commit '
d3df99c474b8e267cead8382912b083b6f6ebe3d':
Add debug for
12987986.
Dirk Dougherty [Thu, 13 Feb 2014 00:13:06 +0000 (00:13 +0000)]
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.
Joe Fernandez [Thu, 13 Feb 2014 00:13:02 +0000 (00:13 +0000)]
am
577570f2: am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
577570f29919da32e2b616dbab1e52fadabcb315':
MediaRouter Developer Guide
Nick Kralevich [Thu, 13 Feb 2014 00:12:55 +0000 (00:12 +0000)]
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.
Dave Platt [Thu, 13 Feb 2014 00:12:50 +0000 (00:12 +0000)]
am
34cc9f90: am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
34cc9f9056e8736143e82891ccd01a85106a4518':
Finish fixing Zygote descriptor leakage problem
Alan Viverette [Wed, 12 Feb 2014 23:51:56 +0000 (23:51 +0000)]
Merge "Update smoothScrollToPosition to move faster for large offsets"
Alan Viverette [Wed, 12 Feb 2014 23:51:11 +0000 (23:51 +0000)]
Merge "Fix RelativeLayout measurement"
Michael Wright [Thu, 14 Nov 2013 00:18:32 +0000 (16:18 -0800)]
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
Alan Viverette [Wed, 12 Feb 2014 23:49:18 +0000 (15:49 -0800)]
Fix RelativeLayout measurement
BUG:
12993953
Change-Id: Idf82734eb9a06ea7610e8eb42705da9f4a4639e9
Craig Mautner [Wed, 12 Feb 2014 23:48:15 +0000 (23:48 +0000)]
am
4b79f838: Merge "Add debug for
12987986." into klp-modular-dev
* commit '
4b79f8380c47b0da89348e1115ea70e7898997ca':
Add debug for
12987986.
Craig Mautner [Wed, 12 Feb 2014 23:44:55 +0000 (23:44 +0000)]
Merge "Add debug for
12987986." into klp-modular-dev
Dirk Dougherty [Wed, 12 Feb 2014 23:43:56 +0000 (23:43 +0000)]
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.
Craig Mautner [Wed, 12 Feb 2014 23:43:40 +0000 (15:43 -0800)]
Add debug for
12987986.
For bug
12987986.
Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
Dirk Dougherty [Wed, 12 Feb 2014 23:37:57 +0000 (23:37 +0000)]
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.
Dirk Dougherty [Wed, 12 Feb 2014 23:34:35 +0000 (23:34 +0000)]
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.
Joe Fernandez [Wed, 12 Feb 2014 23:33:43 +0000 (23:33 +0000)]
am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
MediaRouter Developer Guide
Dirk Dougherty [Wed, 12 Feb 2014 23:30:19 +0000 (23:30 +0000)]
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.
Joe Fernandez [Wed, 12 Feb 2014 23:29:38 +0000 (23:29 +0000)]
am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
MediaRouter Developer Guide
John Spurlock [Wed, 12 Feb 2014 23:21:15 +0000 (23:21 +0000)]
Merge "Remove unused output array in QuickSettingsModel."
Dirk Dougherty [Wed, 12 Feb 2014 23:20:40 +0000 (23:20 +0000)]
Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
Joe Fernandez [Wed, 12 Feb 2014 23:19:10 +0000 (23:19 +0000)]
am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
3885b00ae12df9f56e922ceda12326e922be1414':
MediaRouter Developer Guide
Nick Kralevich [Wed, 12 Feb 2014 23:19:05 +0000 (23:19 +0000)]
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.
Joe Fernandez [Wed, 12 Feb 2014 23:15:50 +0000 (23:15 +0000)]
am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
Joe Fernandez [Wed, 12 Feb 2014 23:13:01 +0000 (23:13 +0000)]
Merge "MediaRouter Developer Guide" into klp-docs
Nick Kralevich [Wed, 12 Feb 2014 23:12:08 +0000 (15:12 -0800)]
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.
Dave Platt [Wed, 12 Feb 2014 23:10:36 +0000 (23:10 +0000)]
am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
53c7608aefb0ed754394e571cac02e96ad6fcdb3':
Finish fixing Zygote descriptor leakage problem
Nick Kralevich [Wed, 12 Feb 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Dave Platt [Wed, 12 Feb 2014 23:07:07 +0000 (15:07 -0800)]
am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
Finish fixing Zygote descriptor leakage problem
Dave Platt [Wed, 12 Feb 2014 23:03:48 +0000 (23:03 +0000)]
Merge "Finish fixing Zygote descriptor leakage problem"
Ricardo Cervera [Wed, 12 Feb 2014 23:02:05 +0000 (23:02 +0000)]
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
Ricardo Cervera [Wed, 12 Feb 2014 23:02:00 +0000 (23:02 +0000)]
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
Ricardo Cervera [Wed, 12 Feb 2014 23:01:56 +0000 (23:01 +0000)]
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.
Craig Mautner [Wed, 12 Feb 2014 23:01:52 +0000 (23:01 +0000)]
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.
John Spurlock [Wed, 12 Feb 2014 23:01:48 +0000 (23:01 +0000)]
am
5788f2ba: am
ae5708db: am
c4aee98a: Improve error handling in listener services.
* commit '
5788f2ba9b634ecc35a861d53b086bee1384d0b0':
Improve error handling in listener services.
Narayan Kamath [Wed, 12 Feb 2014 23:01:43 +0000 (23:01 +0000)]
Paul Duffin [Wed, 12 Feb 2014 23:01:39 +0000 (23:01 +0000)]
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
Narayan Kamath [Wed, 12 Feb 2014 23:01:35 +0000 (23:01 +0000)]
am
34281966: am
fc268eca: am
aa98fb51: am
f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit '
342819663c15db09dc60477167c5bdf1a5a877ae':
Use size_t* in AssetManager::createIdmap
Dianne Hackborn [Wed, 12 Feb 2014 23:01:30 +0000 (23:01 +0000)]
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
Andreas Huber [Thu, 6 Feb 2014 23:25:25 +0000 (15:25 -0800)]
Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.
Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
Adam Powell [Wed, 12 Feb 2014 22:40:33 +0000 (14:40 -0800)]
Point to the correct voice search icons in themes
Update the preloaded drawables lists for previous asset import
Change-Id: Ia7be297f6387a14829717f64561c41fe0810a51c
John Spurlock [Wed, 12 Feb 2014 22:44:41 +0000 (17:44 -0500)]
Remove unused output array in QuickSettingsModel.
Change-Id: I0e9ce2ee1f20f5bf03f838a7ca965a71270b97d4
Nick Kralevich [Wed, 12 Feb 2014 22:41:25 +0000 (14:41 -0800)]
resolved conflicts for merge of
1cbea39f to master
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
ztenghui [Wed, 12 Feb 2014 22:16:22 +0000 (14:16 -0800)]
Fix one flag setting bug
TODO: encapsulate the bit operations into functions.
Change-Id: I68ada214c080ac54ea43c327684c87dacef85491
Alan Viverette [Wed, 12 Feb 2014 22:28:45 +0000 (22:28 +0000)]
Merge "Fix gradient radius attribute to match documentation"
Ricardo Cervera [Wed, 12 Feb 2014 22:22:06 +0000 (22:22 +0000)]
am
481993e9: am
3cb62db2: am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
481993e92c20907521e22a57d09c8b7c206af726':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 22:22:03 +0000 (22:22 +0000)]
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 '
6fc66187b1920db0a233603721c3a2db15ae1269':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 22:22:00 +0000 (22:22 +0000)]
am
49968bb5: am
6960ad58: am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
49968bb559cefbd96ce84b593b11203bddfa134a':
docs: Added Revision 3 of Google APIs System Image.
Craig Mautner [Wed, 12 Feb 2014 22:21:56 +0000 (22:21 +0000)]
am
8dfda07d: am
731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '
8dfda07dd410c1776c6b0d373229fe77c76f8cfc':
Don't add windows from exiting app tokens twice.
John Spurlock [Wed, 12 Feb 2014 22:21:42 +0000 (22:21 +0000)]
am
ae5708db: am
c4aee98a: Improve error handling in listener services.
* commit '
ae5708db9d02433027f4574f912def6558805642':
Improve error handling in listener services.
Narayan Kamath [Wed, 12 Feb 2014 22:20:01 +0000 (22:20 +0000)]
Paul Duffin [Wed, 12 Feb 2014 22:19:58 +0000 (22:19 +0000)]
am
0741e11c: am
75d67c6a: am
d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '
0741e11c65350aba95df150d52674c2fab41511a':
Improve Parcel's handling of non-primitive arrays