Daniel Sandler
ed37b1bf73
Merge "Shrink the ticker's icon to match the status bar." into ics-mr0
2011-10-14 10:16:14 -07:00
Peter Ng
43642ab932
Merge "Stat icons for phone are now the right size" into ics-mr0
2011-10-14 10:15:08 -07:00
John Reck
d82cc1de84
Merge "Fixup JNI" into ics-mr0
2011-10-14 10:10:07 -07:00
Daniel Sandler
645e099055
Shrink the ticker's icon to match the status bar.
...
Bug: 5108533
Change-Id: Iff28aaefe068feb50a636fc1456c5a31d7bdb46e
2011-10-14 12:53:42 -04:00
Jean-Michel Trivi
9ad680ca2b
Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
2011-10-14 09:01:08 -07:00
Jean-Michel Trivi
b9c9cf6530
Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0
2011-10-14 08:44:50 -07:00
Jean-Michel Trivi
e48440d59a
Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0
2011-10-14 08:44:15 -07:00
Scott Main
23b80f083b
Merge "docs: add new screenshots for hc gallery sample" into ics-mr0
2011-10-14 04:19:36 -07:00
Scott Main
3b667cca35
docs: add new screenshots for hc gallery sample
...
Change-Id: Id5aa0a76f6ed5e442acd80036dc10067fcc85199
2011-10-14 04:00:44 -07:00
Scott Main
6b1531eec0
Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0
2011-10-14 04:00:03 -07:00
Scott Main
6b28b1aef9
docs: preliminary homepage announcement (offline version)
...
Change-Id: I7f3c14077d22437df888fe95e7be991a5a403f16
2011-10-14 03:58:31 -07:00
Scott Main
e1e9e9379d
docs: revisions to ics api overview
...
Change-Id: Ife97666c8ab3922e915d38ae475a3426d4e778ac
2011-10-14 03:32:06 -07:00
Steven Ross
3406886939
Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0
2011-10-13 21:02:15 -07:00
Brian Colonna
2ce6882bb4
Fixed problem where Face Unlock area was showing
...
I introduced a bug cl https://android-git.corp.google.com/g/#/c/141926
that caused black box to hide lock pattern even when not using Face
Unlock.
Fixed by adding the corresponding check to make sure Face Unlock is
being used.
Change-Id: I9c429c99d7db4d1ab831080f23a1e10123dbfe3e
2011-10-13 22:43:28 -04:00
John Reck
b61bfed7b1
Fixup JNI
...
Bug: 5459736
Change-Id: Iefb5daaf52eb56f2a4c3aaeedc977a16a1cfa086
2011-10-13 19:07:50 -07:00
Steven Ross
7726289c28
Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341
...
When the screen turns on because of an incoming phone call or
when the emergency dialer is selected, FaceUnlock is deactivated
until the phone call is completed and the screen is turned off.
This also checks for non-phone overlays.
If the lockscreen becomes unfocused while the screen is on,
we assume that the reason is an overlay and prevent FaceUnlock
from starting. The normal clock app is not considered an overlay by
this approach, and thus it works as intended (back button
brings up FaceUnlock).
Also reverts: https://android-git.corp.google.com/g/#/c/139885/2
to make FaceUnlock appear when music is playing again
Change-Id: Id715878556667d2b7e35c30a28d91be6a4eee575
2011-10-13 21:41:17 -04:00
Brian Colonna
3505abf31d
Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0
2011-10-13 18:19:30 -07:00
Jean-Michel Trivi
7ff866e8cf
Fix 5153611 remove remote control client/display log from AudioService
...
Do not log debug messages for the RemoteControlClient and
IRemoteControlDisplay related features.
Change-Id: I81bfeec1770f81b78b679dc03fb40806393b170a
2011-10-13 18:09:26 -07:00
Wink Saville
8a058cbf12
Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
2011-10-13 17:40:01 -07:00
Brian Colonna
9eeaaa39c3
Fix 5451144: Poking wakelock upon fallback
...
Now poking the wakelock when Face Unlock goes to the fallback method.
Previously, the backup lock would stay up for a varying amount of
time depending on how long Face Unlock took before fallback. The
backup is now consistently displayed for 5 seconds.
Also added comments to some older code.
Change-Id: I9f6bdd2d3015e7eb9cb90143737a3cdc87189993
2011-10-13 20:11:57 -04:00
Kenny Root
22dad40d3e
Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
2011-10-13 17:10:17 -07:00
Peter Ng
434777eed4
Stat icons for phone are now the right size
...
Bug: 5401987
Change-Id: I16fa782b2be8556b7a7b447cb27ece21d902a403
2011-10-13 17:00:41 -07:00
Peter Ng
dcb4e158bc
Merge "Do Not Merge darker notification press state and divider" into ics-mr0
2011-10-13 16:56:01 -07:00
Wink Saville
ce0ea1f2b9
In releaseWifiLockLocked call noteReleaseWifiLock.
...
Bug: 5452027
Change-Id: I45786a9cfe752f02a9c2e75e5b6f35bc5dfed6ae
2011-10-13 16:55:20 -07:00
Jean-Michel Trivi
261381cf9f
Fix 5380695 Lockscreen transport control must reflect error state
...
When a RemoteControlClient reports an error for its playstate,
make the play/pause button display the warning platform icon.
Note that a specific image description is not available for this
state at this time, but the one being used (the same as for the
play icon) is valid as it correctly describes the action the
button performs.
Change-Id: I59aadab3fe5bcc09a2f7be0b9e4cffb0c500e865
2011-10-13 16:53:08 -07:00
Martijn Coenen
19fa262c52
Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0
2011-10-13 16:47:02 -07:00
Dianne Hackborn
97e9ea98af
Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0
2011-10-13 16:44:26 -07:00
Dave Santoro
e6063299d8
Merge "Add hidden API for pre-authorizing URIs." into ics-mr0
2011-10-13 16:32:17 -07:00
Dianne Hackborn
eabd328dee
Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
...
Maybe this will also fix bug #5144065 as well.
I doubt I am so lucky, though.
Change-Id: I60bf595d3eff79353fdd94b0f2a089e81218bc30
2011-10-13 16:26:49 -07:00
Bart Sears
bcfe41529b
Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
2011-10-13 16:25:29 -07:00
Jim Miller
6252a8b116
Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0
2011-10-13 16:21:51 -07:00
Adam Powell
50b15348c5
Merge "Bug 5312828 - Menu button not responding" into ics-mr0
2011-10-13 16:13:55 -07:00
Jason Sams
43b57ec48e
Fix error printing if no command string is set.
...
Change-Id: I588c0d0a4e1b8f80c967ebfb6aff179a0cac4a36
2011-10-13 16:05:27 -07:00
Peter Ng
453b37f66c
Do Not Merge darker notification press state and divider
...
Bug: 3329721
Change-Id: I77ec70dd75d6e8009fc2f06741520167b7d34a42
2011-10-13 15:59:06 -07:00
Adam Powell
c6d51889c2
Bug 5312828 - Menu button not responding
...
Increase tolerance for apps calling invalidateOptionsMenu at
inconvenient times.
Change-Id: I712b20002afd0f056c3f05b160c5fa9c2ef0b552
2011-10-13 15:51:25 -07:00
Steve Block
33f962b22e
Improve JavaDoc for WebView.loadData()
...
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.
Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
2011-10-13 15:32:13 -07:00
Justin Ho
846601a162
Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0
2011-10-13 15:23:20 -07:00
Justin Ho
d0922340aa
Revert "Updated volume rocker assets for ring notification icon"
...
This reverts commit 56505a6e7983d03b051d451d6120f29ccce8e09e
2011-10-13 15:22:53 -07:00
Justin Ho
210ccb8110
Merge "Updated wifi in range status bar notification icon" into ics-mr0
2011-10-13 15:17:34 -07:00
Justin Ho
b5e8a2955a
Merge "Updated volume rocker assets for ring notification icon" into ics-mr0
2011-10-13 15:17:22 -07:00
Justin Ho
96ae383d9e
Merge "Updated speakerphone asset" into ics-mr0
2011-10-13 15:16:52 -07:00
Justin Ho
41f45e4969
Merge "Updated stat_sys wifi icons" into ics-mr0
2011-10-13 15:16:37 -07:00
Justin Ho
86e12a82d2
Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0
2011-10-13 15:16:11 -07:00
Justin Ho
caea6473b4
Merge "Updated cut actionbar icon" into ics-mr0
2011-10-13 15:15:48 -07:00
Justin Ho
a197abdc52
Updated wifi in range status bar notification icon
...
Change-Id: I5e91d14473908086848db552acec0df90e7104c2
2011-10-13 15:13:44 -07:00
Justin Ho
56505a6e79
Updated volume rocker assets for ring notification icon
...
Change-Id: Ibcdd8e88efaaba9e91a1b6959a83207c747b3195
2011-10-13 15:12:09 -07:00
Justin Ho
874c2c487b
Updated speakerphone asset
...
Change-Id: I5c799853a8ad851670cc58c8b4052859d8363d93
2011-10-13 15:10:41 -07:00
Justin Ho
719aeb5f17
Updated cut actionbar icon
...
Change-Id: Ib523594be8b3923adc21c6bee2ea4522f4fded79
2011-10-13 15:04:03 -07:00
Kenny Root
6ccd41265d
Add support for signature in getPackageArchiveInfo
...
GET_SIGNATURES was indicated as supported, but it never actually did
anything.
This is needed for the package verifier development sample.
Change-Id: I09ca6790cd8bf9435aa208c0711359b4d76fb278
2011-10-13 14:57:31 -07:00
Mike Lockwood
ab9d5b1173
Merge "PowerManagerService: Remove assumption that light sensor will always send a value as soon as it is enabled." into ics-mr0
2011-10-13 13:59:33 -07:00