OSDN Git Service
Romain Guy [Wed, 5 Jun 2013 01:00:09 +0000 (18:00 -0700)]
Introduce Caches::bindTexture() to reduce glBindTexture calls
Change-Id: Ic345422567c020c0a9035ff51dcf2ae2a1fc59f4
Jeff Sharkey [Wed, 5 Jun 2013 00:00:19 +0000 (17:00 -0700)]
am
ffbbe945: am
d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev
* commit '
ffbbe945066bf0b295ff65edfb1c49f7a4311718':
Create missing Uids when recording network stats.
Jeff Sharkey [Tue, 4 Jun 2013 23:57:51 +0000 (16:57 -0700)]
am
d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev
* commit '
d293d229493a2d661ebb1776a0915297927a5ca6':
Create missing Uids when recording network stats.
Jeff Sharkey [Tue, 4 Jun 2013 23:55:36 +0000 (23:55 +0000)]
Merge "Create missing Uids when recording network stats." into jb-mr2-dev
Chet Haase [Tue, 4 Jun 2013 23:37:05 +0000 (23:37 +0000)]
Merge "Fix in transition canceling logic"
Chet Haase [Tue, 4 Jun 2013 23:35:14 +0000 (16:35 -0700)]
Fix in transition canceling logic
The logic that canceled underlying animations caused a problem
when there were more than one animation in the list (due to removing
items from a list that was currently being processed elsewhere).
Change-Id: Ie207f340b5d7de4ffcf56a26c05ec394abb80224
Romain Guy [Tue, 4 Jun 2013 22:54:18 +0000 (22:54 +0000)]
Merge "Enable GPU pixel buffers on OpenGL ES 3.0 devices"
Alan Viverette [Tue, 4 Jun 2013 22:48:20 +0000 (22:48 +0000)]
Merge "Always draw dividers for footers and headers when explicitly enabled."
Baligh Uddin [Tue, 4 Jun 2013 22:47:48 +0000 (15:47 -0700)]
am
ba792ed5: (-s ours) am
2156c386: Import translations. DO NOT MERGE
* commit '
ba792ed5c322a0a7994fa15cd92c2ef50563f079':
Import translations. DO NOT MERGE
Alan Viverette [Tue, 4 Jun 2013 22:46:30 +0000 (22:46 +0000)]
Merge "Clear pressed state when moving outside list bounds."
Baligh Uddin [Tue, 4 Jun 2013 22:45:55 +0000 (15:45 -0700)]
am
2156c386: Import translations. DO NOT MERGE
* commit '
2156c38622f1cd78e9ad8dba27eb6b3fde939b3c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Jun 2013 22:40:50 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a9d3071332508b3efbb0bed4eeb435cdc5ba3d9
Auto-generated-cl: translation import
Chet Haase [Tue, 4 Jun 2013 21:35:04 +0000 (21:35 +0000)]
Merge "Use ArrayMap instead of HashMap in transitions"
Chet Haase [Tue, 4 Jun 2013 21:28:40 +0000 (21:28 +0000)]
Merge "Optimize calls to Trace for animators"
Jeff Sharkey [Tue, 4 Jun 2013 21:09:31 +0000 (14:09 -0700)]
Create missing Uids when recording network stats.
Bug:
5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
Romain Guy [Thu, 9 May 2013 18:50:12 +0000 (11:50 -0700)]
Enable GPU pixel buffers on OpenGL ES 3.0 devices
Change-Id: I164d72ccd7a9bf6ae0e3f79dfef50083558937ba
Joe Malin [Tue, 4 Jun 2013 18:17:16 +0000 (11:17 -0700)]
am
36d0f946: am
e9dff008: am
305cf97b: am
60776093: am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
36d0f946adc83a9ffa5483556d263b719977da5d':
DOC CHANGE: Clarify textIsSelectable in TextView
Scott Main [Tue, 4 Jun 2013 18:17:14 +0000 (11:17 -0700)]
am
e125116f: am
e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev
* commit '
e125116fc8767ecf431c80f5659a8a90032acb97':
javadoc cleanup for audioeffect
Chet Haase [Tue, 4 Jun 2013 17:44:40 +0000 (10:44 -0700)]
Use ArrayMap instead of HashMap in transitions
The new ArrayMap class is more efficient for small collections.
Transitions use maps all over the place to collect/use property
values in setting up the transition animations. Changing to ArrayMap
should be more efficient, especially in terms of memory allocations
and GCs.
Issue #
9276256 Transitions: Reduce memory allocations
Change-Id: I07b7d4ba68d5a207808eca11943aa3578fa90e3e
Joe Malin [Tue, 4 Jun 2013 17:20:15 +0000 (10:20 -0700)]
am
e9dff008: am
305cf97b: am
60776093: am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
e9dff008adc7b6e565402ec61cd89fb3265a28bd':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:17:46 +0000 (10:17 -0700)]
am
305cf97b: am
60776093: am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
305cf97ba7b927f49d3f52952c36cb5102699cc5':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:14:48 +0000 (10:14 -0700)]
am
60776093: am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
60776093a5569817040e2f65a17893a381906564':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:12:09 +0000 (10:12 -0700)]
am
029099ff: am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
029099ff56b92201e10b2047e1ced675c8e9f964':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:09:44 +0000 (10:09 -0700)]
am
f4b21585: am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
f4b21585304781c61d00fa6a14a85fae60f6a50d':
DOC CHANGE: Clarify textIsSelectable in TextView
Joe Malin [Tue, 4 Jun 2013 17:07:16 +0000 (10:07 -0700)]
am
10d96950: DOC CHANGE: Clarify textIsSelectable in TextView
* commit '
10d96950c14ae647c2e8435178533cafc78e1afa':
DOC CHANGE: Clarify textIsSelectable in TextView
Scott Main [Tue, 4 Jun 2013 16:45:32 +0000 (09:45 -0700)]
am
e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev
* commit '
e4ef3849c58225206fd5cba1b33c08968c5e6021':
javadoc cleanup for audioeffect
Scott Main [Tue, 4 Jun 2013 16:42:22 +0000 (16:42 +0000)]
Merge "javadoc cleanup for audioeffect" into jb-mr2-dev
Chet Haase [Tue, 4 Jun 2013 16:37:38 +0000 (09:37 -0700)]
Optimize calls to Trace for animators
Previously, ValueAnimator would always call into the Trace class to
log start/end events. When the animator is an ObjectAnimator, this
call necessitated building a new String to capture the animated property
name. This fix puts the calls to Trace inside a check for isTagEnabled(),
to ensure that we only bother building the trace name when tracing is
actually enabled.
Change-Id: I56ef093f3b67b31a19c861f9d1e44a84341edf53
Joe Malin [Thu, 30 May 2013 00:49:09 +0000 (17:49 -0700)]
DOC CHANGE: Clarify textIsSelectable in TextView
Change-Id: Iddfdf7ed82ea3fa2a0160bda4a1e29ec8f815a2b
Chet Haase [Tue, 4 Jun 2013 16:19:39 +0000 (16:19 +0000)]
Merge "Starting new transition cancels running transition"
Chet Haase [Tue, 4 Jun 2013 15:46:42 +0000 (08:46 -0700)]
Starting new transition cancels running transition
The behavior of running a transition is janky and unpredictable,
when there is already a transition running on the same scene root.
Usually, the new transition simply jumps to the end values, or
jumps to the start values for that transition and animates from
there.
A better approach is to cancel any running transition first, the
start the new transition from that point.
Even better would be to blend old/new transitions, or at least adjust
the animation timing according to where/when the previous transition
stopped. In the meantime, this fix is at least better than the
previous approach of ignoring running transitions.
Change-Id: I4f5fabb55f6454f1e9d66589a9a7c36f9fc013fb
Xia Wang [Tue, 4 Jun 2013 04:28:24 +0000 (21:28 -0700)]
am
af19aef6: am
ac561b8b: Merge "Add option to set frequency band" into jb-mr2-dev
* commit '
af19aef675013f804a5338e3500ad57b0aa2fc71':
Add option to set frequency band
Xia Wang [Tue, 4 Jun 2013 04:26:21 +0000 (21:26 -0700)]
am
ac561b8b: Merge "Add option to set frequency band" into jb-mr2-dev
* commit '
ac561b8bdd52a6ac5e4f9b92f1033cd385f149d8':
Add option to set frequency band
Xia Wang [Tue, 4 Jun 2013 04:23:28 +0000 (04:23 +0000)]
Merge "Add option to set frequency band" into jb-mr2-dev
Dirk Dougherty [Tue, 4 Jun 2013 02:26:03 +0000 (19:26 -0700)]
am
b74c3405: am
e3e98bc9: am
59b77878: am
63c904c2: am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
b74c3405b6aad3222c3b8fcc65317f7c0da13695':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:23:17 +0000 (19:23 -0700)]
am
e3e98bc9: am
59b77878: am
63c904c2: am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
e3e98bc966362dd1771ea0d47227223374ad3671':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:20:46 +0000 (19:20 -0700)]
am
59b77878: am
63c904c2: am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
59b77878944f5012fd5a65fc1a845a053220a436':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:19:20 +0000 (19:19 -0700)]
am
63c904c2: am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
63c904c2d7651089821c4760ab30b71e9000374e':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:16:37 +0000 (19:16 -0700)]
am
4c8caaa2: am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
4c8caaa2ef6edc1898a5146cc15eb87c5997d35c':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:13:46 +0000 (19:13 -0700)]
am
5ca78f59: am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
5ca78f5963e49b48896fa866aeb032a37ba15360':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:11:26 +0000 (19:11 -0700)]
am
8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs
* commit '
8e307adcf62c639d25c16f6071d458561ce4bef3':
Doc change: Add new developer video.
Dirk Dougherty [Tue, 4 Jun 2013 02:08:20 +0000 (02:08 +0000)]
Merge "Doc change: Add new developer video." into jb-mr1.1-docs
Dirk Dougherty [Tue, 4 Jun 2013 01:39:52 +0000 (18:39 -0700)]
Doc change: Add new developer video.
Change-Id: I8af77ee439238133bedeb0396257058f4504f6f7
Scott Main [Tue, 4 Jun 2013 00:24:09 +0000 (17:24 -0700)]
javadoc cleanup for audioeffect
Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
The Android Open Source Project [Tue, 4 Jun 2013 00:16:33 +0000 (17:16 -0700)]
am
b18841b4: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
b18841b442006b63a0c57527fdd6d16bc04e6644':
Apply scan-always setting to initial wifi state.
The Android Open Source Project [Mon, 3 Jun 2013 23:43:46 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ib4adc6b9ad37713ec04b6cacce5279e12395e3a6
Alan Viverette [Mon, 3 Jun 2013 23:42:22 +0000 (16:42 -0700)]
Always draw dividers for footers and headers when explicitly enabled.
Treats headers and footers as "enabled" list items when header and footer
dividers are turned on. Also fixes incorrect drawing of dividers when
"stack from bottom" is enabled.
Bug:
7288159
Change-Id: Ibfc48841502a410357db04aaed01072703c7d36c
Chet Haase [Mon, 3 Jun 2013 23:41:08 +0000 (23:41 +0000)]
Merge "Various fixes/cleanup in Scenes and Transitions"
Chet Haase [Mon, 3 Jun 2013 14:30:21 +0000 (07:30 -0700)]
Various fixes/cleanup in Scenes and Transitions
setDuration() wasn't handled correctly for TransitionGroup; it should
propagate the value to its children.
Also, videos with no ids were not being handled correctly. The transition code was
using the default id on those views (-1) to store start/end data about the view,
causing multiple non-id views to clobber values in the hashmaps. The correct approach
should be to ignore default id values - only store information about the view
instances, not about the unset ids.
Also, added a new test InterruptTest to be used to fix the current behavior of
not handling situations where new transitions start while old ones are still taking place.
Change-Id: I4e880bdbb33cc26d487bceb0d56e463e72f7621f
Romain Guy [Mon, 3 Jun 2013 22:52:20 +0000 (22:52 +0000)]
Merge "Replace HashMap with ArrayMap to remove unnecessary allocations"
Romain Guy [Mon, 3 Jun 2013 21:25:56 +0000 (14:25 -0700)]
Replace HashMap with ArrayMap to remove unnecessary allocations
This change also fixes a race condition. If multiple UI threads are used
in a single process, RelativeLayouts could end up using the same nodes
in different windows, causing mayhem and headaches.
Change-Id: I9ba4a0bf05d44e1a1e7a82443d40c500c657cd7a
Romain Guy [Mon, 3 Jun 2013 22:38:07 +0000 (22:38 +0000)]
Merge "Remove unnecessary lock to save 1 allocation per TextView"
Alan Viverette [Mon, 3 Jun 2013 22:34:11 +0000 (15:34 -0700)]
Clear pressed state when moving outside list bounds.
Bug:
8724943
Change-Id: Ife40ad672c161fef76e62dfd3c7f7fb3b08c3648
Robert Greenwalt [Sat, 1 Jun 2013 17:59:29 +0000 (10:59 -0700)]
Apply scan-always setting to initial wifi state.
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.
bug:
9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
Joe Malin [Mon, 3 Jun 2013 21:34:00 +0000 (14:34 -0700)]
am
8811154e: am
423f8a8c: am
2618ac55: am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
8811154e9369ff936c35f355034ec1f6aafa984e':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:31:21 +0000 (14:31 -0700)]
am
423f8a8c: am
2618ac55: am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
423f8a8c21ec4e702e72ffce27bb3b5481170bae':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:27:50 +0000 (14:27 -0700)]
am
2618ac55: am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
2618ac55a94a97e29abd9defa93dea30e067b4e4':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:23:08 +0000 (14:23 -0700)]
am
a37bda7b: am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
a37bda7b616452d0072b012cc7ae8fcae51e943f':
B9257437: Typo in javadoc for AccountManager
Joe Malin [Mon, 3 Jun 2013 21:20:45 +0000 (14:20 -0700)]
am
468d82bb: am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
468d82bb7150996c8b2b4228d0e8d031f74e304b':
B9257437: Typo in javadoc for AccountManager
Romain Guy [Mon, 3 Jun 2013 21:19:54 +0000 (14:19 -0700)]
Remove unnecessary lock to save 1 allocation per TextView
Change-Id: I4fb885c61b44e57b8abaf3beedf61aaab3ef5d71
Baligh Uddin [Mon, 3 Jun 2013 21:18:25 +0000 (14:18 -0700)]
am
ba82b53d: (-s ours) am
26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
ba82b53dd7896fcc28af24f6625818a7d7afc5e4':
Import translations. DO NOT MERGE
Joe Malin [Mon, 3 Jun 2013 21:18:22 +0000 (14:18 -0700)]
am
6bf45dc7: am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
6bf45dc773de186b68af3cc9fdc275acbd3d86aa':
B9257437: Typo in javadoc for AccountManager
Baligh Uddin [Mon, 3 Jun 2013 21:17:50 +0000 (21:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Joe Malin [Mon, 3 Jun 2013 21:17:15 +0000 (14:17 -0700)]
am
b6a35268:
B9257437: Typo in javadoc for AccountManager
* commit '
b6a35268ccb698cde6d2e1e2f475a7299112b034':
B9257437: Typo in javadoc for AccountManager
Baligh Uddin [Mon, 3 Jun 2013 21:15:52 +0000 (14:15 -0700)]
am
26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
26fe0761e3e275347c06f9224e24ab7a31ff23e8':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Jun 2013 21:15:14 +0000 (21:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 3 Jun 2013 21:14:23 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
The Android Open Source Project [Mon, 3 Jun 2013 21:07:19 +0000 (14:07 -0700)]
am
5871434e: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
5871434ed6cb00895bba1bc253dcbfc49c453041':
The Android Open Source Project [Mon, 3 Jun 2013 21:02:50 +0000 (14:02 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60
Joe Malin [Mon, 3 Jun 2013 16:49:04 +0000 (09:49 -0700)]
B9257437: Typo in javadoc for AccountManager
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
Scott Main [Mon, 3 Jun 2013 18:37:27 +0000 (11:37 -0700)]
am
dce21a59: am
3c080baa: am
564889b1: am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
dce21a59d9793551abd08ad852714894a1b0d19d':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:35:02 +0000 (11:35 -0700)]
am
3c080baa: am
564889b1: am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
3c080baad5609faa663238f202c7aae7268bbd2c':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:33:13 +0000 (11:33 -0700)]
am
564889b1: am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
564889b1263bb1c5cfcd21401f853b0cc1569a50':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:17:15 +0000 (11:17 -0700)]
am
4a024be4: am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
4a024be4de71f90eaaff7be8122926bdc9297d38':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:15:16 +0000 (11:15 -0700)]
am
4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
* commit '
4cef8150c83ce60a4d3acc495132357fb9bd1458':
update dashbord for 6/3
Scott Main [Mon, 3 Jun 2013 18:12:54 +0000 (18:12 +0000)]
Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev
Baligh Uddin [Mon, 3 Jun 2013 16:45:51 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia370f49ef3fbc9e163b0db22181ba8ad68caef05
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Jun 2013 16:25:54 +0000 (09:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I973aa572426edfe9ebb11e30133d7baef5c98384
Auto-generated-cl: translation import
Baligh Uddin [Mon, 3 Jun 2013 16:11:49 +0000 (09:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
Scott Main [Mon, 3 Jun 2013 16:06:19 +0000 (09:06 -0700)]
update dashbord for 6/3
Change-Id: I73f340be032d6a45ccc20c80f03849b018f650e5
John Spurlock [Mon, 3 Jun 2013 15:55:04 +0000 (08:55 -0700)]
am
0f41c05e: am
0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
* commit '
0f41c05ececdf03f08d5c9a6155bd24e252dc8e7':
Fix awkward wording in AppWidgetManager docs.
John Spurlock [Mon, 3 Jun 2013 15:52:56 +0000 (08:52 -0700)]
am
0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
* commit '
0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
Fix awkward wording in AppWidgetManager docs.
John Spurlock [Mon, 3 Jun 2013 15:50:43 +0000 (15:50 +0000)]
Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev
Andreas Huber [Mon, 3 Jun 2013 15:48:30 +0000 (08:48 -0700)]
am
c41a0eff: am
be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
* commit '
c41a0eff938f825ef235b92efa7a31c3b7f8bfb4':
Listen for HTTP proxy changes and propagate the information to the media
Andreas Huber [Mon, 3 Jun 2013 15:46:20 +0000 (08:46 -0700)]
am
be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
* commit '
be22605d1eacfb4137b6984b72a3eda004b911a1':
Listen for HTTP proxy changes and propagate the information to the media
Andreas Huber [Mon, 3 Jun 2013 15:44:16 +0000 (15:44 +0000)]
Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
Robert Greenwalt [Mon, 3 Jun 2013 15:43:58 +0000 (08:43 -0700)]
am
53009832: am
05caa2a3: Apply scan-always setting to initial wifi state.
* commit '
530098327c19cfa3c31c4eabe316bf36ad4a848c':
Apply scan-always setting to initial wifi state.
Robert Greenwalt [Mon, 3 Jun 2013 15:41:48 +0000 (08:41 -0700)]
am
05caa2a3: Apply scan-always setting to initial wifi state.
* commit '
05caa2a3de32e54562d1ec3031f73ef5392cfb40':
Apply scan-always setting to initial wifi state.
John Spurlock [Mon, 3 Jun 2013 15:38:48 +0000 (11:38 -0400)]
Fix awkward wording in AppWidgetManager docs.
Change-Id: Ia06221f75898ab53f97852880bf2a7ec49b4f489
John Spurlock [Mon, 3 Jun 2013 13:47:01 +0000 (09:47 -0400)]
Fix awkward wording in AppWidgetManager docs.
Change-Id: I6d1e180be666b3d88e88f357e8d79f6bbc0c9857
The Android Automerger [Mon, 3 Jun 2013 12:55:11 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mikhail Naganov [Mon, 3 Jun 2013 08:39:42 +0000 (08:39 +0000)]
Merge "Specify that WebSettings.{get|set}DefaultZoom are not recommented to use"
The Android Automerger [Sun, 2 Jun 2013 12:55:28 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Robert Greenwalt [Sat, 1 Jun 2013 17:59:29 +0000 (10:59 -0700)]
Apply scan-always setting to initial wifi state.
Otherwise there's nothing to kick us into scanable modes unless
the user toggles wifi.
bug:
9217455
Change-Id: I6460305e3f299646433546598412f817579cc805
Robert Greenwalt [Sat, 1 Jun 2013 16:52:18 +0000 (09:52 -0700)]
am
66c7bd54: am
0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev
* commit '
66c7bd54046c567de5e3a4d332987a28ecb78092':
Remember wifi country that's set before boot
Dirk Dougherty [Sat, 1 Jun 2013 16:52:14 +0000 (09:52 -0700)]
am
0f70bcfc: am
8ebfb8c9: am
fdc0c861: am
b18c7254: am
a404a629: am
6fe992d8: am
4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs
* commit '
0f70bcfce3eb291e95e2a70f9d353efa862796da':
Doc change: restore warning not to abort NEW_OUTGOING_CALL.
Wink Saville [Sat, 1 Jun 2013 16:52:05 +0000 (09:52 -0700)]
am
ec82a7bd: am
8ca5d64a: am
39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
* commit '
ec82a7bde5970b76f2940db25e35865a23c6ebc2':
Fixing crash in PhoneNumberUtils getNumberFromIntent
Jason Sams [Sat, 1 Jun 2013 16:51:46 +0000 (09:51 -0700)]
am
d19068a7: am
413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev
* commit '
d19068a7d28d129f5a1a1be478e972b40cea04eb':
Fix free after use with createFromBitmapResource
Baligh Uddin [Sat, 1 Jun 2013 16:51:43 +0000 (09:51 -0700)]
am
14fa7fe2: (-s ours) am
51e01f9e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '
14fa7fe20fbff7cfcc5daf0a1dce74a296fe3f86':
Import translations. DO NOT MERGE
Jim Miller [Sat, 1 Jun 2013 16:51:40 +0000 (09:51 -0700)]
am
2542fd54: am
00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev
* commit '
2542fd54ac943002cb7537029404dcc80a6491ac':
Fix keyguard issue where an incoming SMS would switch widget
OSDN Git Service
