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

49796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
a687045045 cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e 
docs: fix game controller trademarks

Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205
 2011-06-28 20:45:32 -07:00
Xavier Ducrohet
e1918353e7 am 842725fc: (-s ours) am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 
* commit '842725fc642b7ba2c087cc81796973b838c23c76':
  Bring in more layout lib changes from hc-mr1.
 2011-06-28 19:14:05 -07:00
Xavier Ducrohet
660447379d am 9bce27a9: (-s ours) am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '9bce27a9ce916bdf363667ee67fc0ce50c533aa3':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:58:09 -07:00
Xavier Ducrohet
d7542263c6 am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '155cf6c1e191bb03fe24db8663715862d8e6a43d':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:56:17 -07:00
Xavier Ducrohet
adf5914b39 am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 
* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-28 18:56:14 -07:00
Xavier Ducrohet
842725fc64 am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 
* commit '4d825e1f3bb6b52ecbea6f0c4aa2081b7f1edc89':
  Bring in more layout lib changes from hc-mr1.
 2011-06-28 18:55:46 -07:00
Xavier Ducrohet
9bce27a9ce am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82':
  CherryPick 06942bc4 from hc-mr1. do not merge.
 2011-06-28 18:55:42 -07:00
Xavier Ducrohet
155cf6c1e1 am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 
* commit '9918ffb07f47430e22f6e53576d59b599f5a3534':
  CherryPick 988eeeb5 from hc-mr1. do not merge.
 2011-06-28 18:53:54 -07:00
Xavier Ducrohet
e0947693c9 am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 
* commit '54146a634e0e66a5e4732ba1a80079a1e93bdd8a':
  DO NOT MERGE. may fix build on some version of gcc
 2011-06-28 18:53:51 -07:00
Xavier Ducrohet
4d825e1f3b Merge "Bring in more layout lib changes from hc-mr1." into gingerbread 2011-06-28 18:53:15 -07:00
Xavier Ducrohet
4753498d5c Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:53:06 -07:00
Xavier Ducrohet
9918ffb07f Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread 2011-06-28 18:52:59 -07:00
Xavier Ducrohet
54146a634e Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread 2011-06-28 18:52:43 -07:00
mike wakerly
430cee0961 am af08ddbc: am 2f9ad8b4: Add intent actions for new firmware events. 
* commit 'af08ddbc42fb51de76958d859cf0e87d0b9e475e':
  Add intent actions for new firmware events.
 2011-06-28 17:22:53 -07:00
mike wakerly
af08ddbc42 am 2f9ad8b4: Add intent actions for new firmware events. 
* commit '2f9ad8b499cb150d5cdfe84a9795992c5dd42cff':
  Add intent actions for new firmware events.
 2011-06-28 17:19:05 -07:00
Wink Saville
cf2980ffef am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE 
* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
  Data connection retry pattern could be broken by PDP sharing
 2011-06-27 19:57:20 -07:00
Wink Saville
29d1dde972 Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE 2011-06-27 19:54:27 -07:00
mike wakerly
2f9ad8b499 Add intent actions for new firmware events. 
Change-Id: I8129b7812c0d551111f0c85eacc9535a441e5453
 2011-06-27 18:46:31 -07:00
Dianne Hackborn
229ff64bde am 351ddeb2: am 5db9ff97: Update final 13 API def. 
* commit '351ddeb2da65fc020e80d77d80f08aa1dfd820d7':
  Update final 13 API def.
 2011-06-27 17:11:15 -07:00
Dianne Hackborn
351ddeb2da am 5db9ff97: Update final 13 API def. 
* commit '5db9ff97aa8f36f330f41f5ae42467795ef075b8':
  Update final 13 API def.
 2011-06-27 17:07:29 -07:00
Kazuhiro Ondo
1e5c72c704 Data connection retry pattern could be broken by PDP sharing 
If a DataConnection is pending re-connect alarm, the new request
from another ApnContext sharing the same DC could disrupt
the re-connection pattern currently engaged.

This patch is to ensure the new request for PDP sharing
scenario will not trigger another SETUP_DATA request if
reconnection alarm is set in AlarmManager.

Bug: 4901019
Change-Id: I98b0d9af8b58fb880efdbc0246009de5cb116a54
 2011-06-27 15:12:21 -07:00
Dianne Hackborn
5db9ff97aa Update final 13 API def. 
Change-Id: I90cb38f575dd1b92a3694bb5cd091f5d595cee11
 2011-06-27 15:09:40 -07:00
Robert Ly
d1e7809545 am 0711c86c: am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2 
* commit '0711c86c3886fe869216965b868d30e9bb3abcea':
  docs: fixing new superscript for rs
 2011-06-27 11:58:26 -07:00
Robert Ly
0711c86c38 am 81cbc294: Merge "docs: fixing new superscript for rs" into honeycomb-mr2 
* commit '81cbc294ddb08c2bc08be9b2abbbcc7c19ec88d9':
  docs: fixing new superscript for rs
 2011-06-27 11:49:30 -07:00
Robert Ly
81cbc294dd Merge "docs: fixing new superscript for rs" into honeycomb-mr2 2011-06-27 11:45:41 -07:00
Robert Ly
491a6de28d docs: fixing new superscript for rs 
Change-Id: I0563842a3a43972b131a2ec30ed8357b8136fc6d
 2011-06-27 10:33:01 -07:00
Anirudh Dewani
cf33a02bef am 3ba39ef2: am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2 
* commit '3ba39ef20fdbe4512d3c3ad6ad7c833b14318391':
  Typo in spinner tutorial.
 2011-06-27 04:33:59 -07:00
Anirudh Dewani
3ba39ef20f am 1f82dc08: Merge "Typo in spinner tutorial." into honeycomb-mr2 
* commit '1f82dc08f1616a83d8d1c43fa9ac16d0d60dd537':
  Typo in spinner tutorial.
 2011-06-26 23:06:04 -07:00
Anirudh Dewani
1f82dc08f1 Merge "Typo in spinner tutorial." into honeycomb-mr2 2011-06-26 23:02:56 -07:00
Dianne Hackborn
06ca9b90e6 am fa5e3b65: am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit 'fa5e3b658f3f42eabec82c9f8e44d8a4cc565249':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:43:44 -07:00
Dianne Hackborn
fa5e3b658f am 2dafe771: Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 
* commit '2dafe771bb7ad4b15db6b740fd3ccb8f0fae836d':
  DO NOT MERGE.  Fix density compat mode.
 2011-06-24 12:26:17 -07:00
Jean-Baptiste Queru
ec5039b372 am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." 
* commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2':
  Add WEBP to the list of Image formats that support Compression.
 2011-06-24 12:20:24 -07:00
Jean-Baptiste Queru
9f1ef6d57b am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit '7595e84d3a60d2a63990703043a8e9647f71e3a4':
  Tweak for forward-compatibility
 2011-06-24 12:20:10 -07:00
Dianne Hackborn
2dafe771bb Merge "DO NOT MERGE. Fix density compat mode." into honeycomb-mr2 2011-06-24 12:13:16 -07:00
Jean-Baptiste Queru
99c070d8eb am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." 
* commit '4fea5373d350f5d855408ffaa41206b8fa743c55':
  Add WEBP to the list of Image formats that support Compression.
 2011-06-24 11:33:46 -07:00
Jean-Baptiste Queru
7595e84d3a am f458d5fd: Merge "Tweak for forward-compatibility" 
* commit 'f458d5fdb8a48747d6fdd5fd0d0a44a6a8ed89e9':
  Tweak for forward-compatibility
 2011-06-24 11:28:30 -07:00
Jean-Baptiste Queru
4fea5373d3 Merge "Add WEBP to the list of Image formats that support Compression." 2011-06-24 11:13:42 -07:00
Jean-Baptiste Queru
f458d5fdb8 Merge "Tweak for forward-compatibility" 2011-06-24 11:08:36 -07:00
Jean-Baptiste Queru
0fe0e7a4cb Tweak for forward-compatibility 
Change-Id: Ic5e4d949c1c80a2ebdc2ec802c35b5d3d7f9661d
 2011-06-24 10:49:18 -07:00
Anirudh Dewani
9b375068ac Typo in spinner tutorial. 
Change-Id: I2bacd7b417c21944703738cd410dc1ec67c1b554
 2011-06-24 16:30:20 +05:30
Wink Saville
7eff4bb3f9 am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE 
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
  Temporary re-enabling iface name change handling on HO
 2011-06-23 18:25:38 -07:00
Wink Saville
f49e4d3f18 Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE 2011-06-23 18:21:36 -07:00
Kazuhiro Ondo
1ccb10e25d Temporary re-enabling iface name change handling on HO 
Temporary accept interface name change in ConnectivityService.
See bug/4455071.

Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
 2011-06-23 14:58:50 -07:00
Scott Main
7c58d671d5 am f169bae8: am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 
* commit 'f169bae87df61ad91bda0c547a59fdaeda1bed10':
  docs: add emphasis to adding a search button in activity UI
 2011-06-23 13:15:58 -07:00
Scott Main
f169bae87d am f8d37ab6: Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 
* commit 'f8d37ab6b35c6cdd44e833ae4bd65301f2d3543a':
  docs: add emphasis to adding a search button in activity UI
 2011-06-23 13:12:30 -07:00
Scott Main
f8d37ab6b3 Merge "docs: add emphasis to adding a search button in activity UI" into honeycomb-mr2 2011-06-23 13:08:27 -07:00
Scott Main
72e0df6573 docs: add emphasis to adding a search button in activity UI 
Change-Id: I13c4673cdb8caab65dd8d57046f54b0ae3bf48e2
 2011-06-23 13:07:26 -07:00
Scott Main
44b48a377d am db76388e: am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit 'db76388e9af0019842ea2cca0b14d11f2e146d1a':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-23 12:51:49 -07:00
Dianne Hackborn
83e0bc18e0 DO NOT MERGE. Fix density compat mode. 
Fix issue #4770360: older app compatibility mode is really tiny on ICS phones

We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
 2011-06-23 12:29:03 -07:00
Scott Main
db76388e9a am 9a05cfe5: docs: update docs for new screen support attributes and qualifiers 
* commit '9a05cfe5427a6cee988333e0d65f17b9854554a3':
  docs: update docs for new screen support attributes and qualifiers
 2011-06-23 12:26:33 -07:00