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

61527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Xie
77599ef15d am bfd97835: am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit 'bfd978355695e1a3a2887716f3d8fe028daa6005':
  Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-08 07:04:18 +00:00
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
0b6016d474 am 147b601e: am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 
* commit '147b601e99981e339df0be74a3dcda9f27fe73a0':
  Fix rotation displays frame N-1 briefly while rotating
 2011-11-08 05:38:42 +00: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
74bb5b8c3b am 082b8007: Merge "Improve JavaDoc on AtomicFile." 
* commit '082b8007fb849e7c9857333f8a1202e788978411':
  Improve JavaDoc on AtomicFile.
 2011-11-08 05:12:55 +00:00
Jeff Brown
082b8007fb Merge "Improve JavaDoc on AtomicFile." 2011-11-07 21:11:36 -08:00
Daniel Sandler
7400fb353a am 7bfb5b51: am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 
* commit '7bfb5b51de523a33cc413158626b947269427e8f':
  Fix scaling on notification panel wifi/battery icons.
 2011-11-08 03:52:17 +00: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
7e3e8b8c44 am 39c0e9f5: am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 
* commit '39c0e9f595317b71b818484b8d56279bb5cb9435':
  Update perf tests to always run each test in a fresh process.
 2011-11-08 02:54:06 +00: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
f9111ee73b am 01971d08: am 13194b16: Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 
* commit '01971d087b84f14e9ece4267cb1daa2939deb897':
  Fix bug 5534414 - Unselected tab states for Holo
 2011-11-08 02:01:45 +00: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
ac1a130486 am 02c45c7a: am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1 
* commit '02c45c7a34c543cd100974320c777b9b0016bb8b':
  Remain in call audio mode while phone is offhook.
 2011-11-08 00:52:44 +00: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
Robert Greenwalt
1f8865bf1c am 46bb0a1c: am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe 
* commit '46bb0a1cf687e77f7f7338cf74d5ae4897fda9b0':
  Make upstream tether list threadsafe
 2011-11-08 00:39:47 +00:00
John Reck
9827abe760 am 5bbe5e6a: am 669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1 
* commit '5bbe5e6ad5609da405bb7b3cef7566e6b1106ef8':
  Remove nativeRecordButtons
 2011-11-08 00:39:40 +00:00
Andreas Huber
30a2c60b29 am 014f6921: Merge "Use binary search to discover closest sync sample index, replace" 
* commit '014f69217d903234b4eaff8872b19a76d62860e3':
  Use binary search to discover closest sync sample index, replace
 2011-11-08 00:39:35 +00:00
Svetoslav Ganov
e6630fda12 am e164bab6: Merge "NumberPicker does not hide IME when flinged." 
* commit 'e164bab6b84c0ff737275637a771b411b98e00d9':
  NumberPicker does not hide IME when flinged.
 2011-11-08 00:39:33 +00:00
Adam Powell
e46680c23d am b92a77b5: am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1 
* commit 'b92a77b5629b0b93aa21946820f9842ee2f88654':
  Change the "start deferred" fragment API to "user visible hint"
 2011-11-08 00:39:31 +00:00
Peter Ng
c84dc3a842 am a20972ae: am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1 
* commit 'a20972ae458ffd8b41596eefdbd4b985370f16a9':
  Added focused state to quickcontacts shortcut
 2011-11-08 00:39:27 +00:00
Justin Ho
aa0cd804f1 am 3fab14c2: Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773" 
* commit '3fab14c29efdaed02d93b88befc8fcc052625f68':
  Merge: Correctly updating Roboto HHEA table to master Bug: 5516773
 2011-11-08 00:39:24 +00:00
Jim Miller
754d182007 am aa87fd03: am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 
* commit 'aa87fd03ff75535786ee9026fead5b35f97a5e4e':
  Fix 5231823: PIN/Password polish on lock screen
 2011-11-08 00:39:20 +00: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
8eaefb3673 am 5c7d5a4a: Merge "Fix possible leak in Parcel::writeDupFileDescriptor." 
* commit '5c7d5a4a35766206b25d9a3152a39e05d2548c63':
  Fix possible leak in Parcel::writeDupFileDescriptor.
 2011-11-07 22:07:40 +00:00
Jeff Brown
5c7d5a4a35 Merge "Fix possible leak in Parcel::writeDupFileDescriptor." 2011-11-07 14:05:22 -08:00