summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge "docs: add developer guide cross-references, Project ACRE, Round 2" ↵Joe Fernandez2011-10-1414-13/+104
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | | | | | docs: add developer guide cross-references, Project ACRE, Round 2Joe Fernandez2011-10-1414-13/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I39a534ae3a2a34b4dabc333a09961012ef911d3e
* | | | | | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53af9dda1856406a193e3def554e576553d9e868
| * \ \ \ \ \ \ \ \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption ↵Christopher Tate2011-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | password for adb backup/restore" into ics-mr0 * commit '8f4e49a8fe4f568b2be090768f3297655ecd6d34': DO NOT MERGE - Require device encryption password for adb backup/restore
| * | | | | | | | | | | | Merge "DO NOT MERGE - Require device encryption password for adb ↵Christopher Tate2011-10-145-7/+171
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backup/restore" into ics-mr0
| | * | | | | | | | | | | | DO NOT MERGE - Require device encryption password for adb backup/restoreChristopher Tate2011-10-135-7/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | am 00005385: Merge "Use ringer assets for notification volume since the two ↵Amith Yamasani2011-10-141-44/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | volumes are tied." into ics-mr0 * commit '000053859290d322625dfcbdb0467fc34d5e55f4': Use ringer assets for notification volume since the two volumes are tied.
| * | | | | | | | | | | | | Merge "Use ringer assets for notification volume since the two volumes are ↵Amith Yamasani2011-10-141-44/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tied." into ics-mr0
| | * | | | | | | | | | | | | Use ringer assets for notification volume since the two volumes are tied.Amith Yamasani2011-10-121-44/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only for voice capable devices, as tablets will still have notification volume be a first-class citizen and doesn't make sense to show a phone icon for notification volume. Bug: 5431744 Change-Id: I28eed3ebc4cda173986c2f15e137e81641ee0a7c
* | | | | | | | | | | | | | | am 33210ec1: Merge "change android beam sample name" into ics-mr0Scott Main2011-10-142-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '33210ec1f5c8364c4865c718f4d0de00e28b5774': change android beam sample name
| * | | | | | | | | | | | | | Merge "change android beam sample name" into ics-mr0Scott Main2011-10-142-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | change android beam sample nameScott Main2011-10-142-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic3c1d6d75d06a4de55824e69fa9d4d9564bfdb95
* | | | | | | | | | | | | | | | am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility ↵Jim Miller2011-10-143-19/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | management in lock screen" into ics-mr0 * commit '1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f': Fix 5358124: Better transport control visibility management in lock screen
| * | | | | | | | | | | | | | | Merge "Fix 5358124: Better transport control visibility management in lock ↵Jim Miller2011-10-143-19/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen" into ics-mr0
| | * | | | | | | | | | | | | | | Fix 5358124: Better transport control visibility management in lock screenJim Miller2011-10-133-19/+123
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes TransportControlView to be "sticky" on lockscreen. Basically, once it appears on lockscreen, it stays there until unlocked and then locked again in paused state. Tested basic design goals (using Music2): - play then lock -> shows - pause then lock -> not shown - toggle pause to play while locked and not shown -> shows - pause after played once while locked -> stays until we unlock and lock again while paused - remote control play while paused & sleeping -> resume lockscreen -> shows Also tested: - configuration changes (orientation) to ensure widget continues to show after it once appears - remote events while lock screen on -> keeps lockscreen on. - remote events while sleeping -> doesn't wake. Change-Id: I23418c5f7dfd1457c0844d2683772e8a3ed0abd1
* | | | | | | | | | | | | | | | am ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ↵Daniel Sandler2011-10-142-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr0 * commit 'ed37b1bf73ae274da6e50194c824a669fcecb5c0': Shrink the ticker's icon to match the status bar.
| * | | | | | | | | | | | | | | Merge "Shrink the ticker's icon to match the status bar." into ics-mr0Daniel Sandler2011-10-142-7/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Shrink the ticker's icon to match the status bar.Daniel Sandler2011-10-142-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5108533 Change-Id: Iff28aaefe068feb50a636fc1456c5a31d7bdb46e
* | | | | | | | | | | | | | | | am 43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0Peter Ng2011-10-1412-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '43642ab9322b90613c496785ae459b64bf9aea4a': Stat icons for phone are now the right size
| * | | | | | | | | | | | | | | Merge "Stat icons for phone are now the right size" into ics-mr0Peter Ng2011-10-1412-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Stat icons for phone are now the right sizePeter Ng2011-10-1312-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5401987 Change-Id: I16fa782b2be8556b7a7b447cb27ece21d902a403
* | | | | | | | | | | | | | | | | am d82cc1de: Merge "Fixup JNI" into ics-mr0John Reck2011-10-141-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75': Fixup JNI
| * | | | | | | | | | | | | | | | Merge "Fixup JNI" into ics-mr0John Reck2011-10-141-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fixup JNIJohn Reck2011-10-131-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5459736 Change-Id: Iefb5daaf52eb56f2a4c3aaeedc977a16a1cfa086
* | | | | | | | | | | | | | | | | am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect ↵Jean-Michel Trivi2011-10-141-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error state" into ics-mr0 * commit '9ad680ca2be19679c355de9526d79ded2887ea97': Fix 5380695 Lockscreen transport control must reflect error state
| * | | | | | | | | | | | | | | | Merge "Fix 5380695 Lockscreen transport control must reflect error state" ↵Jean-Michel Trivi2011-10-141-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | | | | | | | | | | | | Fix 5380695 Lockscreen transport control must reflect error stateJean-Michel Trivi2011-10-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | am b9c9cf65: Merge "Fix 5367082 correct assets for "next" and "previous" in ↵Jean-Michel Trivi2011-10-147-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lockscreen" into ics-mr0 * commit 'b9c9cf65308ed66ef825ecb485385d2b94e40f2c': Fix 5367082 correct assets for "next" and "previous" in lockscreen
| * | | | | | | | | | | | | | | | | Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" ↵Jean-Michel Trivi2011-10-147-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0
| | * | | | | | | | | | | | | | | | | Fix 5367082 correct assets for "next" and "previous" in lockscreenJean-Michel Trivi2011-10-137-2/+2
| | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues found in the bug: 1/ The lockscreen layout for the transport controls was referring to the wrong framework icon: "previous" instead of "rew", and "next" instead of "ff". 2/ The framework icons for "previous" and "next" were wrong: "|<" should be "|<<" and ">|" should be ">>|". Copied the correct assets from the UX repository: btn_playback_ff_normal_holo_dark.png copied to ic_media_next.png btn_playback_rew_normal_holo_dark.png copied to ic_media_previous.png Note that those assets do NOT exist for ldpi Change-Id: I9c92d468a984f47f8e8f8c23e00f85a3d03da2ba
* | | | | | | | | | | | | | | | | | am e48440d5: Merge "Fix 5153611 remove remote control client/display log ↵Jean-Michel Trivi2011-10-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from AudioService" into ics-mr0 * commit 'e48440d59a52c0f13166da2fd32023356d9215d9': Fix 5153611 remove remote control client/display log from AudioService
| * | | | | | | | | | | | | | | | Merge "Fix 5153611 remove remote control client/display log from ↵Jean-Michel Trivi2011-10-141-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioService" into ics-mr0
| | * | | | | | | | | | | | | | | Fix 5153611 remove remote control client/display log from AudioServiceJean-Michel Trivi2011-10-131-2/+1
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not log debug messages for the RemoteControlClient and IRemoteControlDisplay related features. Change-Id: I81bfeec1770f81b78b679dc03fb40806393b170a
* | | | | | | | | | | | | | | | Merge "Allow setting of source bounds on global search intents."Mathew Inwood2011-10-141-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Allow setting of source bounds on global search intents.Mathew Inwood2011-10-141-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to allow the launcher to include the source bounds of the search affordance on the homescreen when launching the global search app. Bug: 5235747 Change-Id: I7af1a651d593b6d946aa2fe42d900a9c4470b4e2
* | | | | | | | | | | | | | | | | am 23b80f08: Merge "docs: add new screenshots for hc gallery sample" into ↵Scott Main2011-10-142-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr0 * commit '23b80f083b0a2ccd26f37298d4f9611de3857a31': docs: add new screenshots for hc gallery sample
| * | | | | | | | | | | | | | | | Merge "docs: add new screenshots for hc gallery sample" into ics-mr0Scott Main2011-10-142-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | docs: add new screenshots for hc gallery sampleScott Main2011-10-142-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5aa0a76f6ed5e442acd80036dc10067fcc85199
* | | | | | | | | | | | | | | | | | am 6b1531ee: Merge "docs: preliminary homepage announcement (offline ↵Scott Main2011-10-142-10/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version)" into ics-mr0 * commit '6b1531eec06abebb0c786556e12411fbef5a0f62': docs: preliminary homepage announcement (offline version)
| * | | | | | | | | | | | | | | | | Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0Scott Main2011-10-142-10/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | docs: preliminary homepage announcement (offline version)Scott Main2011-10-142-10/+6
| | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f3c14077d22437df888fe95e7be991a5a403f16
* | | | | | | | | | | | | | | | | am e1e9e937: docs: revisions to ics api overviewScott Main2011-10-142-556/+759
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1e9e9379dc1236e15bd379f2bdc871c096a882c': docs: revisions to ics api overview
| * | | | | | | | | | | | | | | | docs: revisions to ics api overviewScott Main2011-10-142-556/+759
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife97666c8ab3922e915d38ae475a3426d4e778ac
* | | | | | | | | | | | | | | | am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 ↵Steven Ross2011-10-131-21/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 5446341" into ics-mr0 * commit '3406886939b0f28c426acefbe9dc77292210d8b4': Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341
| * | | | | | | | | | | | | | | Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes ↵Steven Ross2011-10-131-21/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5446341" into ics-mr0
| | * | | | | | | | | | | | | | | Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341Steven Ross2011-10-131-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | am 2ce6882b: Fixed problem where Face Unlock area was showingBrian Colonna2011-10-131-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | * commit '2ce6882bb498c93af114626daa79cfa4f3f4e366': Fixed problem where Face Unlock area was showing
| * | | | | | | | | | | | | | | Fixed problem where Face Unlock area was showingBrian Colonna2011-10-131-2/+8
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | am 3505abf3: Merge "Fix 5451144: Poking wakelock upon fallback" into ics-mr0Brian Colonna2011-10-131-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3505abf31df8dafab2c83ceb8f85b5694cac3b78': Fix 5451144: Poking wakelock upon fallback
generated by cgit v1.1 at 2025-01-19 19:03:26 +0000