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

65890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
b14069b2c8 am f14005c0: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-aah 
* commit 'f14005c014665c94a35305ac6218f5731c97d195':
  Import translations. DO NOT MERGE
 2012-03-09 14:33:59 -08:00
Eric Fischer
1dbe4a2b9b Merge "Import translations. DO NOT MERGE" into ics-aah-exp 2012-03-09 14:32:25 -08:00
Eric Fischer
f14005c014 Merge "Import translations. DO NOT MERGE" into ics-aah 2012-03-09 14:32:07 -08:00
Kevin Hester
bd84738148 Merge "Do not allow Surface creation on machines without SurfaceFlinger We will fail later anyways, but this change makes it much easier to track down places where we are inadvertently doing operations that depend on the flinger." into ics-aah-exp 2012-03-09 12:40:51 -08:00
Scott Main
8edad6f16f docs: Fix a bunch of misc doc issues from external tracker 
Change-Id: I03cae5bdb7b806e81cc6c983a014de212cb80c73
 2012-03-09 12:30:40 -08:00
Eric Fischer
6d1e95b021 Import translations. DO NOT MERGE 
Change-Id: Idd71e59c312c5f4790d9d68d70126bfa45ebccd7
 2012-03-09 12:24:17 -08:00
Eric Fischer
f5c6daabd1 Import translations. DO NOT MERGE 
Change-Id: Ib01393301d0a27b63bd9b25ce5dfd2bda4fdc9d0
 2012-03-09 12:22:34 -08:00
Travis Geiselbrecht
de7aa54bf7 am 15ce1934: add config_bluetooth_default_profiles config var and use it to disable bt profiles 
* commit '15ce193455dda9dcebbb40bd37d9fbfbb7e772d3':
  add config_bluetooth_default_profiles config var and use it to disable bt profiles
 2012-03-09 11:59:59 -08:00
Travis Geiselbrecht
15ce193455 add config_bluetooth_default_profiles config var and use it to disable bt profiles 
For devices that don't care about the previously default bluetooth profiles,
add a config var to disable them.

Change-Id: I21a894130d280016cfd5db1b8bbda70cbef348c3
 2012-03-09 11:49:45 -08:00
Kevin Hester
0cc47fe86f Do not allow Surface creation on machines without SurfaceFlinger 
We will fail later anyways, but this change makes it much easier to track
down places where we are inadvertently doing operations that depend on the
flinger.

Change-Id: Ie28d3f892098240f363dabb4a8cf1f9e0e1679fb
 2012-03-09 11:23:09 -08:00
Eric Fischer
0916f6d3dd am 19891328: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-aah 
* commit '19891328f6718a64f47555eccb580400fb325959':
  Import translations. DO NOT MERGE
 2012-03-08 17:44:36 -08:00
Eric Fischer
77c2e95f44 Merge "Import translations. DO NOT MERGE" into ics-aah-exp 2012-03-08 17:43:11 -08:00
Eric Fischer
19891328f6 Merge "Import translations. DO NOT MERGE" into ics-aah 2012-03-08 17:42:45 -08:00
Eric Fischer
a97b604147 Import translations. DO NOT MERGE 
Change-Id: I8657f236b2c916182a03d1eb73ab66facfb08f20
 2012-03-08 12:29:42 -08:00
Megha Joshi
8cda472dc7 am 1d721583: am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '1d72158331a4b3273d282fd170a6d03d5d9e2da3':
  A few updates for TVs.
 2012-03-08 12:28:39 -08:00
Eric Fischer
5cb1a2b869 Import translations. DO NOT MERGE 
Change-Id: I6065f9517281fcdb1fff020ef0661135723c524d
 2012-03-08 12:28:02 -08:00
Megha Joshi
2c3ea5154b am 9452f4d8: am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '9452f4d899295269f3dc8f3f06c60b757c7d34f9':
  Adding TV related updates.
 2012-03-08 12:26:14 -08:00
Megha Joshi
1d72158331 am 33372b21: Merge "A few updates for TVs." into ics-mr1 
* commit '33372b217ea5e9950560449aa5c86e0f0ddacc74':
  A few updates for TVs.
 2012-03-08 12:24:51 -08:00
Megha Joshi
33372b217e Merge "A few updates for TVs." into ics-mr1 2012-03-08 12:22:49 -08:00
Megha Joshi
9452f4d899 am 84099f3d: Merge "Adding TV related updates." into ics-mr1 
* commit '84099f3d788974169a8ea282f9413cb399d17012':
  Adding TV related updates.
 2012-03-08 12:22:37 -08:00
Megha Joshi
84099f3d78 Merge "Adding TV related updates." into ics-mr1 2012-03-08 12:20:21 -08:00
Megha Joshi
500cc4be2f A few updates for TVs. 
Change-Id: I2465cbfdfd3a5b9e22f94bd1c678aec33ab216d9
 2012-03-08 12:18:00 -08:00
RoboErik
5ebb256eea am 9162cd59: fix setting only usb mode 
* commit '9162cd596b958c1e59ec69257b2e596290ad73c3':
  fix setting only usb mode
 2012-03-08 09:48:14 -08:00
RoboErik
9162cd596b fix setting only usb mode 
If you cleared the last usb mode it would fail (and so would setting
it if you started with none). This fixes it to set and unset the
last property correctly.

Change-Id: I8aa62a65ccda5f3872d2995f30d80426f07a281c
 2012-03-07 17:58:30 -08:00
Scott Main
fb55315645 am 8891e01e: am 99e790de: docs: add troido adk link 
* commit '8891e01eef2d67f68f71ad6051cf8efdc0dfc55f':
  docs: add troido adk link
 2012-03-07 17:22:27 -08:00
Scott Main
8891e01eef am 99e790de: docs: add troido adk link 
* commit '99e790de9ea23f59933fd695ca35bb6d1033b4e9':
  docs: add troido adk link
 2012-03-07 17:19:57 -08:00
Megha Joshi
87e32816c4 Adding TV related updates. 
Change-Id: I631af8bec0c3178d2d03f9725afea548576cad77
 2012-03-07 17:19:44 -08:00
Kevin Hester-Chow
f4d4aa1af4 am e0cbb81b: Merge "Do not assume that there is always a running activity (Necessary for headless devices)" into ics-aah 
* commit 'e0cbb81b7ac0985a839a384ab3227bb6bc1acd43':
  Do not assume that there is always a running activity (Necessary for headless devices)
 2012-03-07 15:37:08 -08:00
Kevin Hester-Chow
e0cbb81b7a Merge "Do not assume that there is always a running activity (Necessary for headless devices)" into ics-aah 2012-03-07 15:35:05 -08:00
Eric Fischer
a2f924d4b8 am 48f5744b: (-s ours) Import translations. DO NOT MERGE 
* commit '48f5744b69249da2f01af50a0fbeae12cfe13b31':
  Import translations. DO NOT MERGE
 2012-03-07 14:55:25 -08:00
Eric Fischer
dee1807b95 Import translations. DO NOT MERGE 
Change-Id: Iacba0954e7a037e022cc08cbc303ffeb1b51334e
 2012-03-07 12:55:53 -08:00
Eric Fischer
48f5744b69 Import translations. DO NOT MERGE 
Change-Id: I4c99687a25aaa3b92cc97d4719ed3196ea4b22ee
 2012-03-07 12:54:08 -08:00
John Grossman
3f95ed2e89 am d7af3479: Detect (at runtime) kernel support for the "hdmi_audio" switch. 
* commit 'd7af347922064be585d3b9406cf7f9edd9d2f049':
  Detect (at runtime) kernel support for the "hdmi_audio" switch.
 2012-03-06 18:59:47 -08:00
John Grossman
d7af347922 Detect (at runtime) kernel support for the "hdmi_audio" switch. 
A new switch was introduced in AndroidAtHome to deal with a race
condition between the WiredAccessoryObserver and the HW composer HAL.
When the new switch ("hdmi_audio") is present, we want to pay
attention to it instead of paying attention to the old switch
("hdmi").  This change checks at startup for the presence or absence
of the new switch and uses it if available, otherwise it falls back on
classic behavior.

see change ID I960cfc2f3e8df5342e7248a26fd313fdad2ca322 for the kernel
side changes.

see bug 6023647 for a discussion of the issue.

Change-Id: Ia2f2c399c3d85896ede0fff57ecbd51f332b3e0e
Signed-off-by: John Grossman <johngro@google.com>
 2012-03-06 17:59:02 -08:00
Scott Main
99e790de9e docs: add troido adk link 
Change-Id: Ib7cb1dd821dc17ffc8acd02843218e6d21e15295
 2012-03-06 16:17:08 -08:00
Roman Nurik
98b0a002cf am 9e879c80: am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit '9e879c806ed199e043bee5f83ef1c5e5d9470112':
  docs: move Android Design from static HTML to JD
 2012-03-06 14:51:35 -08:00
Scott Main
6a89410150 am 784c1ee3: am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '784c1ee394010685c8c2ae75207de0039537e86e':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-06 14:51:32 -08:00
Scott Main
2c20477992 am fb7cd4fa: am 97b94e78: docs: a few more Market -> Play strings 
* commit 'fb7cd4fad6a107d6fe067e748ce59a4f9b7a50e5':
  docs: a few more Market -> Play strings
 2012-03-06 14:51:25 -08:00
Roman Nurik
9e879c806e am 96c757e5: Merge "docs: move Android Design from static HTML to JD" into ics-mr1 
* commit '96c757e557ed40da4400b82fd62dfbd4bc8151d1':
  docs: move Android Design from static HTML to JD
 2012-03-06 14:43:34 -08:00
Roman Nurik
96c757e557 Merge "docs: move Android Design from static HTML to JD" into ics-mr1 2012-03-06 14:39:54 -08:00
Scott Main
784c1ee394 am 66895ad5: Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 
* commit '66895ad5f7cdb9a8a292c9e6c04347a10b4212a3':
  Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post.
 2012-03-06 14:25:57 -08:00
Scott Main
66895ad5f7 Merge "Fix badge generator URLs and images, and update script to generate different alt text for the different button styles. Also change homepage announce link for blog post." into ics-mr1 2012-03-06 14:23:23 -08:00
Scott Main
fb7cd4fad6 am 97b94e78: docs: a few more Market -> Play strings 
* commit '97b94e784c012ca2bff273ff74a00c6eadd1a1a2':
  docs: a few more Market -> Play strings
 2012-03-06 13:57:04 -08:00
Eric Fischer
16fdabbc77 Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp 2012-03-06 13:45:09 -08:00
Eric Fischer
69cd3c39aa Import translations. DO NOT MERGE 
Change-Id: I31b5992fd0e53c50c63ca4e40485d05b590d7a0e
 2012-03-06 12:41:41 -08:00
Eric Fischer
8806d5c99a Import translations. DO NOT MERGE 
Change-Id: Icb18cf9b2983959a07c5abfd084f63f5632483d0
 2012-03-06 12:40:07 -08:00
Roman Nurik
b99ae73cc5 docs: move Android Design from static HTML to JD 
Change-Id: I6e451599998cb8b69489cada482ab5db9d71d6f8
 2012-03-06 12:26:15 -08:00
Scott Main
97b94e784c docs: a few more Market -> Play strings 
Change-Id: Icd09ec82362ff9aac511260f0fa295ddbc7e1369
 2012-03-06 12:10:17 -08:00
Scott Main
19fa8fee25 Fix badge generator URLs and images, and update 
script to generate different alt text for the different button styles.
Also change homepage announce link for blog post.

Change-Id: Ibbdc2e8abad3c218d030299eb60ba5bee75db232
 2012-03-06 11:46:30 -08:00
Jason Simmons
be8f782ad8 Merge branch 'ics-aah-exp' of ssh://android-git:29418/platform/frameworks/base into ics-aah-exp 2012-03-06 09:41:04 -08:00