Baligh Uddin
5c89a59231
am 4d0e5e0e: am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '4d0e5e0e152a91ccc63a382a9a8da8d21b16452d':
2012-11-07 18:34:52 -08:00
Adam Powell
d8e2fdf734
Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev
2012-11-07 18:31:46 -08:00
Sascha Prueter
14c89330ae
am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
...
* commit 'de974f6f201a9aed3f811c97edf4db3ecd41eb3d':
2012-11-07 18:29:40 -08:00
Victoria Lease
d9da50ba0e
am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev
...
* commit 'eb6cbc22b264af26a20065942899a27abbc867eb':
2012-11-07 18:29:33 -08:00
Chris Wren
c0cbe8ab5e
am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
...
* commit '8e3bf41d8b2289fa96ea1b268946bacaa01a620c':
add logging to enableUserSelectorIfNecessary.
2012-11-07 18:29:30 -08:00
Chris Wren
74c5d53e2f
am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
...
* commit 'b524f4b928fe3ac9c71657a323cff4b3321344da':
add some defensive code to enableUserSelectorIfNecessary.
2012-11-07 18:29:27 -08:00
Daniel Sandler
e4e6c97ea4
am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit '2d09880d0352895dcd7ae3d4cdca95e4503b23ed':
2012-11-07 18:29:23 -08:00
Baligh Uddin
7086987652
am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE
...
* commit '62e2374baa822bc98ef8e5ad8b10a55379433ef1':
2012-11-07 18:29:20 -08:00
Baligh Uddin
d9550886a8
am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
...
* commit 'd44c4344aa85ece3443ffdd410e9619650cbd39f':
Import translations. DO NOT MERGE
2012-11-07 18:29:16 -08:00
Adam Cohen
b579714c12
am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev
...
* commit '8f837a690b0da2579157cdcc30503e0dd67f429d':
Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
2012-11-07 18:29:13 -08:00
Baligh Uddin
4d0e5e0e15
am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'db60b67533f0e8e0366a926204bc852412285320':
2012-11-07 18:29:10 -08:00
Daniel Sandler
f837e4149e
New asset for assist affordance on lockscreen.
...
Bug: 7468726
Change-Id: Ia906256f667597ac92b07ee0f5b967048b5e25d5
2012-11-07 21:17:57 -05:00
Adam Powell
eec4fe2cbe
Use stable layouts for keyguard/SlidingChallengeLayout
...
When coming back from the secure camera we will be transitioning from
fullscreen back to not-fullscreen with regard to the status bar. Flag
SlidingChallengeLayout to force the window to have stable insets so
that our layout doesn't jump around during this transition.
Set the same flag in MultiPaneChallengeLayout as well so that similar
cases with other activities are also covered.
Bug 7498950
Change-Id: I1b65e04d1404e764ddad29472b70cf791d6801f9
2012-11-07 18:15:59 -08:00
Jim Miller
8bbafed48b
Don't handle click events on the emergency button in bouncer mode
...
This fixes a bug where the emergency call button was hidden, but not
gone. This adds a call to setVisibility(INVISIBLE) when the alpha
is animated to 0 and restore it when bouncer mode is dismissed.
Fixes bug 7498389
Change-Id: I0898542ff7c666c8f41175a330b72d3450475739
2012-11-07 18:10:49 -08:00
Jim Miller
3c9297c3cb
Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev
2012-11-07 18:09:14 -08:00
The Android Automerger
016b862c54
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-07 18:04:48 -08:00
Daniel Sandler
5c533884ea
Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev
2012-11-07 18:03:11 -08:00
Winson Chung
4181e8a4ac
Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev
2012-11-07 17:50:24 -08:00
Winson Chung
c065a5d727
Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
...
- Laying out the drop target without padding from the multiuser picker
Change-Id: Icd3528a13f84a789341a841645bfde4e51fd1747
2012-11-07 17:44:42 -08:00
Scott Main
65b59f5035
am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
...
* commit '1af587b346035320363a08c190f8b61a69cf0e7c':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
2012-11-07 17:33:09 -08:00
Scott Main
1af587b346
am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
...
* commit '4623c0d842403bf2ae4b622590325c3635aaf563':
docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
2012-11-07 17:30:22 -08:00
Scott Main
4623c0d842
docs: Add basic tool help pages for SDK and AVD Manager.
...
The SDK Manager page is needed particularly as a reference by
some pages rather than pointing to the installation guide.
Change-Id: Ie835e310f62cdc88bd6318e82f48e36bdd8e117a
2012-11-07 17:24:25 -08:00
Justin Koh
cd38c32d85
Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
2012-11-07 17:10:24 -08:00
Adam Cohen
85c4281aae
Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev
2012-11-07 17:08:31 -08:00
Jim Miller
5da893c93b
Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev
2012-11-07 17:01:53 -08:00
Amith Yamasani
5ec00e930f
Don't cancel any notifications that are meant for all users, if no package is specified.
...
Bug: 7490028
Otherwise notifications such as the USB debugging and OTA notifications will be
dismissed when any user is stopped.
Change-Id: I0ae0c1136a999dd3aade99ca9e71c714b359eab4
2012-11-07 16:58:30 -08:00
Adam Cohen
d51700b3cc
Fixing up overscroll asset / sizing
...
-> No more jaggies! yay (issue 7459049)
-> Fixed up weird overscroll state (issue 7489094)
Change-Id: I5d6714a6f5f007ea0f73e4cf34a20572c5f43f64
2012-11-07 16:54:35 -08:00
Irfan Sheriff
5c8e5585e2
am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev
...
* commit '1f6cf5fade6021c1ce788541ec4a60ee36d20651':
Re-use existing thread
2012-11-07 16:46:31 -08:00
Irfan Sheriff
1f6cf5fade
Merge "Re-use existing thread" into jb-mr1.1-dev
2012-11-07 16:43:26 -08:00
Svetoslav Ganov
cd1f309505
Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev
2012-11-07 16:39:21 -08:00
Jim Miller
f6ab5f9e3e
Add one more check for detecting crashes while inflating multiuser widget
...
Fix bug 7437751
Change-Id: I2e1d94458db9e56e049dae32f088b13a21803217
2012-11-07 16:15:13 -08:00
Jim Miller
4096288022
Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev
2012-11-07 16:05:46 -08:00
Jim Miller
edc74abf8a
Implement fallback clock in keyguard
...
This clock is shown if widgets are ever disabled by DPM and the
default clock package is not enabled.
Fixes bug 7469367
Change-Id: I8cf140c0fc00dd56265e3a332aff2fe3b41e3ec0
2012-11-07 15:58:47 -08:00
Svetoslav Ganov
7ce0c13c0e
Slide unlock cannot get accessibility focus.
...
1. There are two overlaid views, one is the GlowPadView and the
other is the SlidingChallengeLayout. Since the GlowPadView is
on top of the other view it has to consume the hover events or
they will be dispatched to the view behind it which results
the the GlowPadView not getting accessibility focus.
bug:7496770
Change-Id: Iae3b1777e490c56e33560a016fc04a92226bfb66
2012-11-07 15:55:02 -08:00
Ben Pietrzak
6b1d912b25
Catch exception of nonfound activities
...
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
2012-11-07 15:07:18 -08:00
John Spurlock
9a962d7c7d
am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
...
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
Fix regression in camera transition.
2012-11-07 15:06:45 -08:00
Michael Jurka
e4cc20d114
am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
...
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-07 15:06:41 -08:00
Jim Miller
449f48ff3b
am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
...
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:06:37 -08:00
Jim Miller
d3bd6eb8b2
am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
...
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-07 15:06:33 -08:00
Svetoslav Ganov
63121bd6c1
am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
2012-11-07 15:06:29 -08:00
Mike Cleron
fe583a7024
am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
...
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
2012-11-07 15:06:26 -08:00
Romain Guy
39fe96c7b8
am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328 " into jb-mr1-dev
...
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
2012-11-07 15:06:22 -08:00
Michael Jurka
fd8c388f02
Merge "Fix bug where newly added widget wasn't always shown" into jb-mr1-lockscreen-dev
2012-11-07 15:02:08 -08:00
Adam Cohen
3e66286f7c
Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev
2012-11-07 14:44:12 -08:00
Adam Cohen
f988bdfbae
Fixing up glowpad scaling issues (issue 7494378)
...
Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
2012-11-07 14:43:33 -08:00
Jean-Baptiste Queru
476fceaba3
Merge 5418dd92
...
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
2012-11-07 14:41:18 -08:00
Michael Jurka
1413889565
Fix bug where newly added widget wasn't always shown
...
Bug: 7491900
Change-Id: I878eea745ee6127b757aa945631c1a4eb08d9936
2012-11-07 14:22:26 -08:00
Sascha Prueter
61026ab15d
am eb3aa44c: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
...
* commit 'eb3aa44c10b155f917e8840d55b5bc1de3712ba9':
Final icon for notifications panel
2012-11-07 14:15:51 -08:00
Adam Powell
c717d110ae
Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev
2012-11-07 14:14:24 -08:00
Sascha Prueter
de974f6f20
am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev
...
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
Final icon for notifications panel
2012-11-07 14:12:40 -08:00