ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
35,290 Commits 2 Branches 0 Tags 54 MiB
4839f5c3fe
Commit Graph

35290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
c3bab1a4c9 Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2 2011-06-01 12:48:03 -07:00
Dianne Hackborn
2083dd1a58 am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 
* commit '79841acb6275348b4747d30bae6d813e15b1425d':
  Compatibility mode never needed for normal size screens.
 2011-06-01 12:47:29 -07:00
Dianne Hackborn
9e19c9e4ef Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2 2011-06-01 12:43:56 -07:00
Dianne Hackborn
af2c3397ae am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2 
* commit '13e2bef4f67c5bc5ce93aade1431ae3332d361f0':
  Fix issue #4500511: Holo effect background doesn't reach top of screen anymore
 2011-06-01 12:43:35 -07:00
Dianne Hackborn
e593915ba6 am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2 
* commit '80cf4e79d2acd1f94b6a9866255459c6ab2760be':
  Fix issue #4500511: Holo effect background doesn't reach top of screen anymore
 2011-06-01 12:39:36 -07:00
Dianne Hackborn
5717c26845 Merge "Fix issue #4500511: Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2 2011-06-01 12:34:48 -07:00
Jean-Michel Trivi
c507859dd8 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Adam Powell
9018cf8e63 am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit 'ca234a0765e3b43ab202f29caceba68b7c5363df':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-01 10:33:46 -07:00
Adam Powell
60888e4a1a am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 
* commit '8656ba1298da98dde9ff6517aa06b86317a65bf7':
  Fix bug 4501658 - adjust toast frame padding
 2011-06-01 10:29:58 -07:00
Adam Powell
d27a23d661 Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 2011-06-01 10:27:54 -07:00
Gilles Debunne
416a702589 Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
817161087d Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Scott Main
1e1f5288f1 am 2b876a31: am f5992953: docs: fix typos 
* commit '2b876a31e2a8a424b6e0c51e7a403cf64fe22f0f':
  docs: fix typos
 2011-06-01 09:54:00 -07:00
Martijn Coenen
3e1db14ded am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit '0aa1017f9183bca752c95af72f73120e102ab2d3':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-01 09:51:15 -07:00
Scott Main
794992b956 am f5992953: docs: fix typos 
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
  docs: fix typos
 2011-06-01 09:50:21 -07:00
Robert Greenwalt
725c6e2c78 am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
  Remove redundent getCurrentCdmaDataConnectionState
 2011-06-01 09:12:07 -07:00
Robert Greenwalt
d05f356f75 Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 2011-06-01 09:01:22 -07:00
Wink Saville
0286454af0 am 7f9d3210: am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE 
* commit '7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
  Remove or disable some verbose debugging.
 2011-05-31 23:41:32 -07:00
Dianne Hackborn
855e7ba0cf Merge "resolved conflicts for merge of 590ec479 to master" 2011-05-31 23:34:46 -07:00
Dianne Hackborn
02027de4e1 resolved conflicts for merge of 590ec479 to master 
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
 2011-05-31 23:11:16 -07:00
Dianne Hackborn
ffd64a700a am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'b8d109318f6fc88d1a59ca0e6e362963cd06960c':
  Forgot this file.
 2011-05-31 18:33:00 -07:00
Dianne Hackborn
1c131d4d87 am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
  Forgot this file.
 2011-05-31 18:30:01 -07:00
Dianne Hackborn
5207046002 Merge "Forgot this file." into honeycomb-mr2 2011-05-31 18:28:50 -07:00
Svetoslav Ganov
03d9b10224 Merge "Removed unused service declaration from core tests." 2011-05-31 18:13:16 -07:00
Dianne Hackborn
f02132fc13 am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit 'a4cfcf10cc300a1eb5b2a4254fb7d3190c56c4f1':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-05-31 18:11:29 -07:00
Dianne Hackborn
7c51115333 am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 
* commit '75d6b3c2a24224e41e87685db0d9d0b8abea091d':
  Fix issue #4502672: Wrong xml resources used for homescreen widgets.
 2011-05-31 18:08:27 -07:00
Dianne Hackborn
13520e8a76 Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 2011-05-31 18:05:26 -07:00
Matthew Xie
0a393ae020 Merge "Add public api BluetoothSocket.isConnected." 2011-05-31 18:04:36 -07:00
Mike Lockwood
1010ae4f61 Merge "UsbService: Refactor USB host and device support into two separate classes" 2011-05-31 17:54:05 -07:00
James Dong
ff2168ef32 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
Fabrice Di Meglio
54cac5acae Merge "Fix TextView potential NPE in isLayoutRtl()" 2011-05-31 16:57:55 -07:00
RoboErik
302415abe2 Merge "Work on changing syncx to cal_syncx" 2011-05-31 16:44:04 -07:00
Joe Malin
f3b29e46b6 am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit 'a3d68aedfbd21c340ff7c76394b8b9dfca67ae13':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-05-31 16:43:55 -07:00
Joe Malin
d44e27c691 am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
* commit 'd40a5d5cb754b132d6c10ae78a6214f38ed23f3d':
  Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
 2011-05-31 16:40:59 -07:00
Mike Lockwood
b23b6c06fe Merge "Move stringToFile utility from ConnectivityService to FileUtils" 2011-05-31 16:14:08 -07:00
Jeff Brown
677d3e912f am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2 
* commit '3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
  Touch pad UX improvements.
 2011-05-31 16:03:07 -07:00
Jeff Brown
49c3905913 am fd86ab8a: (-s ours) am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 
* commit 'fd86ab8a0f15bb15a8c274b8ea61743216f39532':
  Fix deadlock in dispatcher. (DO NOT MERGE)
 2011-05-31 16:02:54 -07:00
Adam Powell
fb6cda5443 am 31caa0e6: am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 
* commit '31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
  Updated popup dialog 9 patches (light)
 2011-05-31 16:02:41 -07:00
Joe Onorato
b75391f190 am 7f818d0a: am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '7f818d0a97ecd7793811ff5549a4b67521d93f49':
  Move status bar icons to sw600.
 2011-05-31 16:02:26 -07:00
Jeff Hamilton
e4f9791b73 am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 
* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
  Swap Mifare for MIFARE.
 2011-05-31 16:00:46 -07:00
Jeff Brown
68eadf66b2 am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 
* commit '425f2a6d71b3af058630367d75b0b924bf1aee49':
  Use ViewConfiguration to seed input system configuration.
 2011-05-31 15:51:21 -07:00
Jeff Brown
93600d98e1 am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 
* commit '1311455f3ee8cbd2b2b83ec2d98e95e1da108743':
  Button state should reflect actual buttons. (DO NOT MERGE)
 2011-05-31 15:50:59 -07:00
Jeff Brown
4c61cbe97d am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 
* commit 'c272d4279493000928b8b7c6dbcf2d2b7d8d08b2':
  Use ViewConfiguration to seed input system configuration.
 2011-05-31 15:44:04 -07:00
Jeff Brown
3576fc419f am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 
* commit 'd854304c2bcadbda37a7f1b24723dbc0030073ca':
  Button state should reflect actual buttons. (DO NOT MERGE)
 2011-05-31 15:44:01 -07:00
Jeff Brown
5eba89ca43 Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2 2011-05-31 15:42:18 -07:00
Jeff Brown
e63c757704 Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2 2011-05-31 15:42:08 -07:00
Joe Onorato
8397b385ec Merge "Merge commit 'fce12613' into HEAD" 2011-05-31 15:35:11 -07:00
James Dong
ac5e31087b Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)" 2011-05-31 14:33:20 -07:00
Chet Haase
dfe375583e Merge "Fixes for AnimationDrawable" 2011-05-31 14:24:22 -07:00
Joe Onorato
d53f2fa6c5 Merge commit 'fce12613' into HEAD 
Conflicts:
	core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
	core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout/status_bar_latest_event_content_large_icon.xml

Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
 2011-05-31 14:11:58 -07:00