Commit Graph

2395 Commits

Author SHA1 Message Date
Eric Fischer
68dbdd4d47 AI 145782: Import updated translations.
DO NOT MERGE

Automated import of CL 145782
2009-04-10 16:38:00 -07:00
Andy Stadler
f8a7ceaef2 AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Mathias Agopian
0179ff6594 Merge commit 'goog/master' into master_gl
Conflicts:
	libs/utils/Parcel.cpp
2009-04-10 14:36:33 -07:00
Mathias Agopian
1473f46cbc Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
Eric Fischer
d7e4475898 AI 145711: Import a few changed translations.
DO NOT MERGE

Automated import of CL 145711
2009-04-10 10:45:19 -07:00
Dianne Hackborn
1c004f0ae1 AI 145561: Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive).
BUG=1710534

Automated import of CL 145561
2009-04-09 16:26:49 -07:00
Eric Fischer
af64013eca Merge branch 'readonly-p4-master' 2009-04-09 14:33:10 -07:00
Eric Fischer
2dcaf4ee66 AI 145493: am: CL 145214 Update cupcake translations.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 145493
2009-04-09 14:32:41 -07:00
Eric Fischer
580b13017e AI 145500: am: CL 145493 am: CL 145214 Update cupcake translations.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145500
2009-04-09 14:31:52 -07:00
Dianne Hackborn
d6cbabfa77 AI 145384: API review: these didn't specify a protection level.
I realized that the package parse is not requiring android:protectionLevel on a permission, even though it was intended to do that.  As a result, some new permissions slipped by without specifying it.  Now they do.  Also the mock providers is marked as dangerous, so the user will be informed of it (normal apps should never request it).
  In the next release we can fix this to always require the protection level.
  BUG=1780749

Automated import of CL 145384
2009-04-09 12:34:01 -07:00
Dianne Hackborn
5eabbd9f27 AI 145382: API review: change new media keycode names to avoid ambiguity.
Updates the key maps.  During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...!  So this is now changed to match.
  BUG=1779435

Automated import of CL 145382
2009-04-09 12:31:13 -07:00
Fred Quintana
0c9c41255e Merge branch 'readonly-p4-master' 2009-04-08 19:16:09 -07:00
Fred Quintana
a698f42769 AI 145177: phase two of the AccountManager
- added an AccountManagerActivity, a base Activity that can be
  used by activities that are launched by AccountAuthenticator
  intents. This makes it easy for an Activity to send a result
  using an AccountAuthenticatorResponse
  - added debug strings to the AccountAuthenticatorCache
  - improved the API for the AccountAuthenticatorResponse and
  made it Parcelable so that it can be passed to an Activity
  via an Intent
  - changed the AccountManager to use Futures for the
  asynchronous calls and to notify the user via a callback
  when the request is complete
  - changed the AccountManager to convert any errors that are
  returned into Exceptions
  - added constants for the error codes that are passed across
  the IAccountManagerResponse and
  IAccountAuthenticatorResponse interfaces
  - added a dump() method to the AccountManagerService so that
  it can display the list of active sessions and registered
  authenticators
  - added an way to interrogate the AccountManagerService for
  the list of registered authenticators
  - removed more methods from the GoogleLoginServiceHelper and
  GoogleLoginServiceBlockingHelper and changed the callers to
  use the AccountManager

Automated import of CL 145177
2009-04-08 19:14:54 -07:00
Eric Fischer
9bfc99a308 AI 145225: Import more revised translations into cupcake.
Automated import of CL 145225
2009-04-08 18:43:27 -07:00
Eric Fischer
e5af939c8e AI 145214: Update cupcake translations.
Automated import of CL 145214
2009-04-08 15:59:35 -07:00
Eric Fischer
a44a28d358 Merge branch 'readonly-p4-master' 2009-04-08 00:31:50 -07:00
Eric Fischer
43f3693035 AI 144913: am: CL 144912 Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
  Import a bunch of revised translations.
  Original author: enf

Automated import of CL 144913
2009-04-08 00:30:38 -07:00
Eric Fischer
bb4de4bcbe AI 144977: Import revised translations.
DO NOT MERGE

Automated import of CL 144977
2009-04-07 18:15:15 -07:00
Eric Fischer
374c83f420 AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
  Import a bunch of revised translations.

Automated import of CL 144912
2009-04-07 13:55:05 -07:00
Eric Fischer
f845cd4f23 AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
2009-04-07 11:48:29 -07:00
Wink Saville
ae0afc6d90 Merge branch 'readonly-p4-master' 2009-04-06 15:24:36 -07:00
Wink Saville
6ec9a7d55d AI 144706: am: CL 144705 Teleca patch from 03/27/2009, fixes some CDMA issues.
Original author: wink

Automated import of CL 144706
2009-04-06 15:23:24 -07:00
Wink Saville
d6c5d527d3 AI 144705: Teleca patch from 03/27/2009, fixes some CDMA issues.
Automated import of CL 144705
2009-04-06 15:20:45 -07:00
Mike Lockwood
508cbf2241 Merge branch 'readonly-p4-master' 2009-04-03 09:49:06 -07:00
Mike Lockwood
d9c0df1d3e AI 144460: am: CL 144459 Add "tty" to the status bar to fix the StatusBarService.
BUG=1761602
  Original author: lockwood

Automated import of CL 144460
2009-04-03 09:47:54 -07:00
Mike Lockwood
80e1212977 AI 144459: Add "tty" to the status bar to fix the StatusBarService.
BUG=1761602

Automated import of CL 144459
2009-04-03 09:46:32 -07:00
Eric Fischer
c7a654f3fa Merge branch 'readonly-p4-master' 2009-04-02 23:40:06 -07:00
Eric Fischer
75e3034a35 AI 144414: am: CL 144347 Reimport es_US translations in an attempt to fix the build.
Original author: enf

Automated import of CL 144414
2009-04-02 23:38:59 -07:00
Eric Fischer
656ff983a9 Merge branch 'readonly-p4-master' 2009-04-02 23:32:28 -07:00
Eric Fischer
77db3fc025 AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144411
2009-04-02 23:31:17 -07:00
Eric Fischer
1015b379bc AI 144355: Automated g4 rollback of changelist 144335.
*** Reason for rollback ***
  Roll back US Spanish import because it made the build too big.
  *** Original change description ***
  Import US Spanish translations, and a few Japanese changes.

Automated import of CL 144355
2009-04-02 21:42:04 -07:00
Eric Fischer
f80f5d02ed AI 144347: Reimport es_US translations in an attempt to fix the build.
Automated import of CL 144347
2009-04-02 17:15:43 -07:00
Eric Fischer
2a3ce28251 AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 144336
2009-04-02 16:42:13 -07:00
Eric Fischer
0c65631515 AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
2009-04-02 16:39:20 -07:00
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master'
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
2009-04-02 12:18:20 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Daisuke Miyakawa
506e0078b2 Merge branch 'readonly-p4-master' 2009-04-02 10:45:40 -07:00
Daisuke Miyakawa
eb3e3e368a AI 144210: am: CL 144182 am: CL 144181 Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  Original author: dmiyakawa
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144210
2009-04-02 10:44:31 -07:00
Wink Saville
767a662ecd AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Daisuke Miyakawa
e9c08056fa AI 144182: am: CL 144181 Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  Original author: dmiyakawa
  Merged from: //branches/cupcake/...

Automated import of CL 144182
2009-04-02 01:34:15 -07:00
Daisuke Miyakawa
196677cf8c AI 144181: Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  BUG=1748136,1612476

Automated import of CL 144181
2009-04-01 19:14:59 -07:00
The Android Open Source Project
caee1703fe Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:25 -07:00
Robert Greenwalt
88b861c8a6 AI 143900: am: CL 143898 Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
  Uses a core system resource string-array to contain the mapping
  of carrier ID -> default locale.  This should be set per project in
  an overlay.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...

Automated import of CL 143900
2009-03-31 18:04:05 -07:00
Robert Greenwalt
8696e0156c AI 143902: am: CL 143900 am: CL 143898 Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
  Uses a core system resource string-array to contain the mapping
  of carrier ID -> default locale.  This should be set per project in
  an overlay.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143902
2009-03-31 18:02:21 -07:00
Robert Greenwalt
f05a98cbff AI 143898: Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
  Uses a core system resource string-array to contain the mapping
  of carrier ID -> default locale.  This should be set per project in
  an overlay.
  BUG=1731384

Automated import of CL 143898
2009-03-31 18:00:50 -07:00
Eric Fischer
dd5ebe0c5b AI 143712: am: CL 143685 am: CL 143547 Import revised translations.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143712
2009-03-31 14:20:40 -07:00
Eric Fischer
a7533b96bf AI 143685: am: CL 143547 Import revised translations.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 143685
2009-03-31 11:11:16 -07:00
Eric Fischer
631cf99982 AI 143547: Import revised translations.
BUG=1738388

Automated import of CL 143547
2009-03-30 15:52:26 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
2009-03-29 08:55:27 -07:00
Dianne Hackborn
2f3473798b AI 143255: Integrate.
Automated import of CL 143255
2009-03-27 20:14:13 -07:00