Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,881 Commits 3 Branches 0 Tags
104f8053370f9e01ac2e8e23bc31d128e5fcc00b
Commit Graph

253881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
bf8e6feb0b am 222f079: am b78c31d: AI 148147: Import lots of zh_TW translation chan 
Merge commit '222f079a6e180ed20a73d001d26262ee2cbf5ea3'

* commit '222f079a6e180ed20a73d001d26262ee2cbf5ea3':
  AI 148147: Import lots of zh_TW translation changes.
 2009-04-30 18:12:47 -07:00
The Android Open Source Project
3500f016bf Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut 2009-04-30 17:59:19 -07:00
Android (Google) Code Review
dc30119c12 Merge change 842 into donut 
* changes:
  Fixes #1712631. Whenever a View loses focus/selection, reset its pressed state.
 2009-04-30 17:58:28 -07:00
Romain Guy
a2431d0ba2 Fixes #1712631. Whenever a View loses focus/selection, reset its pressed state. 2009-04-30 17:57:47 -07:00
Eric Fischer
222f079a6e am b78c31d: AI 148147: Import lots of zh_TW translation changes. 
Merge commit 'b78c31d0644a9d91fdf705db4b39865f495287be' into donut

* commit 'b78c31d0644a9d91fdf705db4b39865f495287be':
  AI 148147: Import lots of zh_TW translation changes.
 2009-04-30 17:37:21 -07:00
Eric Fischer
b78c31d064 AI 148147: Import lots of zh_TW translation changes. 
Automated import of CL 148147
 2009-04-30 17:32:14 -07:00
Android (Google) Code Review
f7911a227c Merge change 804 
* changes:
  decouple SyncAdapter from ContentProvider
 2009-04-30 17:28:41 -07:00
Fred Quintana
718d8a2d7f decouple SyncAdapter from ContentProvider 2009-04-30 17:28:09 -07:00
Eric Fischer
7fd4b44012 am a4d8e5c: am f8a33c3: AI 148026: Update zh_TW translations. 
Merge commit 'a4d8e5ce72a299d09b40fe835ee0ec889123a256'

* commit 'a4d8e5ce72a299d09b40fe835ee0ec889123a256':
  AI 148026: Update zh_TW translations.
 2009-04-30 17:24:17 -07:00
Eric Fischer
21eef98715 am c27eaa4: am 0ca686b: AI 148020: Restore accidentally-deleted zh_CN an 
Merge commit 'c27eaa45fdfca8e0b3f78a80a37ce3f49c1b396b'

* commit 'c27eaa45fdfca8e0b3f78a80a37ce3f49c1b396b':
  AI 148020: Restore accidentally-deleted zh_CN and zh_TW map centers.
 2009-04-30 17:24:17 -07:00
Eric Fischer
a4d8e5ce72 am f8a33c3: AI 148026: Update zh_TW translations. 
Merge commit 'f8a33c313f93896115d81b4f14adbb7628aa5d93' into donut

* commit 'f8a33c313f93896115d81b4f14adbb7628aa5d93':
  AI 148026: Update zh_TW translations.
 2009-04-30 17:10:27 -07:00
Eric Fischer
c27eaa45fd am 0ca686b: AI 148020: Restore accidentally-deleted zh_CN and zh_TW map 
Merge commit '0ca686b57ea11fa701be8ccaff22cb4b75c9d695' into donut

* commit '0ca686b57ea11fa701be8ccaff22cb4b75c9d695':
  AI 148020: Restore accidentally-deleted zh_CN and zh_TW map centers.
 2009-04-30 17:10:27 -07:00
Android (Google) Code Review
90b6abd839 am 2bc9e13: Merge change 841 into donut 
Merge commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd'

* commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd':
  TypedProperties: add getStringInfo() to help deal with null strings
 2009-04-30 17:03:26 -07:00
Android (Google) Code Review
8790948583 am 52a3cb5: Merge change 840 into donut 
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9'

* commit '52a3cb53ddcce049d2e804c3042514df576cb5b9':
  TypedProperties: change the file format to be a subset of Java
 2009-04-30 17:03:26 -07:00
Android (Google) Code Review
171fd53213 am 2cd006c: Merge change 837 into donut 
Merge commit '2cd006c8f927d3e364c32f946b844377bdc56d3e'

* commit '2cd006c8f927d3e364c32f946b844377bdc56d3e':
  Make the home screen come up in the simulator.
 2009-04-30 17:03:26 -07:00
Android (Google) Code Review
4ba120d2ce am 980d12b: Merge change 838 into donut 
Merge commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c'

* commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c':
  Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
 2009-04-30 17:03:25 -07:00
Marco Nelissen
c1ebff063a am d859331: Don\'t crash when /proc/wakelocks can\'t be opened. Might make 
Merge commit 'd8593312296fd2193a070c1a074840d83b7f49cb'

* commit 'd8593312296fd2193a070c1a074840d83b7f49cb':
  Don't crash when /proc/wakelocks can't be opened. Might make board bringup easier.
 2009-04-30 17:03:25 -07:00
Eric Fischer
f8a33c313f AI 148026: Update zh_TW translations. 
Automated import of CL 148026
 2009-04-30 16:48:33 -07:00
Eric Fischer
0ca686b57e AI 148020: Restore accidentally-deleted zh_CN and zh_TW map centers. 
BUG=1794855

Automated import of CL 148020
 2009-04-30 16:45:37 -07:00
Android (Google) Code Review
2bc9e13965 Merge change 841 into donut 
* changes:
  TypedProperties: add getStringInfo() to help deal with null strings
 2009-04-30 16:31:00 -07:00
Android (Google) Code Review
52a3cb53dd Merge change 840 into donut 
* changes:
  TypedProperties: change the file format to be a subset of Java
 2009-04-30 16:30:14 -07:00
Android (Google) Code Review
2cd006c8f9 Merge change 837 into donut 
* changes:
  Make the home screen come up in the simulator.
 2009-04-30 15:39:47 -07:00
Android (Google) Code Review
980d12b13b Merge change 838 into donut 
* changes:
  Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
 2009-04-30 15:35:28 -07:00
Jaikumar Ganesh
2a34043d55 Add RIL_UNSOL_OEM_HOOK_RAW. 
Add RIL_UNSOL_OEM_HOOK_RAW for OEMs to send Unsolicitied
commands from the baseband.
 2009-04-30 15:33:43 -07:00
Romain Guy
8a342a3cc0 Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer. 2009-04-30 15:31:41 -07:00
Marco Nelissen
54796e7405 Make the home screen come up in the simulator. 2009-04-30 15:16:30 -07:00
Marco Nelissen
d859331229 Don't crash when /proc/wakelocks can't be opened. Might make board bringup easier. 
Verified with simulator, which doesn't have /proc/wakelocks
 2009-04-30 14:48:49 -07:00
Mathias Agopian
fa6eda01a9 Merge commit 'goog/master' into merge_master 
Conflicts:
	libs/surfaceflinger/Layer.cpp
	libs/surfaceflinger/SurfaceFlinger.cpp
	opengl/libagl/egl.cpp
	opengl/libs/EGL/egl.cpp
	opengl/libs/GLES_CM/gl.cpp
	opengl/libs/GLES_CM/gl_api.in
	opengl/libs/gl_entries.in
	opengl/libs/tools/glapigen
 2009-04-30 14:43:18 -07:00
Android (Google) Code Review
072868a4d3 am 3674252: Merge change 817 into donut 
Merge commit '36742528f89fd13e65c8652cc684cffc9e97b567'

* commit '36742528f89fd13e65c8652cc684cffc9e97b567':
  Hide the backup stuff for now
 2009-04-30 13:14:48 -07:00
Android (Google) Code Review
36742528f8 Merge change 817 into donut 
* changes:
  Hide the backup stuff for now
 2009-04-30 12:43:33 -07:00
Christopher Tate
c114eb55b4 Hide the backup stuff for now 
Also adjust based on comments:
+ changed service intent string to conform to usage guidelines
+ only publish the IBackupService binder when invoked with the right
  intent action
+ docs tweaks
 2009-04-30 12:40:19 -07:00
Mike Lockwood
245eb108d5 am c21a08f: gps: Fix missing return value in android_location_GpsLocatio 
Merge commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0'

* commit 'c21a08f747f6fd1d7b8c98176ff70abc57cf58a0':
  gps: Fix missing return value in android_location_GpsLocationProvider_init
 2009-04-30 12:34:13 -07:00
Android (Google) Code Review
171134a0e2 am 021dce4: Merge change 811 into donut 
Merge commit '021dce4198afbf602109ba5807a193c437b05361'

* commit '021dce4198afbf602109ba5807a193c437b05361':
  Add android.backup.BackupManager
 2009-04-30 12:34:10 -07:00
Mike Lockwood
c21a08f747 gps: Fix missing return value in android_location_GpsLocationProvider_init 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-30 15:17:49 -04:00
Android (Google) Code Review
021dce4198 Merge change 811 into donut 
* changes:
  Add android.backup.BackupManager
 2009-04-30 11:38:54 -07:00
Christopher Tate
a8bf815c61 Add android.backup.BackupManager 
Also tweak the dataChanged() api to have the client supply a package name.  We
don't necessarily TRUST this, but we use it to narrow the set of packages requesting
a backup pass, no longer blithely scheduling a pass for all packages associated
with the caller's uid.
 2009-04-30 11:36:21 -07:00
Android (Google) Code Review
60c8b8e48b am a039d46: Merge change 792 into donut 
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'

* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
  Allow access to global search by pressing the hard search button again
 2009-04-30 11:00:07 -07:00
Android (Google) Code Review
a039d465a8 Merge change 792 into donut 
* changes:
  Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
 2009-04-30 10:07:39 -07:00
Mike LeBeau
b3aab69581 Allow access to global search by pressing the hard search button again 
within in-app search. If within in-app search and toggled out to global
search, pressing the hard search button will take the user *back* into
in-app search too.
 2009-04-30 09:45:53 -07:00
Ben Murdoch
7df1985e86 Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the browser. 2009-04-30 13:46:01 +01:00
android-build SharedAccount
4ed7c18f91 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-04-30 00:26:40 -07:00
android-build SharedAccount
d2d9cd0a9b fix the build 2009-04-30 00:25:53 -07:00
Dan Bornstein
e080b55eab am 5fcfcd0: am b4c218e: AI 147994: First cut of CharsetUtils, a utility 
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'

* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
  AI 147994: First cut of CharsetUtils, a utility class that aims to
 2009-04-30 00:02:27 -07:00
Dan Bornstein
5fcfcd0f34 am b4c218e: AI 147994: First cut of CharsetUtils, a utility class that a 
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut

* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
  AI 147994: First cut of CharsetUtils, a utility class that aims to
 2009-04-29 23:31:38 -07:00
Mitsuru Oshima
453a34f62b am d4ed049: Merge branch \'readonly-p4-donut\' into donut 
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'

* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
  AI 148024: fix NPE when there is no history
 2009-04-29 23:20:11 -07:00
android-build SharedAccount
bb15b1cb33 fixed two stray merge issues 2009-04-29 19:48:59 -07:00
Mitsuru Oshima
d4ed049672 Merge branch 'readonly-p4-donut' into donut 2009-04-29 17:15:14 -07:00
Mitsuru Oshima
dffbb4dbce AI 148024: fix NPE when there is no history 
Automated import of CL 148024
 2009-04-29 17:13:46 -07:00
Dave Bort
4b0ebef18d TypedProperties: add getStringInfo() to help deal with null strings 
Signed-off-by: Dave Bort <dbort@android.com>
 2009-04-29 17:09:56 -07:00
Dave Bort
5b6f8d865d TypedProperties: change the file format to be a subset of Java 
Types and constants are now case-sensitive.
Types come first.
Newlines are ignored, but semicolons are required.
Comments are now Java-style, not sh-style.
unset() now looks like a method instead of a pseudotype.

Signed-off-by: Dave Bort <dbort@android.com>
 2009-04-29 17:08:08 -07:00