Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,723 Commits 3 Branches 0 Tags
3c2bbc2406e491b11e16b9f8bb0495d433097d52
Commit Graph

25956 Commits

Author SHA1 Message Date
Justin Ho
3c2bbc2406 Merge "Update share pack assets" into ics-mr0 2011-10-14 14:35:54 -07:00
Justin Ho
686420a40e Merge "Update rating star buttons" into ics-mr0 2011-10-14 14:26:58 -07:00
Justin Ho
cd8f69dd84 Merge "Update unlock halo asset" into ics-mr0 2011-10-14 14:23:41 -07:00
Justin Ho
269c64de88 Merge "Update lockscreen assets" into ics-mr0 2011-10-14 14:17:26 -07:00
Justin Ho
669b9af618 Update unlock halo asset 
Change-Id: I99ec31894566df272041b001590db799d7f9adfd
 2011-10-14 14:17:00 -07:00
Justin Ho
cc1bf4ad39 Update share pack assets 
Change-Id: Ia568911c32839ede9d58544e708f7949cbf6be45
 2011-10-14 14:14:55 -07:00
Justin Ho
41c5a60749 Merge "Update bullet permission asset" into ics-mr0 2011-10-14 14:12:02 -07: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
e95aaf06fb Merge "Update indicator_code lock assets" into ics-mr0 2011-10-14 13:58:52 -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
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
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
Martijn Coenen
202b38cb71 Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0 2011-10-14 12:57:34 -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
83e160d3b3 Fix build. 
Change-Id: Ifd5fe7933065f555f50ea91c4c301f87ca09dcdc
 2011-10-14 11:06:33 -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
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
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
43642ab932 Merge "Stat icons for phone are now the right size" into ics-mr0 2011-10-14 10:15:08 -07:00
John Reck
d82cc1de84 Merge "Fixup JNI" into ics-mr0 2011-10-14 10:10:07 -07:00
Martijn Coenen
2ec83936a1 Remove NfcFragment from activity when no longer sharing. 
This fixes scenarios where the same activity sets, unsets
and re-sets an NdefMessage and/or callback.

Bug: 5454848
Change-Id: I5ed98047b9cfe90d2f48656d978f2d08bb4bf0cc
 2011-10-14 10:01:25 -07:00
satok
75e126f2df Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed. 
Bug: 5460262

Change-Id: I4ca71020a6d4b7057f60ca99944c479775cca8b7
 2011-10-15 01:24:44 +09: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
b9c9cf6530 Merge "Fix 5367082 correct assets for "next" and "previous" in lockscreen" into ics-mr0 2011-10-14 08:44:50 -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
John Reck
b61bfed7b1 Fixup JNI 
Bug: 5459736

Change-Id: Iefb5daaf52eb56f2a4c3aaeedc977a16a1cfa086
 2011-10-13 19:07:50 -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
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
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
Dave Santoro
e6063299d8 Merge "Add hidden API for pre-authorizing URIs." into ics-mr0 2011-10-13 16:32:17 -07:00
Bart Sears
bcfe41529b Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0 2011-10-13 16:25:29 -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
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 56505a6e79
 2011-10-13 15:22:53 -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