Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
504 Commits 3 Branches 0 Tags
be42388bdb7acdc5ddcfa1f9e896af96e5259485
Commit Graph

92 Commits

Author SHA1 Message Date
Dianne Hackborn
81ddb7929f Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dianne Hackborn
b3cddae499 AI 146011: am: CL 145859 am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive). 
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146011
 2009-04-13 16:54:00 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut. 
Automated import of CL 145994
 2009-04-13 16:11:55 -07:00
Eric Fischer
af64013eca Merge branch 'readonly-p4-master' 2009-04-09 14:33:10 -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
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
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
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
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
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
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
The Android Open Source Project
caee1703fe Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:25 -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
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
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
Jean-Baptiste Queru
1b683a4104 AI 143391: Merge from donut Change 143255 
Automated import of CL 143391
 2009-03-27 19:49:17 -07:00
Karl Rosaen
c61d318e8f AI 143377: am: CL 143227 am: CL 143046 Add extra pixel on right and left in 9 patch for expanders to fix padding problem 
Original author: krosaen
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143377
 2009-03-27 19:34:33 -07:00
Dianne Hackborn
5e152c185e AI 143354: am: CL 143203 am: CL 142986 Work on issue #1739922 (Removed unused resources). We don't seem to use these. 
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143354
 2009-03-27 19:07:32 -07:00
The Android Open Source Project
b41349409b Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -07:00
Jean-Baptiste Queru
bf62297bd1 AI 143296: Merge from donut Change 143147 
Automated import of CL 143296
 2009-03-27 17:43:53 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake' 
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
 2009-03-27 15:38:40 -07:00
Dianne Hackborn
499e098f0c AI 143101: Fix issue # 1741546 (Put back private resources used by maps.) 
BUG=1741546

Automated import of CL 143101
 2009-03-27 09:53:15 -07:00
Karl Rosaen
3f2fd987b2 Automated import from //branches/cupcake/...@143046,143046 2009-03-26 19:20:36 -07:00
Dianne Hackborn
f473433e4d Automated import from //branches/cupcake/...@142986,142986 2009-03-26 14:39:43 -07:00
Dianne Hackborn
73fbd70263 Automated import from //branches/cupcake/...@142829,142829 2009-03-25 18:37:33 -07:00
Eric Fischer
fea44a0cc2 Automated import from //branches/master/...@142759,142759 2009-03-25 16:13:51 -07:00
Raphael Moll
0704009786 Automated import from //branches/master/...@142746,142746 2009-03-25 15:58:47 -07:00
Karl Rosaen
c06a594d85 Automated import from //branches/master/...@142737,142737 2009-03-25 15:49:02 -07:00
Eric Fischer
b784f21c2b Automated import from //branches/cupcake/...@142643,142643 2009-03-25 15:22:43 -07:00
Dianne Hackborn
15ba27802e Automated import from //branches/master/...@142576,142576 2009-03-25 15:09:04 -07:00
Romain Guy
9c802c1e95 Automated import from //branches/master/...@142575,142575 2009-03-25 15:07:31 -07:00
Raphael Moll
038ab06d64 Automated import from //branches/cupcake/...@142588,142588 2009-03-25 15:06:08 -07:00
Jean-Baptiste Queru
8b0662878e Automated import from //branches/master/...@142574,142574 2009-03-25 15:05:51 -07:00
Karl Rosaen
25e6bb073e Automated import from //branches/cupcake/...@142558,142558 2009-03-25 09:46:56 -07:00
Fred Quintana
603073430b Automated import from //branches/master/...@142414,142414 2009-03-24 22:48:12 -07:00
Eric Fischer
1711c06dd0 Automated import from //branches/master/...@141869,141869 2009-03-24 21:06:32 -07:00
Mathias Agopian
db9540e7b3 Automated import from //branches/master/...@141533,141533 2009-03-24 20:29:58 -07:00
Eric Fischer
45c3ce585f Automated import from //branches/master/...@141530,141530 2009-03-24 20:29:22 -07:00
Romain Guy
58cd82b486 Automated import from //branches/master/...@141527,141527 2009-03-24 20:28:52 -07:00