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

7112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Storsjo
08d410bfe6 am 085e2c91: am 09f4c942: Merge change 22710 into eclair 
Merge commit '085e2c912a8cc677e31da48250130d90c0af5c32'

* commit '085e2c912a8cc677e31da48250130d90c0af5c32':
  Calculate specular lighting correctly
 2009-08-25 18:39:30 -07:00
Martin Storsjo
aa8806f69a am 899b6a07: am 22874300: Merge change 22709 into eclair 
Merge commit '899b6a07d133640d0faf40e0af976eab3600c403'

* commit '899b6a07d133640d0faf40e0af976eab3600c403':
  If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
 2009-08-25 18:39:26 -07:00
Martin Storsjo
085e2c912a am 09f4c942: Merge change 22710 into eclair 
Merge commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992' into eclair-plus-aosp

* commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992':
  Calculate specular lighting correctly
 2009-08-25 18:38:21 -07:00
Martin Storsjo
899b6a07d1 am 22874300: Merge change 22709 into eclair 
Merge commit '228743001721e5b167d393523ad35d78ba965195' into eclair-plus-aosp

* commit '228743001721e5b167d393523ad35d78ba965195':
  If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
 2009-08-25 18:38:17 -07:00
Android (Google) Code Review
09f4c94233 Merge change 22710 into eclair 
* changes:
  Calculate specular lighting correctly
 2009-08-25 18:36:47 -07:00
Android (Google) Code Review
2287430017 Merge change 22709 into eclair 
* changes:
  If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
 2009-08-25 18:36:22 -07:00
Dmitri Plotnikov
fde0a6e124 am d30866fb: am 22e2aaaa: Merge change 22656 into eclair 
Merge commit 'd30866fba31034bc72420506287390d4c347353e'

* commit 'd30866fba31034bc72420506287390d4c347353e':
  Adding an aggregation mode: AGGREGATION_SUSPENDED
 2009-08-25 18:36:02 -07:00
Martin Storsjo
c0dea96491 Calculate specular lighting correctly 
Since the lighting calculations are done in object space, the vector
from the object to the viewer also needs to be transformed to object
space.
 2009-08-25 18:35:54 -07:00
Martin Storsjo
4f31af9346 If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport. 2009-08-25 18:35:03 -07:00
Dmitri Plotnikov
d30866fba3 am 22e2aaaa: Merge change 22656 into eclair 
Merge commit '22e2aaaa5cb465679320e1027240d5150f574706' into eclair-plus-aosp

* commit '22e2aaaa5cb465679320e1027240d5150f574706':
  Adding an aggregation mode: AGGREGATION_SUSPENDED
 2009-08-25 18:34:53 -07:00
Android (Google) Code Review
22e2aaaa5c Merge change 22656 into eclair 
* changes:
  Adding an aggregation mode: AGGREGATION_SUSPENDED
 2009-08-25 18:33:13 -07:00
Fred Quintana
361ed21177 am 381bc383: am 16c758fb: Merge change 22702 into eclair 
Merge commit '381bc38355ae05efee92d369076b3228969c0e1d'

* commit '381bc38355ae05efee92d369076b3228969c0e1d':
  run the sync thread at background priority
 2009-08-25 17:46:11 -07:00
Fred Quintana
381bc38355 am 16c758fb: Merge change 22702 into eclair 
Merge commit '16c758fb156cc8184e9c3ace7aa4717af4bb05ea' into eclair-plus-aosp

* commit '16c758fb156cc8184e9c3ace7aa4717af4bb05ea':
  run the sync thread at background priority
 2009-08-25 17:44:08 -07:00
Android (Google) Code Review
16c758fb15 Merge change 22702 into eclair 
* changes:
  run the sync thread at background priority
 2009-08-25 17:42:26 -07:00
Jeff Sharkey
a5cc0b7257 am 77a2bc56: am 534aa012: Mark all legacy contacts APIs as deprecated. 
Merge commit '77a2bc56d09242b3e358308641d8f0bb1c184eb2'

* commit '77a2bc56d09242b3e358308641d8f0bb1c184eb2':
  Mark all legacy contacts APIs as deprecated.
 2009-08-25 17:33:45 -07:00
Jeff Sharkey
77a2bc56d0 am 534aa012: Mark all legacy contacts APIs as deprecated. 
Merge commit '534aa012b5063abeaa36b9ade69851add8b7a48f' into eclair-plus-aosp

* commit '534aa012b5063abeaa36b9ade69851add8b7a48f':
  Mark all legacy contacts APIs as deprecated.
 2009-08-25 17:32:43 -07:00
Jeff Sharkey
534aa012b5 Mark all legacy contacts APIs as deprecated. 
Now that we've merged ContactsContract and are relying on
compatibility mode, we're marking the previous public
contacts API as deprecated.

Fixes http://b/2076016
 2009-08-25 17:27:15 -07:00
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
Dmitri Plotnikov
5223b1668a Adding an aggregation mode: AGGREGATION_SUSPENDED 2009-08-25 15:15:06 -07:00
Fred Quintana
75d797c2e7 run the sync thread at background priority 2009-08-25 15:05:02 -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