Justin Ho
64ba25de51
Merge "Update fastscroll" into ics-mr0
2011-10-14 13:52:57 -07:00
Justin Ho
3cc6f5b447
Merge "Update checkboxes" into ics-mr0
2011-10-14 13:52:45 -07:00
Justin Ho
6ea22dc452
Update rating star buttons
...
Change-Id: I293315b48ff32fb82af16db4663a2088398bc045
2011-10-14 13:52:12 -07:00
Justin Ho
3b89e3a51f
Merge "Updating rating stars" into ics-mr0
2011-10-14 13:51:25 -07:00
Justin Ho
ace5c63783
Update text select handles
...
Change-Id: I05948268e9f8c640e3bd674119c44d9c75d6b242
2011-10-14 13:50:59 -07:00
Justin Ho
facd7aa0e1
Updated codelock assets
...
Change-Id: Ie0f217240acfad11830725f26ff77898e8b2aaa6
2011-10-14 13:48:48 -07:00
Justin Ho
e0f81d3b89
Update indicator_code lock assets
...
Change-Id: I58d66b107c0f7e8a96a43c98d9728801bc404bee
2011-10-14 13:46:40 -07:00
Jim Miller
ef0e259d59
Fix 5458658: Fix memory leak in lock screen
...
This fixes a memory leak caused by not unregistering the info callback
held when LockPatternKeyguardView gets destroyed.
Change-Id: I8c008b6f8a5e8471bd0e1fd3939aa75175923ce5
2011-10-14 13:46:19 -07:00
Justin Ho
26ee8f9994
Updated scrubber_control assets
...
Change-Id: I33e71b89f53550ff6626c18d6464972a0e4a30db
2011-10-14 13:42:26 -07:00
Jack Palevich
f7915ce89c
Merge "Work around race condition when shutting down a surface flinger surface."
2011-10-14 13:35:10 -07:00
Justin Ho
fae7c8375f
Update spinners
...
Change-Id: Ie15c7005605b87c03540e7e7c3094cc96e4cc8cc
2011-10-14 13:31:17 -07:00
Justin Ho
c782ab1c9d
Update fastscroll
...
Change-Id: I91eab04d1b9b43b0dc92d7ad7b9648f58ae8487e
2011-10-14 13:30:04 -07:00
Justin Ho
9f6ff52eda
Update checkboxes
...
Change-Id: Ia4a8fc2841ebe135f7c95e89590cdde3f1356c10
2011-10-14 13:28:26 -07:00
Justin Ho
7c79236867
Updating rating stars
...
Change-Id: I5245b3733128e2f533c67e451079e2fd69422738
2011-10-14 13:26:52 -07:00
Uriel Rodriguez
fd2ed6910f
going directly to backup after face unlock fails 15 times
...
- after 15 failed face unlock attempts, go to backup until the backup method is successful
- if the backup method times out (because too many unsuccessful unlocking attempts),
face unlock will not be launched until the backup method is used sucessfully
- fixes 5365919
Change-Id: I9aef7a4f1abcceefc5d6f1c0458ae5cbe8a902df
2011-10-14 16:25:42 -04:00
Justin Ho
3776a28ad8
Updating numberpicker assets
...
Change-Id: I4e34edd1a6ea89d8eecf8819ebf1b86449563ebc
2011-10-14 13:14:48 -07:00
Martijn Coenen
fafc43b349
am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
...
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
Remove NfcFragment from activity when no longer sharing.
2011-10-14 13:00:45 -07:00
Eric Laurent
e04783ccde
am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0
...
* commit '615858a8ebb12b3541fd709e6e965ac814880261':
Indicate screen off condition to audio framework.
2011-10-14 12:58:40 -07:00
Jamie Gennis
93c299d0d0
am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0
...
* commit 'a1e273ae590ee08cf27baca7facfce51e598d995':
Surface: fix a protected buffer test
2011-10-14 12:58:37 -07:00
Brian Colonna
46f335a494
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-14 12:58:06 -07:00
Martijn Coenen
202b38cb71
Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
2011-10-14 12:57:34 -07:00
Eric Laurent
615858a8eb
Merge "Indicate screen off condition to audio framework." into ics-mr0
2011-10-14 12:56:52 -07:00
Jamie Gennis
a1e273ae59
Merge "Surface: fix a protected buffer test" into ics-mr0
2011-10-14 12:56:28 -07:00
Peter Ng
2d136a83a0
Layout changes to recents
...
Bug: 5411813
-gravity is set to center
-textsize is smaller
-app icon placement now hangs off the screenshot
-recents callout line now defined in colors
-recents thumbnail normal state drawable added
Change-Id: Ibeaec7e3f0a3bcdbe3f990886b1536cb7d7fdc03
2011-10-14 12:37:42 -07:00
Daniel Sandler
9a990c7990
am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0
...
* commit '7362e0d8fe6bd6739dbd22c2ad4c2c7fb0f7c1d4':
Adjust text sizes for better behavior under user scaling.
2011-10-14 12:24:40 -07:00
Daniel Sandler
7362e0d8fe
Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0
2011-10-14 12:22:07 -07:00
Scott Main
cf774c34bb
am c02c33e5: Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0
...
* commit 'c02c33e5bb13cc2a740d01ba979cce20adcd8128':
docs: misc changes to overview and add known issues link to sdk tools notes
2011-10-14 12:15:05 -07:00
Scott Main
c02c33e5bb
Merge "docs: misc changes to overview and add known issues link to sdk tools notes" into ics-mr0
2011-10-14 12:12:53 -07:00
Scott Main
e09743279f
docs: misc changes to overview and add known issues link to sdk tools notes
...
Change-Id: Ia1c6b7947eb861c5bf32107c3efed3279e890b8e
2011-10-14 12:11:38 -07:00
Eric Laurent
950e8cb40a
Indicate screen off condition to audio framework.
...
Add a mechanism for AudioService to notify audio framework and audio HAL
that screen is turned on or off. This indication can be used by lower
audio layers to trigger low power audio playback mode.
Current implementaiton based on setParameters() method is experimental
and will be replaced by a different interface when ready.
Change-Id: Ie72ada0a8edec3d71b47681b9f51cb5bc839d45b
2011-10-14 11:40:24 -07:00
satok
69db986cf0
am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0
...
* commit 'e6fee18d16a86c266afef48f7705268435a99111':
Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
2011-10-14 11:16:57 -07:00
satok
e6fee18d16
Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed." into ics-mr0
2011-10-14 11:15:05 -07:00
Jim Miller
eecd9ac0fb
am 83e160d3: Fix build.
...
* commit '83e160d3b3ad839b0c2faf40f4477a2468098995':
Fix build.
2011-10-14 11:12:41 -07:00
Gilles Debunne
ae245d59b3
Merge "Bug 5420741: exception when rotating device while suggestion popup is visible"
2011-10-14 11:09:59 -07:00
Gilles Debunne
b9e78d96b7
Merge "Spell checher's language synced with keyboard."
2011-10-14 11:09:44 -07:00
Jim Miller
83e160d3b3
Fix build.
...
Change-Id: Ifd5fe7933065f555f50ea91c4c301f87ca09dcdc
2011-10-14 11:06:33 -07:00
Joe Fernandez
5a401ddbc8
am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
...
* commit '471fa9d10b4fa4da070c0ffb5fa5ea1354c8e6b8':
docs: add developer guide cross-references, Project ACRE, Round 2
2011-10-14 10:54:29 -07:00
Joe Fernandez
471fa9d10b
Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
2011-10-14 10:52:33 -07:00
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
Joe Fernandez
558459fe85
docs: add developer guide cross-references, Project ACRE, Round 2
...
Change-Id: I39a534ae3a2a34b4dabc333a09961012ef911d3e
2011-10-14 10:18:33 -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