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

59850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
13bffb3743 Reconcile with ics-mr0-release 
Change-Id: I53af9dda1856406a193e3def554e576553d9e868
 2011-10-14 10:52:17 -07:00
Christopher Tate
78bb1ebb93 am 8f4e49a8: (-s ours) Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 
* commit '8f4e49a8fe4f568b2be090768f3297655ecd6d34':
  DO NOT MERGE - Require device encryption password for adb backup/restore
 2011-10-14 10:35:40 -07:00
Amith Yamasani
96307ff948 am 00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 
* commit '000053859290d322625dfcbdb0467fc34d5e55f4':
  Use ringer assets for notification volume since the two volumes are tied.
 2011-10-14 10:33:29 -07:00
Christopher Tate
8f4e49a8fe Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0 2011-10-14 10:33:13 -07:00
Scott Main
a123d53e35 am 33210ec1: Merge "change android beam sample name" into ics-mr0 
* commit '33210ec1f5c8364c4865c718f4d0de00e28b5774':
  change android beam sample name
 2011-10-14 10:31:24 -07:00
Amith Yamasani
0000538592 Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0 2011-10-14 10:30:43 -07:00
Scott Main
33210ec1f5 Merge "change android beam sample name" into ics-mr0 2011-10-14 10:29:53 -07:00
Jim Miller
66d19b85b3 am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 
* commit '1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f':
  Fix 5358124: Better transport control visibility management in lock screen
 2011-10-14 10:20:48 -07:00
Jim Miller
1a59c7e397 Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0 2011-10-14 10:19:13 -07:00
Daniel Sandler
a75e68a2f0 am ed37b1bf: Merge "Shrink the ticker\'s icon to match the status bar." into ics-mr0 
* commit 'ed37b1bf73ae274da6e50194c824a669fcecb5c0':
  Shrink the ticker's icon to match the status bar.
 2011-10-14 10:18:33 -07:00
Peter Ng
ab5189c2c0 am 43642ab9: Merge "Stat icons for phone are now the right size" into ics-mr0 
* commit '43642ab9322b90613c496785ae459b64bf9aea4a':
  Stat icons for phone are now the right size
 2011-10-14 10:16:30 -07:00
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
61d3449d1a am d82cc1de: Merge "Fixup JNI" into ics-mr0 
* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
  Fixup JNI
 2011-10-14 10:12:14 -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
76842baa0f am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0 
* commit '9ad680ca2be19679c355de9526d79ded2887ea97':
  Fix 5380695 Lockscreen transport control must reflect error state
 2011-10-14 09:02:49 -07: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
69fe4e0b04 am b9c9cf65: Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0 
* commit 'b9c9cf65308ed66ef825ecb485385d2b94e40f2c':
  Fix 5367082 correct assets for "next" and "previous" in lockscreen
 2011-10-14 08:46:09 -07:00
Jean-Michel Trivi
414b74c564 am e48440d5: Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0 
* commit 'e48440d59a52c0f13166da2fd32023356d9215d9':
  Fix 5153611 remove remote control client/display log from AudioService
 2011-10-14 08:46: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
Mathew Inwood
772158a596 Merge "Allow setting of source bounds on global search intents." 2011-10-14 06:35:26 -07:00
Mathew Inwood
050453eaf5 Allow setting of source bounds on global search intents. 
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
 2011-10-14 14:11:52 +01:00
Scott Main
7fc908f038 am 23b80f08: Merge "docs: add new screenshots for hc gallery sample" into ics-mr0 
* commit '23b80f083b0a2ccd26f37298d4f9611de3857a31':
  docs: add new screenshots for hc gallery sample
 2011-10-14 05:01:56 -07:00
Scott Main
61c904fce1 am 6b1531ee: Merge "docs: preliminary homepage announcement (offline version)" into ics-mr0 
* commit '6b1531eec06abebb0c786556e12411fbef5a0f62':
  docs: preliminary homepage announcement (offline version)
 2011-10-14 04:28:05 -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
0222fcc9e1 am e1e9e937: docs: revisions to ics api overview 
* commit 'e1e9e9379dc1236e15bd379f2bdc871c096a882c':
  docs: revisions to ics api overview
 2011-10-14 03:49:33 -07:00
Scott Main
e1e9e9379d docs: revisions to ics api overview 
Change-Id: Ife97666c8ab3922e915d38ae475a3426d4e778ac
 2011-10-14 03:32:06 -07:00
Scott Main
49eb519696 change android beam sample name 
Change-Id: Ic3c1d6d75d06a4de55824e69fa9d4d9564bfdb95
 2011-10-14 01:24:57 -07:00
Jim Miller
4e6d35829e Fix 5358124: Better transport control visibility management in lock screen 
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
 2011-10-13 23:55:21 -07:00
Steven Ross
2a3cda648f am 34068869: Merge "Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341" into ics-mr0 
* commit '3406886939b0f28c426acefbe9dc77292210d8b4':
  Making FaceUnlock not pop up for overlays Fixes 5451837 Fixes 5446341
 2011-10-13 21:04:15 -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
04169673b5 am 2ce6882b: Fixed problem where Face Unlock area was showing 
* commit '2ce6882bb498c93af114626daa79cfa4f3f4e366':
  Fixed problem where Face Unlock area was showing
 2011-10-13 20:03:55 -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
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