Romain Guy
a1ca6d39f9
am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1
am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:55:22 -08:00
Irfan Sheriff
511d5346ce
Stop supplicant and dhcp before start
...
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
2012-11-06 15:53:32 -08:00
Adam Powell
7136544c06
Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev
2012-11-06 15:50:12 -08:00
Adam Powell
9d34f9db81
Keyguard - MultiPaneChallengeLayout measurement/layout changes
...
Have the widget view and the user switcher stay fixed when IME insets
are applied. This keeps more stability in the layouts as the IME comes
and goes.
Change-Id: I5ac62c3da6ec618280f89e87993837b3e4941ec9
2012-11-06 15:38:28 -08:00
Adam Powell
b5f27ddb3e
am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev
...
* commit 'dd1dd60770dccf83bba3e4abab2221f2bb7f1e1d':
Keyguard sanity checks for when layout is not yet complete
2012-11-06 15:30:49 -08:00
Svetoslav Ganov
a90a18db91
Make partially visible widget pages not important for accessibility.
...
1. If the lockscreen has more than one widet, the left and right widget
pages are partially on the screen and visible. Therefore they may
take accessibility focus so the user will hear a prompt that he is
on the partially visible widget page but will not be able to interact
with it - confusing. This change makes partially shown windget frames
not important for accessibility.
bug:7454355
Change-Id: I475b21e215474a4421acaec485cde64dc4e2aee5
2012-11-06 15:22:16 -08:00
Jean-Baptiste Queru
ecf372213d
Merge eead9274
...
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
2012-11-06 15:16:09 -08:00
Victoria Lease
66f3d7f3c8
am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
...
* commit '446ffe00cd402e18c041fb36c4d0d03429186224':
Fires geofence if the device is already in the geofence area.
2012-11-06 15:12:44 -08:00
Robert Greenwalt
08db1ceba2
am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
...
* commit 'bbe5cafeebbbd08516909a3d9d12d5d319cba345':
Add Coin graphic to premium-sms dialog.
2012-11-06 15:11:04 -08:00
Victoria Lease
8d803258ca
am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
...
* commit 'e6299d5af702dd17eb3585dbe84d29c289bfa8da':
Fires geofence if the device is already in the geofence area.
2012-11-06 15:09:38 -08:00
Victoria Lease
446ffe00cd
am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
...
* commit 'e6299d5af702dd17eb3585dbe84d29c289bfa8da':
Fires geofence if the device is already in the geofence area.
2012-11-06 15:09:37 -08:00
Chris Wren
5fcca70d28
Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev
2012-11-06 15:08:41 -08:00
Robert Greenwalt
bbe5cafeeb
Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
2012-11-06 15:07:35 -08:00
Winson Chung
6cf53bb3a9
Using screen dimensions to calculate the expanded PagedView dimensions.
...
- Disallowing taps/interaction outside of the viewport (Bug 7459448)
- Fixing regression in incorrect pivot for Camera page
- Fixing issue where the bouncer was both scaling and shrinking widget pages.
Change-Id: Iefee62061962625b622ff2cf9a307d9429c2ad54
2012-11-06 15:07:14 -08:00
Victoria Lease
e6299d5af7
Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
2012-11-06 15:06:16 -08:00
Chris Wren
da8f622b90
animating challenge closed should close the challenge.
...
Bug: 7486591
Change-Id: Ie19a3765c63b885539a621467c2fdc81041578a7
Proto:Id: Iedf69f2f4e97f313af0228954a75f5a494b33c88
2012-11-06 18:02:57 -05:00
Baligh Uddin
f5525b9967
Import translations. DO NOT MERGE
...
Change-Id: Ic647d879dc7392501863f4531f048b17faa1fd07
Auto-generated-cl: translation import
2012-11-06 14:29:53 -08:00
Baligh Uddin
7e28e06c45
Import translations. DO NOT MERGE
...
Change-Id: I7ecdfe214d3fa7552f2ec51205da62c8b7df8d9b
Auto-generated-cl: translation import
2012-11-06 14:28:51 -08:00
Baligh Uddin
cd086f1162
Import translations. DO NOT MERGE
...
Change-Id: I37daca17d62112249577b66dde31621f041eff62
Auto-generated-cl: translation import
2012-11-06 14:27:46 -08:00
Jim Miller
088fb915f7
Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
2012-11-06 14:21:12 -08:00
Baligh Uddin
e5f4562ff7
Import translations. DO NOT MERGE
...
Change-Id: I76ae2d0dfa8538ffd649c69ed2aaa7128a29e2ea
Auto-generated-cl: translation import
2012-11-06 14:06:25 -08:00
Baligh Uddin
bc3a2b9f65
Import translations. DO NOT MERGE
...
Change-Id: I45d540fce163bd0eb6e2edbb6358a1aa6f50193b
Auto-generated-cl: translation import
2012-11-06 13:57:58 -08:00
Danielle Millett
2d9fae2bcf
Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev
2012-11-06 13:47:02 -08:00
Adam Cohen
7741e6209a
Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev
2012-11-06 13:40:30 -08:00
The Android Open Source Project
927372aec3
am f3456803: Reconcile with jb-mr1-release - do not merge
...
* commit 'f3456803fed4ff529dea53fd9bc338887886acf9':
2012-11-06 13:29:21 -08:00
The Android Open Source Project
f3456803fe
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I6206907ad603bf70ca2c9ca3b9afc136fe2a1695
2012-11-06 13:26:48 -08:00
Daniel Sandler
207d548ccf
Show the assist ring on center-button longpress on lockscreen.
...
Bug: 7480028
Change-Id: I4c8013e984c2591faf3bc8fe2048abf69d545b6c
2012-11-06 16:23:43 -05:00
Adam Cohen
0e1608c027
Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
2012-11-06 13:23:41 -08:00
Justin Koh
41048d670d
Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
2012-11-06 13:22:26 -08:00
Justin Koh
58e0fb9adb
Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
2012-11-06 13:20:51 -08:00
Adam Cohen
d6f8960b68
Making sure the sticky widget logic works with music
...
-> Also, ensure that subsequent calls to showAppropriateWidget
don't blow away your current page.
Change-Id: I7195e35f306526c371b9546ab48bc408868eff51
2012-11-06 13:20:40 -08:00
The Android Automerger
f0de33bef1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 13:13:34 -08:00
Amith Yamasani
aecee8a985
am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
...
* commit '717797db3e59ec34190e1230ebdeafecd14f4948':
Authenticate correct user's account when pattern fails multiple times.
2012-11-06 13:00:40 -08:00
Amith Yamasani
717797db3e
am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
...
* commit 'f763b71756d4d810e78e368fbcd56ff8a844f62c':
Authenticate correct user's account when pattern fails multiple times.
2012-11-06 12:58:39 -08:00
Amith Yamasani
5eac4d852b
am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
...
* commit 'f763b71756d4d810e78e368fbcd56ff8a844f62c':
Authenticate correct user's account when pattern fails multiple times.
2012-11-06 12:58:35 -08:00
Chris Wren
9f79d0db09
Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev
2012-11-06 12:56:57 -08:00
Amith Yamasani
f763b71756
Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev
2012-11-06 12:56:17 -08:00
Baligh Uddin
3ee5aeb2de
am 59880dfd: am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
...
* commit '59880dfd2e2078a21a9d4f79a8ea2ae52aa8bdb3':
2012-11-06 12:51:09 -08:00
Adam Powell
2d5a68b4a7
am 833b29a8: am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions
...
* commit '833b29a82dfdcdce22e4035aa79edb52c9281f18':
Optimize keyguard/IME interactions
2012-11-06 12:51:05 -08:00
Joe Malin
aa0762b7b5
am 82ecdcc0: am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader
...
* commit '82ecdcc0f78b55dbb38a99f36e2ebac4148c99be':
2012-11-06 12:51:02 -08:00
John Spurlock
ef44a77f91
am b93031e0: am 65cbcbea: Remove add widget transition jank (insecure).
...
* commit 'b93031e0a64f3ec2548063cec6ea63b54be92c93':
Remove add widget transition jank (insecure).
2012-11-06 12:48:36 -08:00
John Spurlock
64091a1da0
am 8aa62362: am ae73c690: Fix regression in camera transition.
...
* commit '8aa623628cbc7b859b1f94e5a09882fbe8cb209d':
Fix regression in camera transition.
2012-11-06 12:48:33 -08:00
Michael Jurka
7dfbe2d6a7
am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
...
* commit '3eaa876cf317d064de1a32f1d34fd83b6e960e0b':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-06 12:48:29 -08:00
Jim Miller
bb9e7dcae9
am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit 'be2ca79abf2b1e5eb257560aa99ab48059e48cc8':
Workaround for layout bug in SIM PIN/PUK views
2012-11-06 12:48:26 -08:00
Jim Miller
16ddf343a6
am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
...
* commit '8eb3048acc2a3fddf0d6acfb43e69696672ae706':
Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-06 12:48:22 -08:00
Svetoslav Ganov
ab77b5e6a2
am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit 'e97c6faadb7d1b51d1dd194d4ccc47e299d09ba9':
2012-11-06 12:48:19 -08:00
Mike Cleron
d97d16f0d1
am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
...
* commit 'f154c9bdf81f20cf813064dd4e7e43805095b97a':
2012-11-06 12:48:15 -08:00
Romain Guy
c4101b2b96
am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328 " into jb-mr1-dev
...
* commit 'a8e1d119630ca3d351262ca3f3a11dda4e6edf75':
2012-11-06 12:48:11 -08:00
Winson Chung
5418dd92ac
am 6d47e9fc: am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660)
...
* commit '6d47e9fc867ece4340869f72d9484c9e5eb71873':
Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-06 12:48:06 -08:00