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

26200 Commits

Author SHA1 Message Date
Justin Ho
41c5a60749 Merge "Update bullet permission asset" into ics-mr0 2011-10-14 14:12:02 -07:00
Ben Murdoch
817d6d5e8e Check MediaPlayer state, do not teardown() from UI thread. 
The teardown() function should only be called from the native
thread when WebCore is happy for us to release the media player.

When we lose audio focus, simply stop playback. Also be careful
not to check the playing state of the MediaPlayer if we are in
the error state.

Bug: 5461143

Change-Id: Iba03bdad5c39b104b3071129430d7ef2177e9358
 2011-10-14 22:11:26 +01:00
Justin Ho
c2c9816f05 Update lockscreen assets 
Change-Id: I2196c234780caea05532149d2fa5256ad68b7a18
 2011-10-14 14:10:35 -07:00
Justin Ho
57002d2b90 Update bullet permission asset 
Change-Id: I0bc24450d01871f2d83eeea6a45032c521a25b60
 2011-10-14 14:04:19 -07:00
Justin Ho
5d35f10723 am e95aaf06: Merge "Update indicator_code lock assets" into ics-mr0 
* commit 'e95aaf06fba2766521aac24ee252db289ce2e1ef':
  Update indicator_code lock assets
 2011-10-14 14:00:38 -07:00
Justin Ho
e95aaf06fb Merge "Update indicator_code lock assets" into ics-mr0 2011-10-14 13:58:52 -07:00
Justin Ho
9b53cb7bed am 8b319150: Merge "Update text select handles" into ics-mr0 
* commit '8b3191506bf646b9a0568b8e523eb794796b2c20':
  Update text select handles
 2011-10-14 13:58:15 -07:00
Justin Ho
f94011623a am 048e5c80: Merge "Update spinners" into ics-mr0 
* commit '048e5c804ed07249ba59372df384c0977ca9b8df':
  Update spinners
 2011-10-14 13:58:13 -07:00
Justin Ho
9a4b1ff2b7 am 4a6f76da: Merge "Updated scrubber_control assets" into ics-mr0 
* commit '4a6f76da2326c351c6094050761571d229da178d':
  Updated scrubber_control assets
 2011-10-14 13:55:57 -07:00
Justin Ho
fca8dc2332 am 64ba25de: Merge "Update fastscroll" into ics-mr0 
* commit '64ba25de51d0b0b35012acc2a30014e8cb0ede53':
  Update fastscroll
 2011-10-14 13:55:56 -07:00
Justin Ho
c8d0cdac6d am 3cc6f5b4: Merge "Update checkboxes" into ics-mr0 
* commit '3cc6f5b447ae8af9b09568fd0c686a5533e229f9':
  Update checkboxes
 2011-10-14 13:55:54 -07:00
Justin Ho
8b3191506b Merge "Update text select handles" into ics-mr0 2011-10-14 13:55:08 -07:00
Justin Ho
048e5c804e Merge "Update spinners" into ics-mr0 2011-10-14 13:54:58 -07:00
Justin Ho
073d1ffdd9 Update list selector background (disabled state) 
Change-Id: Iee1c9a8d560a180617d840ac5e679eb7182fe39b
 2011-10-14 13:54:32 -07:00
Justin Ho
fc0115fe8e am 3b89e3a5: Merge "Updating rating stars" into ics-mr0 
* commit '3b89e3a51f9d8e763f669dd1be88104ba7c8e9a0':
  Updating rating stars
 2011-10-14 13:53:25 -07:00
Justin Ho
4a6f76da23 Merge "Updated scrubber_control assets" into ics-mr0 2011-10-14 13:53:08 -07:00
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
Justin Ho
26ee8f9994 Updated scrubber_control assets 
Change-Id: I33e71b89f53550ff6626c18d6464972a0e4a30db
 2011-10-14 13:42:26 -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
Martijn Coenen
202b38cb71 Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 2011-10-14 12:57:34 -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
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
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
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
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
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