Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,093 Commits 3 Branches 0 Tags
ec6004acf77a43178e4281387bf3f072d9d7c3c5
Commit Graph

7093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
ec6004acf7 am 51dc135c: am 5439f4e3: Merge change 22665 into eclair 
Merge commit '51dc135c10e458c1b24de1ca2275ce924a942d6d'

* commit '51dc135c10e458c1b24de1ca2275ce924a942d6d':
  Decapitalize "Input method" in context menu.
 2009-08-25 17:26:58 -07:00
Eric Fischer
51dc135c10 am 5439f4e3: Merge change 22665 into eclair 
Merge commit '5439f4e30300084beb3f1ecbb19bcfd1bcac9e5d' into eclair-plus-aosp

* commit '5439f4e30300084beb3f1ecbb19bcfd1bcac9e5d':
  Decapitalize "Input method" in context menu.
 2009-08-25 17:26:00 -07:00
Android (Google) Code Review
5439f4e303 Merge change 22665 into eclair 
* changes:
  Decapitalize "Input method" in context menu.
 2009-08-25 17:24:58 -07:00
Jason Sams
82a6f7ffea am e4f855a0: am 1af7258c: Merge change 22695 into eclair 
Merge commit 'e4f855a0aaef90a8febfe5c2eff588f7febc8fae'

* commit 'e4f855a0aaef90a8febfe5c2eff588f7febc8fae':
  Remove bogus comments and logging.
 2009-08-25 17:15:14 -07:00
Jason Sams
e4f855a0aa am 1af7258c: Merge change 22695 into eclair 
Merge commit '1af7258c907f5ad148226d5dcbd188fd75facbfb' into eclair-plus-aosp

* commit '1af7258c907f5ad148226d5dcbd188fd75facbfb':
  Remove bogus comments and logging.
 2009-08-25 17:13:16 -07:00
Android (Google) Code Review
1af7258c90 Merge change 22695 into eclair 
* changes:
  Remove bogus comments and logging.
 2009-08-25 17:10:56 -07:00
Jason Sams
67c6844ea0 Remove bogus comments and logging. 2009-08-25 17:09:59 -07:00
johnwang
b58a644d39 am 7250f938: am cc907741: Merge change 22660 into eclair 
Merge commit '7250f938accad16e878889c6f4d8be3b8520f510'

* commit '7250f938accad16e878889c6f4d8be3b8520f510':
  Simplify data icons of CDMA in status bar.
 2009-08-25 16:23:04 -07:00
johnwang
7250f938ac am cc907741: Merge change 22660 into eclair 
Merge commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b' into eclair-plus-aosp

* commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b':
  Simplify data icons of CDMA in status bar.
 2009-08-25 16:20:12 -07:00
Android (Google) Code Review
cc907741b9 Merge change 22660 into eclair 
* changes:
  Simplify data icons of CDMA in status bar.
 2009-08-25 16:18:32 -07:00
Robert Greenwalt
777814327b am 7b1820d9: am 8d61d005: Merge change 22638 into eclair 
Merge commit '7b1820d9f126d967b395d99dd92c816b083d3adf'

* commit '7b1820d9f126d967b395d99dd92c816b083d3adf':
  Fix the removal of dns entries.
 2009-08-25 16:16:20 -07:00
Robert Greenwalt
7b1820d9f1 am 8d61d005: Merge change 22638 into eclair 
Merge commit '8d61d005839b23a41034325d5f458f1344933b1b' into eclair-plus-aosp

* commit '8d61d005839b23a41034325d5f458f1344933b1b':
  Fix the removal of dns entries.
 2009-08-25 16:13:26 -07:00
johnwang
9f87cb2f8d Simplify data icons of CDMA in status bar. 
Use 3G icons when connect to EvDO, use 1x icons when connected to 1x, and remove dormant state display.
 2009-08-25 16:12:39 -07:00
Android (Google) Code Review
8d61d00583 Merge change 22638 into eclair 
* changes:
  Fix the removal of dns entries.
 2009-08-25 16:11:47 -07:00
Mike Lockwood
5f0b486e16 am f441a650: am ca5362ce: Merge change 22674 into eclair 
Merge commit 'f441a6505aa23aac496be45d053fa2a7e7c2adfa'

* commit 'f441a6505aa23aac496be45d053fa2a7e7c2adfa':
  GpsLocationProvider: Default to AGPS on if the setting is missing.
 2009-08-25 16:09:06 -07:00
Mike Lockwood
f441a6505a am ca5362ce: Merge change 22674 into eclair 
Merge commit 'ca5362cec4954366f8c1dc011bd14264c8381646' into eclair-plus-aosp

* commit 'ca5362cec4954366f8c1dc011bd14264c8381646':
  GpsLocationProvider: Default to AGPS on if the setting is missing.
 2009-08-25 16:06:36 -07:00
Android (Google) Code Review
ca5362cec4 Merge change 22674 into eclair 
* changes:
  GpsLocationProvider: Default to AGPS on if the setting is missing.
 2009-08-25 16:05:26 -07:00
Mike Lockwood
26ed2c2f1f am 2698cf18: am 0de065e6: Merge change 22661 into eclair 
Merge commit '2698cf18af757d433c5ee0f7bd5607a4a185f577'

* commit '2698cf18af757d433c5ee0f7bd5607a4a185f577':
  SettingsProvider: Fix botched merge from donut to eclair.
 2009-08-25 16:04:42 -07:00
Mike Lockwood
2698cf18af am 0de065e6: Merge change 22661 into eclair 
Merge commit '0de065e68cc2141513c5b45643123ecb2947858c' into eclair-plus-aosp

* commit '0de065e68cc2141513c5b45643123ecb2947858c':
  SettingsProvider: Fix botched merge from donut to eclair.
 2009-08-25 16:02:07 -07:00
Mike Lockwood
660bbfcc54 GpsLocationProvider: Default to AGPS on if the setting is missing. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-25 16:01:37 -07:00
Android (Google) Code Review
0de065e68c Merge change 22661 into eclair 
* changes:
  SettingsProvider: Fix botched merge from donut to eclair.
 2009-08-25 16:00:54 -07:00
Mike Lockwood
02901eb7f2 SettingsProvider: Fix botched merge from donut to eclair. 
donut and eclair had different ideas of what it means to upgrade from verion 34 to 35.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-25 15:56:50 -07:00
Eric Fischer
e6f850597c Decapitalize "Input method" in context menu. 
Bug 1844819

Change-Id: If9ac5daabc6a44196d63f8d534bc8419f997c92f
 2009-08-25 15:37:03 -07:00
Dianne Hackborn
f0f7426413 am ab5eed16: am 9acc030b: Implement issue #2071750: add a pre-boot upgrade step. 
Merge commit 'ab5eed16f7eeb14094d95a32791e2de133d1c0c8'

* commit 'ab5eed16f7eeb14094d95a32791e2de133d1c0c8':
  Implement issue #2071750: add a pre-boot upgrade step.
 2009-08-25 15:36:30 -07:00
Jack Wang
2ce6237fa0 am 8b7eadf7: am 1e09e9e0: Merge change 22650 into eclair 
Merge commit '8b7eadf7ba1ddfa26d1593e62297204b1f243761'

* commit '8b7eadf7ba1ddfa26d1593e62297204b1f243761':
  Fix build break
 2009-08-25 15:36:25 -07:00
Dianne Hackborn
ab5eed16f7 am 9acc030b: Implement issue #2071750: add a pre-boot upgrade step. 
Merge commit '9acc030be474db2bc2371440a12cbdc478238689' into eclair-plus-aosp

* commit '9acc030be474db2bc2371440a12cbdc478238689':
  Implement issue #2071750: add a pre-boot upgrade step.
 2009-08-25 15:34:26 -07:00
Jack Wang
8b7eadf7ba am 1e09e9e0: Merge change 22650 into eclair 
Merge commit '1e09e9e0d09602ee84a299f09b451db686ff6c40' into eclair-plus-aosp

* commit '1e09e9e0d09602ee84a299f09b451db686ff6c40':
  Fix build break
 2009-08-25 15:34:21 -07:00
Dianne Hackborn
9acc030be4 Implement issue #2071750: add a pre-boot upgrade step. 
Change-Id: I7133a03a6bf302dbac00c5f8b0420071d2453f89
 2009-08-25 15:15:31 -07:00
Android (Google) Code Review
1e09e9e0d0 Merge change 22650 into eclair 
* changes:
  Fix build break - Introduced in 22109
 2009-08-25 14:55:27 -07:00
Jason Sams
cde9ab93f7 am 7ebcbff6: am cf207b63: Merge change 22651 into eclair 
Merge commit '7ebcbff63fc5c2528f226e78e96cb5a68a0ac01d'

* commit '7ebcbff63fc5c2528f226e78e96cb5a68a0ac01d':
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
 2009-08-25 14:54:06 -07:00
Jason Sams
7ebcbff63f am cf207b63: Merge change 22651 into eclair 
Merge commit 'cf207b632500d18c9053aa01ea9a1d8ae2d92612' into eclair-plus-aosp

* commit 'cf207b632500d18c9053aa01ea9a1d8ae2d92612':
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
 2009-08-25 14:52:04 -07:00
Android (Google) Code Review
cf207b6325 Merge change 22651 into eclair 
* changes:
  Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo.
 2009-08-25 14:49:55 -07:00
Jason Sams
f5b4596a38 Implement java interface for RS shutdown and fix shutdown deadlock with the command fifo. 2009-08-25 14:49:07 -07:00
Jack Wang
fa5382208b Fix build break 
- Introduced in 22109
 2009-08-25 14:47:44 -07:00
Andreas Huber
baba9a24a1 am 5c36cd2b: am f96d49a2: Merge change 22646 into eclair 
Merge commit '5c36cd2bcb594c0ed4422a5074b70535bc132f3b'

* commit '5c36cd2bcb594c0ed4422a5074b70535bc132f3b':
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
 2009-08-25 14:38:56 -07:00
Andreas Huber
5c36cd2bcb am f96d49a2: Merge change 22646 into eclair 
Merge commit 'f96d49a277af9ec888bb7d15988b57989ccb39af' into eclair-plus-aosp

* commit 'f96d49a277af9ec888bb7d15988b57989ccb39af':
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
 2009-08-25 14:36:40 -07:00
Android (Google) Code Review
f96d49a277 Merge change 22646 into eclair 
* changes:
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
 2009-08-25 14:35:12 -07:00
Andreas Huber
404cc418be Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder. 2009-08-25 14:26:05 -07:00
Robert Greenwalt
b06324a5c1 Fix the removal of dns entries. 
When switching default networks we should erase any excess dns server entries.  The old code
used the wrong index and didn't erase all of them properly.

Found in conjunction with
bug: 2077628
 2009-08-25 14:00:10 -07:00
johnwang
39fe8bdb62 am c3b64a41: am 4b474440: Merge change 22566 into eclair 
Merge commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7'

* commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7':
  Simplify CDMA Status Bar icons
 2009-08-25 13:44:18 -07:00
johnwang
c3b64a41d9 am 4b474440: Merge change 22566 into eclair 
Merge commit '4b474440cef8afa5e355a9406bb076af8e493ca7' into eclair-plus-aosp

* commit '4b474440cef8afa5e355a9406bb076af8e493ca7':
  Simplify CDMA Status Bar icons
 2009-08-25 13:42:02 -07:00
Android (Google) Code Review
4b474440ce Merge change 22566 into eclair 
* changes:
  Simplify CDMA Status Bar icons
 2009-08-25 13:39:34 -07:00
Jack Wang
49fba412e9 am d22f4d85: am c69a8807: Merge change 22109 into eclair 
Merge commit 'd22f4d856e049b33f86c93761a38046644688d90'

* commit 'd22f4d856e049b33f86c93761a38046644688d90':
  Fix bug 1546445: Correct spelling errors in API
 2009-08-25 12:50:39 -07:00
Jason Sams
29c5c2f6b5 am 5f090ccb: am 77f77f90: Merge change 22231 into eclair 
Merge commit '5f090ccb453f23e4df2507f90f3c1305aaab1f22'

* commit '5f090ccb453f23e4df2507f90f3c1305aaab1f22':
  Add support for selecting the color bit depth and if the application used a depth buffer.
 2009-08-25 12:50:36 -07:00
Jack Wang
d22f4d856e am c69a8807: Merge change 22109 into eclair 
Merge commit 'c69a8807f3aae255c9fe61c4f61bc1ebdd355543' into eclair-plus-aosp

* commit 'c69a8807f3aae255c9fe61c4f61bc1ebdd355543':
  Fix bug 1546445: Correct spelling errors in API
 2009-08-25 12:48:33 -07:00
Jason Sams
5f090ccb45 am 77f77f90: Merge change 22231 into eclair 
Merge commit '77f77f904a8cb13dc2cd921b253658072389e95f' into eclair-plus-aosp

* commit '77f77f904a8cb13dc2cd921b253658072389e95f':
  Add support for selecting the color bit depth and if the application used a depth buffer.
 2009-08-25 12:48:30 -07:00
Android (Google) Code Review
c69a8807f3 Merge change 22109 into eclair 
* changes:
  Fix bug 1546445: Correct spelling errors in API - InstrumentationTestCase.injectInsrumentation - AndroidTestRunner.setInstrumentaiton
 2009-08-25 12:47:11 -07:00
Jack Wang
7aba54b2ed Fix bug 1546445: Correct spelling errors in API 
- InstrumentationTestCase.injectInsrumentation
- AndroidTestRunner.setInstrumentaiton
 2009-08-25 12:44:56 -07:00
Android (Google) Code Review
77f77f904a Merge change 22231 into eclair 
* changes:
  Add support for selecting the color bit depth and if the application used a depth buffer.
 2009-08-25 12:41:37 -07:00
Cynthia Wong
426a89f9ba am a4490881: am 4025dbd9: Merge change 22618 into eclair 
Merge commit 'a4490881a367ab38b29bf3480c035c62974a81b3'

* commit 'a4490881a367ab38b29bf3480c035c62974a81b3':
  Only try to sync to subscribedfeeds for google acounts.
 2009-08-25 12:40:32 -07:00