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

1976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjorn Bringert
7ca4a171d2 am 5615d35b: Add tests for the new SQLite _TOKENIZE() \'tag\' column. 
Merge commit '5615d35b28119865cd65a79814a69f910e0a3862'

* commit '5615d35b28119865cd65a79814a69f910e0a3862':
  Add tests for the new SQLite _TOKENIZE() 'tag' column.
 2009-05-19 02:41:40 -07:00
Bjorn Bringert
5615d35b28 Add tests for the new SQLite _TOKENIZE() 'tag' column. 2009-05-19 09:53:38 +01:00
Scott Main
0aa1fbae1e am 51b22d74: am 221c9552: AI 148972: fix link to the installing guide to 1.5; fix a couple layout bugs in the document. BUG=1860640 
Merge commit '51b22d74a39ef7f6a3684a36bb48ace523e83413'

* commit '51b22d74a39ef7f6a3684a36bb48ace523e83413':
  AI 148972: fix link to the installing guide to 1.5;
 2009-05-19 01:19:23 -07:00
Ramanan Rajeswaran
aae9689733 am 3975fe3f: am 808f2919: AI 148962: Default language in Switzerland should be german and not english. 
Merge commit '3975fe3f21311e41b41e3a3e234a45ca24bed521'

* commit '3975fe3f21311e41b41e3a3e234a45ca24bed521':
  AI 148962: Default language in Switzerland should be german and not english.
 2009-05-19 01:19:23 -07:00
Android (Google) Code Review
ad8195bb0e am 2f11599e: Merge change 1579 into donut 
Merge commit '2f11599eb317887a8cca14d8e66bfc485e5169e7'

* commit '2f11599eb317887a8cca14d8e66bfc485e5169e7':
  Teleca 2b changes
 2009-05-19 01:19:18 -07:00
Android (Google) Code Review
8ba63601ab am 15e74b9d: Merge change 1939 into donut 
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'

* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
  Fix build breakage
  Revise the ImageButton class description to include information
  Record statistics about whether HTTP connections are reused.
 2009-05-19 01:19:15 -07:00
The Android Open Source Project
402b24c672 Merge commit '842a1f4b0beaacfaab940318fe19909e087aae81' 2009-05-19 01:17:36 -07:00
Android (Google) Code Review
f1f12f8cfc am 656a2726: Merge change 1910 into donut 
Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'

* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
  Update aapt badging for native code, configs, density, etc.
 2009-05-18 23:56:07 -07:00
Android (Google) Code Review
da8e33a57f am 1058c63b: Merge change 1909 into donut 
Merge commit '1058c63b262c838a57301fde59b04c9fa0ee1fdc'

* commit '1058c63b262c838a57301fde59b04c9fa0ee1fdc':
  Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
 2009-05-18 23:56:07 -07:00
Jeff Sharkey
470c1a8f39 am af999280: Change BIND_APPWIDGET to be signatureOrSystem. 
Merge commit 'af9992802992aaccfe1fb5893448939f215dd607'

* commit 'af9992802992aaccfe1fb5893448939f215dd607':
  Change BIND_APPWIDGET to be signatureOrSystem.
 2009-05-18 23:56:06 -07:00
Android (Google) Code Review
fd1879f779 am 6c256545: Merge change 1899 into donut 
Merge commit '6c25654573e45fa012078caef0a493c056cc0a26'

* commit '6c25654573e45fa012078caef0a493c056cc0a26':
  Fix the build
 2009-05-18 23:56:04 -07:00
Scott Main
51b22d74a3 am 221c9552: AI 148972: fix link to the installing guide to 1.5; fix a couple layout bugs in the document. BUG=1860640 
Merge commit '221c95526d3e3e23288478b6dd2d24b5ec7e97d5' into donut

* commit '221c95526d3e3e23288478b6dd2d24b5ec7e97d5':
  AI 148972: fix link to the installing guide to 1.5;
 2009-05-18 23:25:10 -07:00
Ramanan Rajeswaran
3975fe3f21 am 808f2919: AI 148962: Default language in Switzerland should be german and not english. 
Merge commit '808f2919ee9cd9ff678ef091da0c7b703c929003' into donut

* commit '808f2919ee9cd9ff678ef091da0c7b703c929003':
  AI 148962: Default language in Switzerland should be german and not english.
 2009-05-18 23:25:04 -07:00
Android (Google) Code Review
2f11599eb3 Merge change 1579 into donut 
* changes:
  Teleca 2b changes
 2009-05-18 22:26:25 -07:00
Wink Saville
e9b06d754a Teleca 2b changes 2009-05-18 21:47:50 -07:00
Android (Google) Code Review
15e74b9da8 Merge change 1939 into donut 
* changes:
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
 2009-05-18 19:34:33 -07:00
Brett Chabot
78a1c9067f Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out. 2009-05-18 19:15:09 -07:00
Android (Google) Code Review
9d16d2072b Merge change 1916 into donut 
* changes:
  Revise the ImageButton class description to include information about XML <selector> drawables, for managing button state.
 2009-05-18 17:03:24 -07:00
Android (Google) Code Review
704a6471a7 Merge change 1927 into donut 
* changes:
  Fix build breakage
 2009-05-18 16:56:56 -07:00
Daisuke Miyakawa
6e9610e1db Fix build breakage 2009-05-19 08:56:25 +09:00
Android (Google) Code Review
0dfe16dc46 Merge change 1891 into donut 
* changes:
  Record statistics about whether HTTP connections are reused.
 2009-05-18 16:51:53 -07:00
Scott Main
221c95526d AI 148972: fix link to the installing guide to 1.5; 
fix a couple layout bugs in the document.
  BUG=1860640

Automated import of CL 148972
 2009-05-18 16:29:41 -07:00
Android (Google) Code Review
842a1f4b0b Merge change 1912 into donut 
* changes:
  Hand merge from cupcake_dcm to donut, part 2.
 2009-05-18 16:29:27 -07:00
Daisuke Miyakawa
841ddefcb5 Hand merge from cupcake_dcm to donut, part 2. 
Modify Contacts-related java files and update vCard importer code to the latest.
 2009-05-19 08:26:32 +09:00
Romain Guy
0fef6f5c06 Fix build 2009-05-18 16:18:29 -07:00
Scott Main
84971ae010 Revise the ImageButton class description to include information 
about XML <selector> drawables, for managing button state.
 2009-05-18 16:05:52 -07:00
Android (Google) Code Review
656a2726ad Merge change 1910 into donut 
* changes:
  Update aapt badging for native code, configs, density, etc.
 2009-05-18 15:38:34 -07:00
Dianne Hackborn
bb9ea30ea9 Update aapt badging for native code, configs, density, etc. 2009-05-18 15:22:00 -07:00
Android (Google) Code Review
1058c63b26 Merge change 1909 into donut 
* changes:
  Fixed IndexOutofBoundException, improved how memory information is captured (run GC first)
 2009-05-18 15:18:17 -07:00
Guang Zhu
2a197b128a Fixed IndexOutofBoundException, improved how memory information is captured (run GC first) 2009-05-18 14:37:23 -07:00
Jeff Sharkey
af99928029 Change BIND_APPWIDGET to be signatureOrSystem. 
See http://b/issue?id=1839074 for more details.
 2009-05-18 14:35:49 -07:00
Ramanan Rajeswaran
808f2919ee AI 148962: Default language in Switzerland should be german and not english. 
Automated import of CL 148962
 2009-05-18 14:20:06 -07:00
Android (Google) Code Review
6c25654573 Merge change 1899 into donut 
* changes:
  Fix the build
 2009-05-18 14:12:22 -07:00
Android (Google) Code Review
bd4e7f8ae2 am a0068514: Merge change 1894 into donut 
Merge commit 'a0068514e7c60252a96fa7907ff976bef46b4c40'

* commit 'a0068514e7c60252a96fa7907ff976bef46b4c40':
  libGLESv1_CM.so doesn't need to depend on libutils or libui
 2009-05-18 14:09:00 -07:00
Android (Google) Code Review
a0068514e7 Merge change 1894 into donut 
* changes:
  libGLESv1_CM.so doesn't need to depend on libutils or libui
 2009-05-18 14:07:21 -07:00
Romain Guy
2cad06f262 Fix the build 2009-05-18 14:06:43 -07:00
Romain Guy
70f0537762 am 9da06a4e: Fixes external #2686. Fix typo. 
Merge commit '9da06a4e2e16c3cd59720cf7848500683a48ed5a'

* commit '9da06a4e2e16c3cd59720cf7848500683a48ed5a':
  Fixes external #2686. Fix typo.
 2009-05-18 14:02:14 -07:00
The Android Open Source Project
9c57fbc252 merge 9a7773a450e384bbc87b0204f9f0e49ec48de879 w/conflicts 2009-05-18 14:00:41 -07:00
Romain Guy
9da06a4e2e Fixes external #2686. Fix typo. 2009-05-18 13:54:34 -07:00
Android (Google) Code Review
9a7773a450 Merge change 1875 into donut 
* changes:
  Fixes external #2669. Clarify the documentation of the XML attributes android:gravity and android:layout_gravity.
 2009-05-18 13:52:06 -07:00
Android (Google) Code Review
d6fe98e888 am 7e4c3432: Merge change 1881 into donut 
Merge commit '7e4c34329c98fc4279d658387b65ef4d041872a8'

* commit '7e4c34329c98fc4279d658387b65ef4d041872a8':
  WifiService: Wifi power management change
 2009-05-18 13:44:36 -07:00
Suchi Amalapurapu
ccee782cda am d1a93373: Add a new window flag to display a window when keyguard is shown. 
Merge commit 'd1a9337380cf9f40f1aa095457b11242d483295d'

* commit 'd1a9337380cf9f40f1aa095457b11242d483295d':
  Add a new window flag to display a window when keyguard is shown.
 2009-05-18 13:44:35 -07:00
Mathias Agopian
b7b648f367 libGLESv1_CM.so doesn't need to depend on libutils or libui 2009-05-18 13:42:18 -07:00
Android (Google) Code Review
7e4c34329c Merge change 1881 into donut 
* changes:
  WifiService: Wifi power management change
 2009-05-18 13:17:38 -07:00
Mike Lockwood
d9c32bc838 WifiService: Wifi power management change 
Put Wifi into an idle state immediately if the screen is turned off and the Wifi interface has no IP address.
We will continue to keep Wifi up for 15 minutes in the case where the screen is turned off when Wifi is fully connected.
This will allow us to go into a low power mode faster when Wifi is not actively being used.
It also avoids bringing up Wifi if the user just turns on the screen for a few seconds to check the clock, etc.

Fixes bug b/1736920

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-05-18 15:54:16 -04:00
Dan Egnor
ec144d6553 Record statistics about whether HTTP connections are reused. 2009-05-18 12:35:09 -07:00
Suchi Amalapurapu
d1a9337380 Add a new window flag to display a window when keyguard is shown. 2009-05-18 10:47:24 -07:00
Romain Guy
924dd93a29 Fixes external #2669. Clarify the documentation of the XML attributes android:gravity and android:layout_gravity. 2009-05-18 10:43:55 -07:00
Android (Google) Code Review
e9e95e6f8e am 3a00d763: Merge change 1866 into donut 
Merge commit '3a00d763dfb22982987e08f4c8751fe68451ed0d'

* commit '3a00d763dfb22982987e08f4c8751fe68451ed0d':
  remove unused ContentResolver parameter from IntentResolver.queryIntent.
 2009-05-18 10:39:02 -07:00
Android (Google) Code Review
3a00d763df Merge change 1866 into donut 
* changes:
  remove unused ContentResolver parameter from IntentResolver.queryIntent.
 2009-05-18 10:37:26 -07:00