Joe Malin
faa38a08d5
am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
...
* commit '4422596ddb295f812bb0970ec7f75d3c45d05020':
Notification.java javadoc: addAction
2012-11-13 14:26:44 -08:00
Joe Malin
4422596ddb
am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
...
* commit 'ce37f1da3619dcb4e53ca014cf4a17885cc3af0f':
Notification.java javadoc: addAction
2012-11-13 14:25:09 -08:00
Joe Malin
ce37f1da36
am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
...
* commit '4979a0b59486d737a4d9267af9b38f237705e26f':
Notification.java javadoc: addAction
2012-11-13 14:22:58 -08:00
Joe Malin
4979a0b594
am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
...
* commit '5f32d3375b13e581d3101ed8e928fd6a463f3809':
Notification.java javadoc: addAction
2012-11-13 14:20:54 -08:00
Fabrice Di Meglio
9d82d324de
Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev
2012-11-13 11:03:19 -08:00
Craig Mautner
c10914ca5c
Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
2012-11-13 10:00:04 -08:00
Fabrice Di Meglio
5acc379c54
Fix bug #7457897 Error icons are not shown in credit card entry form
...
- fix regression: the error icon was no more showing is the widget was not focused
Change-Id: I24cc00a0cb79d38e365d413f9820b5a6981de4f4
2012-11-12 14:31:19 -08:00
John Spurlock
f6f47e950d
Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
2012-11-12 07:52:08 -08:00
John Spurlock
43d84518f2
Disable navbar searchlight if search assist not available.
...
Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
2012-11-09 10:27:33 -05:00
Andy McFadden
325be8a1ea
Reduce emulator logspam
...
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug 7436352
Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
2012-11-08 16:40:21 -08:00
Geremy Condra
8b73fc1ad3
am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev
...
* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
DO NOT MERGE Control access to tts objects
2012-11-08 14:26:39 -08:00
Jim Miller
2c29deaa26
am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '6be441c532688762b735ae2a1276195b40bf33b4':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:08:41 -08:00
Jim Miller
4eeb4f664a
Add mechanism to kick keyguard to show the assistant
...
Fixes bug 7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
2012-11-08 00:39:04 -08:00
Satoshi Kataoka
1e29e49cf8
Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
2012-11-07 20:48:01 -08:00
Jeff Brown
74da109102
Support Wifi display devices that rename themselves.
...
Some Wifi display devices like to rename themselves after a
connection completes (or at other times). Make sure to update
the name of the display when we detect that it changed in
our scan results.
This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.
Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.
Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
2012-11-07 18:43:32 -08:00
Joe Malin
8d40d04afa
Notification.java javadoc: addAction
...
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
2012-11-07 12:39:22 -08:00
Daniel Sandler
7b5a92766a
am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev
...
* commit 'afc5210a811da3824d75e32d998370203aba1968':
Fix docs to refer to the correct class.
2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81
Merge "Fix docs to refer to the correct class." into jb-mr1-dev
2012-11-07 12:35:01 -08:00
Romain Guy
fcd7ad4e28
am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774 " into jb-mr1-dev
...
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
2012-11-07 11:18:55 -08:00
Romain Guy
59d73ab6fc
Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774 " into jb-mr1-dev
2012-11-07 11:15:36 -08:00
Jim Miller
259e3121d3
am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets
...
* commit '51117262c8fadb6d227d137e83ad66996b013141':
Handle DevicePolicyManagement and safe mode when inflating widgets
2012-11-07 11:14:14 -08:00
Jim Miller
fe7e94a094
am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-07 11:13:48 -08:00
Adam Cohen
a7af02098a
am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
...
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
Attempted fix for issue 7469415
2012-11-07 11:13:34 -08:00
Daniel Sandler
8768278974
Fix docs to refer to the correct class.
...
Bug: 6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
2012-11-07 14:04:42 -05:00
Satoshi Kataoka
8b117c8578
Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
...
Bug: 7393485
Currently, the extract text view blinks at the transition of InputMethodService.
This change reduces this blinking by making the extract text view invisible when the extract text view is hidden.
Change-Id: I9af96058283a9a5b60707d025ad1abbbbc23c16f
2012-11-07 22:03:55 +09:00
Irfan Sheriff
567a2919f3
Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
2012-11-06 17:39:46 -08:00
Romain Guy
a76f7db323
Respond to ticks when a timezone is set and it doesn't display seconds
...
Bug #7489774
This change also fixes a crash if you programmatically set the time
formats from code before the widget is attached to the window.
Change-Id: I73ead93f5866d9059a4b3823c4304aeca8e419b6
2012-11-06 17:35:23 -08:00
Jim Miller
51117262c8
Handle DevicePolicyManagement and safe mode when inflating widgets
...
Bug 7459120
Bug 7444159
Bug 7444016
Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
2012-11-06 17:04:26 -08:00
Romain Guy
475255bffc
am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
...
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-06 16:18:19 -08:00
Romain Guy
1b3b2544e6
Merge "Dismiss error icon on setError(null) [regression] Bug #7442935 " into jb-mr1-dev
2012-11-06 16:15:27 -08:00
Eino-Ville Talvala
688d98fe21
am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
...
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
Camera: Document new video snapshot picture size behavior.
2012-11-06 16:10:52 -08:00
Eino-Ville Talvala
4a1b6e4242
Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
2012-11-06 16:06:01 -08:00
Romain Guy
d1cc1878cc
Dismiss error icon on setError(null) [regression]
...
Bug #7442935
Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
2012-11-06 16:03:37 -08:00
Irfan Sheriff
511d5346ce
Stop supplicant and dhcp before start
...
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
2012-11-06 15:53:32 -08:00
Jim Miller
088fb915f7
Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
2012-11-06 14:21:12 -08:00
Adam Cohen
0e1608c027
Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev
2012-11-06 13:23:41 -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
Adam Cohen
85a08f1bf2
Attempted fix for issue 7469415
...
Change-Id: Ica81bf4197dc2c4fadd8fa07cb9c895b55b5702b
2012-11-06 11:24:23 -08:00
Jim Miller
bfec0a8616
Add isSafeModeEnabled() API to WindowManagerService
...
This adds a means of determining when the device is in safe mode,
as required by keyguard to disabled some features.
Change-Id: I31d357e6738c92e1837f9e0263e5f3f4de66315a
2012-11-05 20:27:38 -08:00
Amith Yamasani
2c7bc26a74
Authenticate correct user's account when pattern fails multiple times.
...
Bug: 7473142
Provide hidden methods in AccountManager for querying accounts and
authenticating for a specific user. Lockscreen is running in the
system process. Allow only system process to access accounts across
users.
Also make sure to launch the lock settings screen on the just reset
user using startActivityAsUser()
Change-Id: Ifefc0039ba2b51396b8bd0268f36d5271a3d8676
2012-11-05 18:17:40 -08:00
Svetoslav Ganov
0f4d5df5d8
Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev
2012-11-05 17:03:37 -08:00
Mike Cleron
c87f198b8c
Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
2012-11-05 17:03:06 -08:00
Romain Guy
6c642089bc
Merge "Add programmatic access to setters in TextClock Bug #7478328 " into jb-mr1-dev
2012-11-05 16:36:39 -08:00
Romain Guy
a9cfe677ee
Add programmatic access to setters in TextClock
...
Bug #7478328
Add missing annotation to let appwidgets change values programmatically
Change-Id: I6e9b095e93e4e90bd96e127344354c0dfa46cd86
2012-11-05 14:19:21 -08:00
Svetoslav Ganov
72bba58807
TextView not respecting "speak passwords" setting when adding before text to events.
...
1. If the speak passwords settings is on, the accessibility events emitted from a
TextView should contain the text and before text of the source. The settings
shows the users consent to put the source's text in the event. While the code
that populates the current text in the accessibility event respects the
setting, the one that populates the before text does not. As a result the
fact that the user has typed a letter cannot be echoed by an accessibility
service.
bug:7468768
Change-Id: I7580c37936d742f42653315b2591e268a634d22b
2012-11-05 14:02:06 -08:00
Scott Main
7c6863be50
am 44c4bba2: Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
...
* commit '44c4bba2530b430895ef1c72e8ce2712e8ca9f6e':
docs: fix markup error bug: 7456071
2012-11-05 11:38:10 -08:00
Scott Main
44c4bba253
Merge "docs: fix markup error bug: 7456071" into jb-mr1-dev
2012-11-05 11:35:24 -08:00
Scott Main
9cc531cc26
docs: fix markup error
...
bug: 7456071
Change-Id: I3d34a2d6741784d9b33af54afd6d97803720264d
2012-11-05 11:25:17 -08:00
Eino-Ville Talvala
1cab31a45d
Camera: Document new video snapshot picture size behavior.
...
On some devices, video snapshot may return pictures that are smaller
than requested. Make that clear.
Bug: 7475089
Change-Id: I0bd759072a7f954e517f3d09cb676fb23f863912
2012-11-05 10:57:27 -08:00
Adam Cohen
180cfd5feb
If a default keyguard layout isn't specified, fallback to the default layout
...
-> Also fixing a typo in AppWidgetProvider clone() -- this was the cause of
the "couldn't load widget". It wasn't getting expressed before for various
reasons.
Change-Id: Ib7114565a414d66facd8b4baeb97d5a71e96b5e9
2012-11-04 12:05:44 -08:00