Matthew Xie
bfd9783556
am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
...
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
2011-11-08 07:00:33 +00:00
Matthew Xie
67f1ceb616
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-07 22:42:00 -08:00
Mathias Agopian
147b601e99
am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
...
* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
Fix rotation displays frame N-1 briefly while rotating
2011-11-08 05:36:46 +00:00
Mathias Agopian
7f1c94e198
Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
2011-11-07 21:33:53 -08:00
Jeff Brown
082b8007fb
Merge "Improve JavaDoc on AtomicFile."
2011-11-07 21:11:36 -08:00
Daniel Sandler
7bfb5b51de
am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
...
* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
Fix scaling on notification panel wifi/battery icons.
2011-11-08 03:50:34 +00:00
Daniel Sandler
c06669a303
Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
2011-11-07 19:47:51 -08:00
Dianne Hackborn
39c0e9f595
am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
...
* commit '84b02130a9b3327343425cd4edfc1b85f1e9b23d':
Update perf tests to always run each test in a fresh process.
2011-11-08 02:51:40 +00:00
Dianne Hackborn
84b02130a9
Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
2011-11-07 18:46:54 -08:00
Jeff Brown
763631cd24
Improve JavaDoc on AtomicFile.
...
Change-Id: I042fa533ea5d4adca8ae6d42dbd8de32adb34cea
2011-11-07 18:03:55 -08:00
Adam Powell
01971d087b
am 13194b16: Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
...
* commit '13194b16d071ce70453a49e9462cfbeb7460d633':
Fix bug 5534414 - Unselected tab states for Holo
2011-11-08 01:59:52 +00:00
Adam Powell
13194b16d0
Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
2011-11-07 17:55:17 -08:00
Adam Powell
d1a956b5f9
Fix bug 5534414 - Unselected tab states for Holo
...
Sync unselected action bar tab states with UX. Unselected states no
longer have an underline.
Leave TabWidget tabs alone; they still keep the underline for
unselected tabs.
Change-Id: I379b94aeabb9472f3b6c859507faea57f2f9b0b6
2011-11-07 17:44:22 -08:00
John Wang
02c45c7a34
am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1
...
* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
Remain in call audio mode while phone is offhook.
2011-11-08 00:50:36 +00:00
John Wang
2f99bb5e4f
Merge "Remain in call audio mode while phone is offhook." into ics-mr1
2011-11-07 16:46:11 -08:00
John Wang
f885e87884
Remain in call audio mode while phone is offhook.
...
While offhook, even the call is on hold, setAudioMode() remains in
MODE_IN_CALL (or MODE_IN_COMMUNICATION for SIP) rather than
switching back to NORMAL.
bug:5546901
Change-Id: I0189dc010d1109895cc38e17b1b80418445d514a
2011-11-07 15:45:18 -08:00
Robert Greenwalt
46bb0a1cf6
am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe
...
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
Make upstream tether list threadsafe
2011-11-07 23:41:20 +00:00
Robert Greenwalt
2d9ccdb4ab
am b445362b: Make upstream tether list threadsafe
...
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
Make upstream tether list threadsafe
2011-11-07 23:36:28 +00:00
John Reck
5bbe5e6ad5
am 669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1
...
* commit '669e1f80a718dc2a4d259970b4e85b3c66e8ebc1':
Remove nativeRecordButtons
2011-11-07 23:25:13 +00:00
John Reck
669e1f80a7
Merge "Remove nativeRecordButtons" into ics-mr1
2011-11-07 15:20:38 -08:00
Andreas Huber
014f69217d
Merge "Use binary search to discover closest sync sample index, replace"
2011-11-07 15:04:56 -08:00
Svetoslav Ganov
e164bab6b8
Merge "NumberPicker does not hide IME when flinged."
2011-11-07 15:03:07 -08:00
Svetoslav Ganov
b52d9729bf
NumberPicker does not hide IME when flinged.
...
Now the IME is hiddedn once the user starts flinging since he is
using another method of updating the current value. This is now
consistent with the case of shown IME and poking the up/down
button.
bug:5174339
Change-Id: Id25934f394314a285b753f0bec7f422034ada90a
2011-11-07 15:02:10 -08:00
Adam Powell
b92a77b562
am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
...
* commit 'b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
Change the "start deferred" fragment API to "user visible hint"
2011-11-07 23:01:48 +00:00
Adam Powell
b1dbf8e605
Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
2011-11-07 14:56:36 -08:00
Dianne Hackborn
6b57b7e4d5
Update perf tests to always run each test in a fresh process.
...
Also some new classes to preload.
Change-Id: Ia2b5f856eaee533b9603b533ebaf8cb55e2ac193
2011-11-07 14:45:49 -08:00
Robert Greenwalt
b445362bd6
Make upstream tether list threadsafe
...
Outsiders asking for this list may cause the list to change on another thread.
Fixing general synchronization issues.
bug:5531630
Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
2011-11-07 14:44:48 -08:00
Peter Ng
a20972ae45
am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1
...
* commit 'e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
Added focused state to quickcontacts shortcut
2011-11-07 22:41:13 +00:00
Peter Ng
e1aacdfe26
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
2011-11-07 14:37:31 -08:00
Justin Ho
3fab14c29e
Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773"
2011-11-07 14:33:35 -08:00
Jim Miller
aa87fd03ff
am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
...
* commit '4d8ecc65c5a747f350492b21397d7466ff628900':
Fix 5231823: PIN/Password polish on lock screen
2011-11-07 22:29:08 +00:00
Jim Miller
4d8ecc65c5
Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
2011-11-07 14:24:43 -08:00
Daniel Sandler
989b9f2100
Fix scaling on notification panel wifi/battery icons.
...
Still needs a redesign.
Bug: 5544770
Change-Id: I27f6ea9f788110d7027b3ea788ca98216fa4fe28
2011-11-07 17:09:57 -05:00
Jeff Brown
5c7d5a4a35
Merge "Fix possible leak in Parcel::writeDupFileDescriptor."
2011-11-07 14:05:22 -08:00
John Reck
99f7b7b7b2
Remove nativeRecordButtons
...
Bug: 5572238
Bug: 5558699
Change-Id: I8e275849f4f04c094a93528dd1fb59683d30e9cc
2011-11-07 14:00:05 -08:00
Peter Ng
d52ec9f3c2
Added focused state to quickcontacts shortcut
...
Bug: 5566627
Change-Id: I559660d71fa571d9201f99dbf76befa8b3276d9e
2011-11-07 13:55:29 -08:00
Adam Powell
78fed9b78f
Change the "start deferred" fragment API to "user visible hint"
...
Allow a fragment to set a hint of whether or not it is currently user
visible. This will be used implicitly to defer the start of fragments
that are not user visible until the loaders for visible fragments have
run. This hint defaults to true.
Change-Id: Id1349d319886a277ef07301f64f7b9e12c8729bf
2011-11-07 13:47:13 -08:00
Peter Ng
6918bca7f8
am a50c859d: Merge "Color balancing framework assets" into ics-mr1
...
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
Color balancing framework assets
2011-11-07 21:44:33 +00:00
Peter Ng
a50c859d3f
Merge "Color balancing framework assets" into ics-mr1
2011-11-07 13:40:45 -08:00
Peter Ng
4f4882ad12
Color balancing framework assets
...
-btns are more opaque
-toggle buttons are now blue
-spinners have better antialiasing
-quick contacts have a thicker divider
-switches are flipped
Bug:5560030
Change-Id: I28f64aa2be6c7f0d8c82e9b7c318aaf2bfd98ea7
2011-11-07 13:16:36 -08:00
Justin Ho
1cd8ca39d9
Merge: Correctly updating Roboto HHEA table to master
...
Bug: 5516773
The last change regressed a few glyphs since the wrong file was checked in
Change-Id: Id1cceef5ddf6aa7215a86159b66006dca675ce44
2011-11-07 13:13:46 -08:00
Eric Fischer
d3ba4ce1c9
am 08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
Import revised translations. DO NOT MERGE
2011-11-07 20:41:00 +00:00
Eric Fischer
08be43a6d9
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-07 12:36:02 -08:00
Eric Fischer
2f6172e35a
Import revised translations. DO NOT MERGE
...
Change-Id: Ib095d85d01ffce5201d1e91d7c90c516f8c4c89c
2011-11-07 12:34:57 -08:00
Jeff Brown
df4ee721cb
Fix possible leak in Parcel::writeDupFileDescriptor.
...
Also, check the result of dup() just in case we got EMFILE
or something.
Change-Id: I18e627bd84f4c7941813fe1c2bad2cdd9e5afa83
2011-11-07 12:22:39 -08:00
Andreas Huber
43b28298a6
Use binary search to discover closest sync sample index, replace
...
assertions with runtime errors in case the file's table of sync sample
indices is not sorted properly.
Change-Id: Ie4446a44e613a8d329ac680c37361d4407d22520
related-to-bug: 5549855
2011-11-07 11:38:14 -08:00
Amith Yamasani
ff92dd69af
am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
...
* commit '7919bfb12365b3f84e232235c35df957039995b7':
Don't show the submit button when it isn't enabled.
2011-11-07 19:01:22 +00:00
Amith Yamasani
7919bfb123
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
2011-11-07 10:57:17 -08:00
Winson Chung
48dd388045
am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
...
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
Fixing screenshot border asset.
2011-11-07 18:24:01 +00:00
Winson Chung
19c86cacb2
Merge "Fixing screenshot border asset." into ics-mr1
2011-11-07 10:20:37 -08:00