Paul Crowley
a97227add8
Clean up and fix warnings in LockPatternView: make things final
...
and private, remove unnecessary synchronization, suppress warnings
where appropriate.
Change-Id: Ie956f45d887e518db6eec8ab34a713565ebd3ca3
2014-12-15 10:28:44 +00:00
Elliott Hughes
7f3a73c7b5
am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."
...
automerge: a95b568
2014-12-12 23:38:23 +00:00
Elliott Hughes
a95b568f9a
am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote."
...
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
Lose some unnecessary JNI from the zygote.
2014-12-12 23:32:06 +00:00
Paul Miller
ee87841395
Merge "Update CookieManager documentation"
2014-12-12 22:34:08 +00:00
Paul Miller
9d67f36651
Update CookieManager documentation
...
The CookieManager documentation became incorrect after deprecating
CookieSyncManager. Remove the note about CookieSyncManager.
code.google.com/p/android/issues/detail?id=82052
Change-Id: I13bc52716cd71e47b67148186a69f7269e418864
2014-12-12 22:08:03 +00:00
Elliott Hughes
3fe595108f
Lose some unnecessary JNI from the zygote.
...
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
2014-12-12 14:07:34 -08:00
Svet Ganov
103f52e1b2
am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
automerge: 1301446
2014-12-12 21:05:01 +00:00
Svet Ganov
1301446c01
am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit 'e608644a9f0fa54a05379c171814569816145801':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 21:02:24 +00:00
Raph Levien
8fdf39753b
Merge "Revert "Fix missing ellipsis when just one character is truncated""
2014-12-12 20:57:09 +00:00
Svet Ganov
e608644a9f
am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
...
* commit '7486bc1f5a8156e9b586ebb9c32ced218e668652':
Fix an edge case in computing click location in accessibility mode.
2014-12-12 20:54:38 +00:00
Svet Ganov
7486bc1f5a
Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
2014-12-12 20:48:09 +00:00
Raph Levien
4c02e83172
Revert "Fix missing ellipsis when just one character is truncated"
...
This reverts commit 93e48e8cf1
2014-12-12 11:24:45 -08:00
Todd Kennedy
2ece10db56
Merge "Add NoDisplay test when resuming Activity"
2014-12-12 19:20:43 +00:00
Kenny Guy
7369cc6145
am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev
...
automerge: a63b620
2014-12-12 19:03:35 +00:00
Adam Powell
dd65a916c7
am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
automerge: 097e383
2014-12-12 18:57:35 +00:00
Kenny Guy
a63b620916
am dcd42f0f: am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev
...
* commit 'dcd42f0fa16802d39245f3ba98a6226bde9a83e6':
Don't show last used and profile button at same time.
2014-12-12 18:57:31 +00:00
Kenny Guy
dcd42f0fa1
am 4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev
...
* commit '4357d4eabc375c392190cf2d1dfc3aeba9718ceb':
Don't show last used and profile button at same time.
2014-12-12 18:50:15 +00:00
Adam Powell
097e3830cd
am 746079e2: am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
* commit '746079e2ee516d1c7be62154992eda78e9f2ec28':
Have ViewGroups without a parent clip child visible rects to bounds
2014-12-12 18:49:37 +00:00
Kenny Guy
4357d4eabc
Merge "Don't show last used and profile button at same time." into lmp-mr1-dev
2014-12-12 18:46:23 +00:00
Adam Powell
746079e2ee
am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
...
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
Have ViewGroups without a parent clip child visible rects to bounds
2014-12-12 18:43:38 +00:00
Adam Powell
9a0799cf6b
Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
2014-12-12 18:37:33 +00:00
Esteban Talavera
c872c7f7d5
am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c
...
automerge: 0b7b87a
2014-12-12 17:19:42 +00:00
Esteban Talavera
0b7b87a4c8
am 4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge: c28fa2c
...
* commit '4f40fb471265a164a0bdfd060d90375ce706b1dd':
Take into account other profiles when deciding whether to show ResolverActivity
2014-12-12 17:17:32 +00:00
Esteban Talavera
4f40fb4712
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
...
automerge: c28fa2c
2014-12-12 17:08:46 +00:00
Kenny Guy
b8a2df10c9
Don't show last used and profile button at same time.
...
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.
Bug: 18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
2014-12-12 17:04:08 +00:00
Esteban Talavera
c28fa2cdd4
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
2014-12-12 16:59:31 +00:00
Esteban Talavera
6de72663fa
Take into account other profiles when deciding whether to show ResolverActivity
...
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.
BUG: 18701336,18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
2014-12-12 14:34:29 +00:00
Svet Ganov
9fc96c5371
Fix an edge case in computing click location in accessibility mode.
...
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.
bug:18672945
Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
2014-12-11 22:33:48 -08:00
Alan Viverette
040b761af9
am 3ead4127: am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev automerge: 4b7f724
...
* commit '3ead4127ae493508d064e106ec12f299e7116e8a':
Improve time picker accessibility
2014-12-12 04:26:12 +00:00
Alan Viverette
3ead4127ae
am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
...
automerge: 4b7f724
2014-12-12 04:21:42 +00:00
Ruben Brunk
00b2eb2bc0
am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b
...
* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
camera2: Fix LEGACY YUV production and orientation.
2014-12-12 04:21:07 +00:00
Ruben Brunk
c7c20b34ec
am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
...
automerge: 81b381b
2014-12-12 04:09:55 +00:00
Todd Kennedy
ee8c9c6379
Add NoDisplay test when resuming Activity
...
When an activity has no display [i.e. it's invisible], it
must call finish() before onResume() completes
Bug: 18279655
Change-Id: I2b8562b852c05fdfff4e6a6922ce47e9e948a880
2014-12-11 15:18:21 -08:00
Alan Viverette
4b7f724fb2
am ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
...
* commit 'ff44188309fca037892d0ded64cfee04a3a71c42':
Improve time picker accessibility
2014-12-11 22:19:07 +00:00
Alan Viverette
ff44188309
Merge "Improve time picker accessibility" into lmp-mr1-dev
2014-12-11 22:11:56 +00:00
Ruben Brunk
81b381b82e
am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
...
* commit 'f6ed526b3a02bac9c5912a9655e5890f332cefc6':
camera2: Fix LEGACY YUV production and orientation.
2014-12-11 19:55:02 +00:00
Ruben Brunk
f6ed526b3a
Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
2014-12-11 19:48:37 +00:00
Ruben Brunk
433e715cc0
camera2: Fix LEGACY YUV production and orientation.
...
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
2014-12-11 11:35:46 -08:00
Robert Greenwalt
6b58bc2ba2
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev automerge: 911bcea
...
automerge: 46765a0
2014-12-11 18:15:07 +00:00
Robert Greenwalt
46765a0fbc
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
...
automerge: 911bcea
2014-12-11 18:07:53 +00:00
Mike Lockwood
43bbe4a1e7
Merge "MidiManager: Improve Javadoc"
2014-12-11 17:26:40 +00:00
Glenn Kasten
65357bd956
Merge "Remove constructor"
2014-12-11 17:21:23 +00:00
Mike Lockwood
78beecffc3
MidiManager: Improve Javadoc
...
Change-Id: Ia1c457de96152029676676464f1ebb896e58bea8
2014-12-11 09:15:23 -08:00
Robert Greenwalt
911bceab1e
am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-dev
...
* commit 'bde00a2b5c8c506b79e0724021a0711bde207c25':
Add toString in NetworkFactory.
2014-12-11 17:03:57 +00:00
Robert Greenwalt
bde00a2b5c
Merge "Add toString in NetworkFactory." into lmp-mr1-dev
2014-12-11 16:59:13 +00:00
Paul Jensen
87dfb9ec25
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev automerge: d9d48cc
...
automerge: 8f58207
2014-12-11 10:25:47 +00:00
Dianne Hackborn
460797b398
am 84adc43a: Merge "Fix issue #18706195 : Improve label names of memory types" into lmp-mr1-dev automerge: 0f050ea
...
automerge: b56e98d#18706195 : Improve label names of memory types
2014-12-11 10:18:41 +00:00
Paul Jensen
8f58207319
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
...
automerge: d9d48cc
2014-12-11 05:49:18 +00:00
Paul Jensen
d9d48cc9c7
am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
...
* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
Fix several HTTP proxy issues with multinetworking.
2014-12-11 04:55:52 +00:00
Paul Jensen
2122e14cca
Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev
2014-12-11 04:51:16 +00:00
