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

52110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gilles Debunne
2978cef0a7 Fix build, ran update-api 
Change-Id: I778604f332bdbee901bf8670cb9397f86e3de7a9
 2011-06-01 11:50:29 -07:00
Fabrice Di Meglio
4f5aa91ba5 Fix View default horizontal direction 
- set default value to View.HORIZONTAL_DIRECTION_INHERIT
- code refactoring

Change-Id: Ib5b49c8f8ebd6461992bff87603fdbb4b261218e
 2011-06-01 11:32:25 -07:00
Justin Koh
3c7b96a346 Framework: bugfix for menu selector not showing up properly. 
Menu selector wasn't showing up properly because selector state wasn't updated after touch mode.  Added this to resurrectselection call.

http://b/issue?id=4372583

TESTED = runs on M4.

Change-Id: I349c3b86f4e8a1a02a20494b547859d0c12867ee
 2011-06-01 11:22:01 -07:00
Jean-Michel Trivi
d0bbdb02b2 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Jean-Michel Trivi
5439223b56 Use channel mask instead of channel count for track creation 
Record and playback objects (resp AudioRecord and AudioTrack)
are created using a channel mask, but this information is lost
in the mixer because only the channel count is known to
AudioFlinger. A channel count can always be derived from a
channel mask.

The change consists in:
- disambiguiting variable names for channel masks and counts
- passing the mask information from the client to AudioFlinger
 and the mixer.
- when using the DIRECT ouput, only verifying the format of
 the track is compatible with the output's for PCM.

Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
 2011-06-01 10:55:29 -07:00
Adam Powell
d19fbe34e3 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
ca234a0765 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
8656ba1298 Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 2011-06-01 10:27:54 -07:00
Gilles Debunne
829de65b9a Merge "Select all for text shown as an icon on smaller screens" 2011-06-01 10:13:42 -07:00
Gilles Debunne
703d3279e8 Merge "ActionBar makes room for icons when no title is provided" 2011-06-01 10:12:11 -07:00
Scott Main
1dd5fba949 am 2b876a31: am f5992953: docs: fix typos 
* commit '2b876a31e2a8a424b6e0c51e7a403cf64fe22f0f':
  docs: fix typos
 2011-06-01 09:54:00 -07:00
Scott Main
2b876a31e2 am f5992953: docs: fix typos 
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
  docs: fix typos
 2011-06-01 09:50:21 -07:00
Scott Main
f5992953e4 docs: fix typos 
Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
 2011-06-01 09:46:04 -07:00
Robert Greenwalt
903cd57f67 am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
  Remove redundent getCurrentCdmaDataConnectionState
 2011-06-01 09:12:07 -07:00
Robert Greenwalt
ddae893681 Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE 2011-06-01 09:01:22 -07:00
Wink Saville
d1a1c09cb0 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
4d710ad53e Merge "resolved conflicts for merge of 590ec479 to master" 2011-05-31 23:34:46 -07:00
Dianne Hackborn
36f80f3a5a resolved conflicts for merge of 590ec479 to master 
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
 2011-05-31 23:11:16 -07:00
Dianne Hackborn
c691d7f9a3 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
b8d109318f am fd206560: Merge "Forgot this file." into honeycomb-mr2 
* commit 'fd20656067c611d3fed3bce31c757691ca0abaf4':
  Forgot this file.
 2011-05-31 18:30:01 -07:00
Dianne Hackborn
fd20656067 Merge "Forgot this file." into honeycomb-mr2 2011-05-31 18:28:50 -07:00
Dianne Hackborn
363456c724 Forgot this file. 
Change-Id: I8aa457d8d81d283f8cc36f68eca33fcb3a86ccad
 2011-05-31 18:27:49 -07:00
Joe Onorato
0d8f66f08d Put the enum constants into the api file. 
Bug: 4292741
Change-Id: Ia6d934e1202f818a967ffe469aa5e4f15f4648b5
 2011-05-31 18:17:20 -07:00
Svetoslav Ganov
86d2c5fa9a Merge "Removed unused service declaration from core tests." 2011-05-31 18:13:16 -07:00
Svetoslav Ganov
9909d999b7 Removed unused service declaration from core tests. 
bug:4513413

Change-Id: I722655a0840762a90e581e57b7890ccc52174a0c
 2011-05-31 18:11:49 -07:00
Dianne Hackborn
7322e557cf 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
a4cfcf10cc 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
75d6b3c2a2 Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2 2011-05-31 18:05:26 -07:00
Matthew Xie
646590ef0a Merge "Add public api BluetoothSocket.isConnected." 2011-05-31 18:04:36 -07:00
Dianne Hackborn
2f0b17573d Fix issue #4502672: Wrong xml resources used for homescreen widgets. 
There was a race in the system process between applying the initial
configuration and executing code in higher-level system services
like the app widget service that relies on the config.  For some
reason it starting showing up more after my code changes; it should
now be completely fixed.

Also fix the activity starting window to run in compatibility mode
if its application is going to be in compatibility mode.

And some various cleanup and small fixes.

Change-Id: I0566933bf1bbb4259c1d99a60c0a3c19af1542e5
 2011-05-31 18:04:14 -07:00
Adam Powell
f606167c7a Fix bug 4501658 - adjust toast frame padding 
Change-Id: I32fa68e27724ddb20f09a0ac99a497a97c425600
 2011-05-31 17:59:02 -07:00
Mike Lockwood
bade424fdd Merge "UsbService: Refactor USB host and device support into two separate classes" 2011-05-31 17:54:05 -07:00
Mike Lockwood
46d0adf825 UsbService: Refactor USB host and device support into two separate classes 
Host support is in UsbHostManager, device support is in UsbDeviceManager

Renamed UsbDeviceSettingsManager to UsbSettingsManager

Change-Id: Ib76e72957c233fa7f08f454d4d9a2a1da6368cc7
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-31 20:52:06 -04:00
James Dong
7c2cb0c583 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
Gilles Debunne
c619e74cc6 ActionBar makes room for icons when no title is provided 
Change-Id: I5bd09e00b50496032deda40ea22367d727230611
 2011-05-31 17:15:09 -07:00
Gilles Debunne
5e9af2ddf0 Select all for text shown as an icon on smaller screens 
Text has been removed to leave space for 4 icons, that should fit
even in portrait mode.

Note: requires a definitive selectAll icon from designers.

Change-Id: I65547527e9ca872aa8888467f31fa7de9653fa77
 2011-05-31 17:05:33 -07:00
Fabrice Di Meglio
38fd7cde0b Merge "Fix TextView potential NPE in isLayoutRtl()" 2011-05-31 16:57:55 -07:00
RoboErik
85284fbca7 Merge "Work on changing syncx to cal_syncx" 2011-05-31 16:44:04 -07:00
Joe Malin
409db558b3 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
a3d68aedfb 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
Joe Malin
d40a5d5cb7 Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f 
Change-Id: I48ddc26d4fc8e2e44627cfb0e98d9f0b596042b6
 2011-05-31 16:36:04 -07:00
Fabrice Di Meglio
83fa41b06e Fix TextView potential NPE in isLayoutRtl() 
- test if mDrawables can be null
- see bug #4517017 (was seen with Monkeys)

Change-Id: I07f04c88a238d1cae6fe89b0ab56fc2c456b8534
 2011-05-31 16:35:18 -07:00
Robert Greenwalt
a4e82851e9 Remove redundent getCurrentCdmaDataConnectionState 
replace with existing and generic getCurrentDataConnectionState.
bug:3487138

Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
 2011-05-31 16:25:58 -07:00
Mike Lockwood
b0aee3ee43 Merge "Move stringToFile utility from ConnectivityService to FileUtils" 2011-05-31 16:14:08 -07:00
Jeff Brown
b530abcff5 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
e129509422 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
60761f4fa5 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
7052f307f4 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
e00ef00873 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
7e193916c0 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