drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,021 Commits 1 Branch 0 Tags
Commit Graph

60021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Winson Chung
c57ccf01fe Showing notifications after taking a screenshot (Bug: 5333706) 
- Fixing issue where ticker and swipe-to-remove wasn't working for updated notifications

Change-Id: Ib8ef07778a11028c9c2627830ee1dd4561d2ae3b
 2011-10-13 18:26:28 -07:00
Brian Colonna
bc82c349f1 am 3505abf3: Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0 
* commit '3505abf31df8dafab2c83ceb8f85b5694cac3b78':
  Fix 5451144: Poking wakelock upon fallback
 2011-10-13 18:21:50 -07: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
d54bcad4bb am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 
* commit '8a058cbf12c590db810fe8d9fab6f4f614909329':
  In releaseWifiLockLocked call noteReleaseWifiLock.
 2011-10-13 17:42:58 -07:00
Wink Saville
8a058cbf12 Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0 2011-10-13 17:40:01 -07:00
Christopher Tate
b9c1acfb0b DO NOT MERGE - Require device encryption password for adb backup/restore 
This supersedes any backup-password that the user might supply.  Per
design, the device encryption password is also always used to encrypt
the backup archive.

The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.

Bug 5382487

Change-Id: I278737927a4ecbb765bfb5ecfd28a4cb8dae52ef
 2011-10-13 17:39:48 -07:00
Kenny Root
bc883f4cf4 am 22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0 
* commit '22dad40d3e8ce54a00f337ea06b9b0bbfbd3fd6b':
  Add support for signature in getPackageArchiveInfo
 2011-10-13 17:12:35 -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
ec2d58a0b9 am dcb4e158: (-s ours) Merge "Do Not Merge darker notification press state and divider" into ics-mr0 
* commit 'dcb4e158bcddb8266afaf863ae8832b92bed62a7':
  Do Not Merge darker notification press state and divider
 2011-10-13 16:58:03 -07:00
The Android Automerger
6c65e8b62b merge in ics-mr0-release history after reset to ics-mr0 2011-10-13 16:57:44 -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
Gilles Debunne
19f4b66ddc Merge "Bug 5228934: added a flag to disable the display of the soft input on focus" 2011-10-13 16:54:23 -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
Gilles Debunne
9d8d3f1539 Spell checher's language synced with keyboard. 
Bug 5379440. The spell check is now using the IME's language to
do the spell checking. Changing the input language triggers a
new spell check of the entire text.

Optimizations: ArrowKeyMovementMethod re-uses the TextView's
wordIterator, already set to the correct language.

One wordIterator shared by all SpellParsers in SpellChecker.
Cannot re-use TextView's because of concurrency issues.

With the current implementation, one has to type a new character
to see the new spell checking take place.

Change-Id: I0e460c0a6777548f89d03d6b68f3deea6606c17f
 2011-10-13 16:52:42 -07:00
Martijn Coenen
d44d276f41 am 19fa262c: Merge "Send ACTION_USER_PRESENT when provisioning is completed." into ics-mr0 
* commit '19fa262c52ddaf0e5ec200f4f7f21bda0d4b617b':
  Send ACTION_USER_PRESENT when provisioning is completed.
 2011-10-13 16:48:58 -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
d09289ed80 am 97e9ea98: Merge "Fix bug with CLEAR_TASK -- wouldn\'t clear the top activity." into ics-mr0 
* commit '97e9ea98afac197722d7620d5fd09a8c06aafe3a':
  Fix bug with CLEAR_TASK -- wouldn't clear the top activity.
 2011-10-13 16:45:56 -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
4194f15e16 am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 
* commit 'e6063299d874cc3b9d1fa71d0c3772c6ebe62e06':
  Add hidden API for pre-authorizing URIs.
 2011-10-13 16:34:17 -07:00
Dave Santoro
e6063299d8 Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 2011-10-13 16:32:17 -07:00
Bart Sears
0272df8506 am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 
* commit 'bcfe41529b7bd9f572a2eff31375dc9fdf35b518':
  Improve JavaDoc for WebView.loadData()
 2011-10-13 16:27:16 -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
ee12e44b77 am 6252a8b1: Merge "Fix 5386408: Send accessibility event when a recent app is removed." into ics-mr0 
* commit '6252a8b1167934d53fd76d5f0910d993390636ce':
  Fix 5386408: Send  accessibility event when a recent app is removed.
 2011-10-13 16:23:28 -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
fb99c53308 am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0 
* commit '50b15348c5b61472b5ed02434968b5a035765b63':
  Bug 5312828 - Menu button not responding
 2011-10-13 16:15:17 -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
3fda6ed3c7 am 43b57ec4: Fix error printing if no command string is set. 
* commit '43b57ec48ec7652addc11bbc9fef652c2394b7f5':
  Fix error printing if no command string is set.
 2011-10-13 16:13:07 -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
bb290c891e am 846601a1: Merge "Revert "Updated volume rocker assets for ring notification icon"" into ics-mr0 
* commit '846601a1627a3be8f87601c13b87a22a6dbfafb4':
  Revert "Updated volume rocker assets for ring notification icon"
 2011-10-13 15:25:17 -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
0dc9937d4d am 210ccb81: Merge "Updated wifi in range status bar notification icon" into ics-mr0 
* commit '210ccb8110be9297acc94975d97156ee8ee2d61b':
  Updated wifi in range status bar notification icon
 2011-10-13 15:20:04 -07:00
Justin Ho
695d9b0a00 am b5e8a295: Merge "Updated volume rocker assets for ring notification icon" into ics-mr0 
* commit 'b5e8a2955a45ab9f5409a8227b96d75d01cdfa5d':
  Updated volume rocker assets for ring notification icon
 2011-10-13 15:20:02 -07:00
Justin Ho
c08e682d71 am 96ae383d: Merge "Updated speakerphone asset" into ics-mr0 
* commit '96ae383d9efbae8eb6a28d194de20ba03cb610e8':
  Updated speakerphone asset
 2011-10-13 15:20:01 -07:00
Justin Ho
d54b59e8a0 am 41f45e49: Merge "Updated stat_sys wifi icons" into ics-mr0 
* commit '41f45e4969565d21f7d49b2b1cf828e27af73efa':
  Updated stat_sys wifi icons
 2011-10-13 15:19:59 -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
496e809458 am 86e12a82: Merge "Updated Systembar back and highlight assets Bug: 5411737" into ics-mr0 
* commit '86e12a82d2c25b04cbd2b51fb50b900b459593cd':
  Updated Systembar back and highlight assets Bug: 5411737
 2011-10-13 15:17:26 -07:00
Justin Ho
7c64cc76b6 am caea6473: Merge "Updated cut actionbar icon" into ics-mr0 
* commit 'caea6473b46618040c8a8e611618e2c39d3506bf':
  Updated cut actionbar icon
 2011-10-13 15:17:25 -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