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

107568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chet Haase
aca7d39d08 Merge "Starting new transition cancels running transition" 2013-06-04 16:19:39 +00:00
Chet Haase
e9d32ea13e 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
 2013-06-04 08:46:42 -07:00
Xia Wang
840a8c741f am af19aef6: am ac561b8b: Merge "Add option to set frequency band" into jb-mr2-dev 
* commit 'af19aef675013f804a5338e3500ad57b0aa2fc71':
  Add option to set frequency band
 2013-06-03 21:28:24 -07:00
Xia Wang
af19aef675 am ac561b8b: Merge "Add option to set frequency band" into jb-mr2-dev 
* commit 'ac561b8bdd52a6ac5e4f9b92f1033cd385f149d8':
  Add option to set frequency band
 2013-06-03 21:26:21 -07:00
Xia Wang
ac561b8bdd Merge "Add option to set frequency band" into jb-mr2-dev 2013-06-04 04:23:29 +00:00
Dirk Dougherty
caa05bc1c3 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.
 2013-06-03 19:26:03 -07:00
Dirk Dougherty
b74c3405b6 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.
 2013-06-03 19:23:17 -07:00
Dirk Dougherty
e3e98bc966 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.
 2013-06-03 19:20:46 -07:00
Dirk Dougherty
59b7787894 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.
 2013-06-03 19:19:20 -07:00
Dirk Dougherty
63c904c2d7 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.
 2013-06-03 19:16:37 -07:00
Dirk Dougherty
4c8caaa2ef am 5ca78f59: am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '5ca78f5963e49b48896fa866aeb032a37ba15360':
  Doc change: Add new developer video.
 2013-06-03 19:13:46 -07:00
Dirk Dougherty
5ca78f5963 am 8e307adc: Merge "Doc change: Add new developer video." into jb-mr1.1-docs 
* commit '8e307adcf62c639d25c16f6071d458561ce4bef3':
  Doc change: Add new developer video.
 2013-06-03 19:11:26 -07:00
Dirk Dougherty
8e307adcf6 Merge "Doc change: Add new developer video." into jb-mr1.1-docs 2013-06-04 02:08:21 +00:00
Dirk Dougherty
35592bd6be Doc change: Add new developer video. 
Change-Id: I8af77ee439238133bedeb0396257058f4504f6f7
 2013-06-03 19:05:16 -07:00
The Android Open Source Project
170c1434b3 am b18841b4: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'b18841b442006b63a0c57527fdd6d16bc04e6644':
  Apply scan-always setting to initial wifi state.
 2013-06-03 17:16:33 -07:00
The Android Open Source Project
b18841b442 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ib4adc6b9ad37713ec04b6cacce5279e12395e3a6
 2013-06-03 16:43:47 -07:00
Chet Haase
90b8994470 Merge "Various fixes/cleanup in Scenes and Transitions" 2013-06-03 23:41:08 +00:00
Chet Haase
867a86613d 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
 2013-06-03 16:37:05 -07:00
Romain Guy
a4b7965cc2 Merge "Replace HashMap with ArrayMap to remove unnecessary allocations" 2013-06-03 22:52:20 +00:00
Romain Guy
6876b4fb90 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
 2013-06-03 15:40:52 -07:00
Romain Guy
36e337f971 Merge "Remove unnecessary lock to save 1 allocation per TextView" 2013-06-03 22:38:07 +00:00
Robert Greenwalt
b0a88e5716 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
 2013-06-03 15:03:36 -07:00
Joe Malin
64f2227bbc 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
 2013-06-03 14:34:00 -07:00
Joe Malin
8811154e93 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
 2013-06-03 14:31:21 -07:00
Joe Malin
423f8a8c21 am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '2618ac55a94a97e29abd9defa93dea30e067b4e4':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:27:50 -07:00
Joe Malin
2618ac55a9 am a37bda7b: am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'a37bda7b616452d0072b012cc7ae8fcae51e943f':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:23:08 -07:00
Joe Malin
a37bda7b61 am 468d82bb: am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '468d82bb7150996c8b2b4228d0e8d031f74e304b':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:20:45 -07:00
Romain Guy
31f0544293 Remove unnecessary lock to save 1 allocation per TextView 
Change-Id: I4fb885c61b44e57b8abaf3beedf61aaab3ef5d71
 2013-06-03 14:19:54 -07:00
Baligh Uddin
d7a383238f am ba82b53d: (-s ours) am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'ba82b53dd7896fcc28af24f6625818a7d7afc5e4':
  Import translations. DO NOT MERGE
 2013-06-03 14:18:25 -07:00
Joe Malin
468d82bb71 am 6bf45dc7: am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit '6bf45dc773de186b68af3cc9fdc275acbd3d86aa':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:18:22 -07:00
Baligh Uddin
08afe497be Merge "Import translations. DO NOT MERGE" 2013-06-03 21:17:51 +00:00
Joe Malin
6bf45dc773 am b6a35268: B9257437: Typo in javadoc for AccountManager 
* commit 'b6a35268ccb698cde6d2e1e2f475a7299112b034':
  B9257437: Typo in javadoc for AccountManager
 2013-06-03 14:17:15 -07:00
Baligh Uddin
ba82b53dd7 am 26fe0761: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '26fe0761e3e275347c06f9224e24ab7a31ff23e8':
  Import translations. DO NOT MERGE
 2013-06-03 14:15:52 -07:00
Baligh Uddin
85de5f420e Merge "Import translations. DO NOT MERGE" 2013-06-03 21:15:14 +00:00
Baligh Uddin
26fe0761e3 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-06-03 21:14:23 +00:00
The Android Open Source Project
e382d4da24 am 5871434e: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '5871434ed6cb00895bba1bc253dcbfc49c453041':
 2013-06-03 14:07:19 -07:00
The Android Open Source Project
5871434ed6 Reconcile with jb-mr2-release - do not merge 
Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60
 2013-06-03 14:02:50 -07:00
Joe Malin
b6a35268cc B9257437: Typo in javadoc for AccountManager 
Change-Id: I5349c2a0ba7e831d205f2801daecc24fa9a5b5a6
 2013-06-03 12:20:08 -07:00
Scott Main
c930c4e1f0 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
 2013-06-03 11:37:27 -07:00
Scott Main
dce21a59d9 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
 2013-06-03 11:35:02 -07:00
Scott Main
3c080baad5 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
 2013-06-03 11:33:13 -07:00
Scott Main
564889b126 am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4a024be4de71f90eaaff7be8122926bdc9297d38':
  update dashbord for 6/3
 2013-06-03 11:17:15 -07:00
Scott Main
4a024be4de am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 
* commit '4cef8150c83ce60a4d3acc495132357fb9bd1458':
  update dashbord for 6/3
 2013-06-03 11:15:16 -07:00
Scott Main
4cef8150c8 Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev 2013-06-03 18:12:54 +00:00
Baligh Uddin
179cffe5a0 Import translations. DO NOT MERGE 
Change-Id: Ia370f49ef3fbc9e163b0db22181ba8ad68caef05
Auto-generated-cl: translation import
 2013-06-03 09:45:51 -07:00
Baligh Uddin
c15f410d97 Import translations. DO NOT MERGE 
Change-Id: I973aa572426edfe9ebb11e30133d7baef5c98384
Auto-generated-cl: translation import
 2013-06-03 09:25:54 -07:00
Baligh Uddin
87b2098a8b Import translations. DO NOT MERGE 
Change-Id: I455b359698e9bf43d7065374241783fa1f06faca
Auto-generated-cl: translation import
 2013-06-03 09:11:49 -07:00
Scott Main
aaae94aefa update dashbord for 6/3 
Change-Id: I73f340be032d6a45ccc20c80f03849b018f650e5
 2013-06-03 09:06:19 -07:00
John Spurlock
07e2795083 am 0f41c05e: am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 
* commit '0f41c05ececdf03f08d5c9a6155bd24e252dc8e7':
  Fix awkward wording in AppWidgetManager docs.
 2013-06-03 08:55:04 -07:00
John Spurlock
0f41c05ece am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev 
* commit '0c2c62b29d191d41129e3dc5451f07ce0ef6985f':
  Fix awkward wording in AppWidgetManager docs.
 2013-06-03 08:52:56 -07:00