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

1492 Commits

Author SHA1 Message Date
Konstantin Lopyrev
f9a166ab82 Fix 2571872: Showing an error message on wrong password/pin entered. 
Change-Id: I78463112326ebd1ac7d43d083e22d506518e84fd
 2010-06-01 17:00:47 -07:00
Shimeng (Simon) Wang
06c40631ff Merge "Add English hyphenation dictionary into frameworks/base asset." 2010-06-01 10:05:47 -07:00
Shimeng (Simon) Wang
bcf8591c85 Add English hyphenation dictionary into frameworks/base asset. 
issue: 2672163
Change-Id: Idf3ff164f41ae95448519b14666f03fb59dada97
 2010-05-28 16:25:08 -07:00
Amith Yamasani
9bd8034a1a Fix a comment typo. 2010-05-27 11:31:26 -07:00
Amith Yamasani
8b932067c1 Merge "Add a battery capacity value to the power profile." 2010-05-27 10:49:08 -07:00
Amith Yamasani
bed865932f Add a battery capacity value to the power profile. 
Can be accessed through PowerProfile.getBatteryCapacity()

Individual device profiles need to be updated with their capacities.
 2010-05-27 10:37:54 -07:00
Steve Block
6f48790cb1 Merge "Merge WebKit at r60074: Update UA string" 2010-05-27 03:27:08 -07:00
Jim Miller
5ee2a771b5 am 14f56a0b: am b35cd7dd: Merge "Fix 2667859: change text back to default size" into kraken 2010-05-26 11:42:33 -07:00
Steve Block
c9946d5bde Merge WebKit at r60074: Update UA string 
Change-Id: I9d42c86f20f917ef7799169b3e34149bfc630f5d
 2010-05-26 12:32:08 +01:00
Jim Miller
bae698cd54 Fix 2667859: change text back to default size 
This reverts a change described in the above bug where
the font size got changed to 22dip.

Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
 2010-05-25 16:53:45 -07:00
Kristian Monsen
02263fd2f0 Merge WebKit at r59636: Update UA string 
Change-Id: Ic5b0a03ad53f2e81f5aeb6e32b2f92902b83fdb2
 2010-05-25 11:11:57 +01:00
Daniel Sandler
8c8634b514 am c8a041f1: am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken 2010-05-24 05:49:05 -07:00
Daniel Sandler
2c195f77a1 New shadowy status bar, direct from Z'ha'dum. 
Artwork is FPO but serviceable enough. Many hardcoded font
colors & styles were moved to styles.xml where they belong.
AM/PM finally given the old heave-ho (but configurable in
StatusBarPolicy.java).

Notification content remains on a light-gray background for
now (so as not to screw up custom RemoteViews) but status
icons will definitely need across-the-board rework to look
better against a dark background.

Change-Id: Id9d5a699532f9336563cd6f9699bff3893735e4f
 2010-05-21 15:46:54 -04:00
Ben Murdoch
fa296a4c90 Add a string for the no file chosen label, shown on a file upload control when the user has not yet picked a file. 
Requires external/webkit change.

Change-Id: Idb1039a7c39b18249579794df523afb6144fba47
 2010-05-21 10:18:35 +01:00
Kenny Root
4c748c6649 am 9c75fa72: am 0b275423: am 8ea405d1: am cfa2de30: Import revised translations 2010-05-17 14:59:03 -07:00
Kenny Root
0b27542312 am 8ea405d1: am cfa2de30: Import revised translations 
Merge commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken

* commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a':
  Import revised translations
 2010-05-17 13:53:44 -07:00
Kenny Root
8ea405d196 am cfa2de30: Import revised translations 
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp

* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
  Import revised translations
 2010-05-17 11:37:35 -07:00
Kenny Root
cfa2de303e Import revised translations 
Change-Id: Id6bd3011874ff8544a030473cc994f9a0201c97d
 2010-05-17 11:18:04 -07:00
Konstantin Lopyrev
c15dcf7ea1 Fix 2571606: Correct message after too many failed attempts for password and pin. 
Change-Id: Ib712c692804b067b95b261852afdd9fac40194c4
 2010-05-14 15:43:03 -07:00
The Android Open Source Project
1443eddab6 am f7c12cf5: am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:19:03 -07:00
The Android Open Source Project
db20eeb246 am 9167ba50: merge from open-source master 
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken

* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
  Corrected debug message in WindowManager
  Put the wifi status icon in the right place.
 2010-05-14 09:15:41 -07:00
The Android Open Source Project
9167ba50e4 merge from open-source master 
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
 2010-05-14 09:11:31 -07:00
Ben Murdoch
f4442311b8 Merge Webkit at r58956: Update User agent with new WebKit version. 
Change-Id: I8da1b80114e71d6d7b208f794ee978f88f1b4bf5
 2010-05-14 10:24:56 +01:00
Joe Onorato
1b44ebda70 Merge "Put the wifi status icon in the right place." 2010-05-13 16:33:22 -07:00
Adam Powell
33b974393b ActionBar added to framework, integrated with Activity and styles. 
Added onClick attribute support to menus in MenuInflater.

Change-Id: I739771b4f249d87a0d8b15969f3d526b099067a1
 2010-05-13 01:27:59 -07:00
Costin Manolache
2b6b835196 am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:12:53 -07:00
Costin Manolache
c195965893 am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken

* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:10:01 -07:00
Costin Manolache
fa2e3dcd85 am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:06:39 -07:00
Costin Manolache
8d83f9e31b Bug 2680071: Rename the Cloud to Device 
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
 2010-05-12 16:16:34 -07:00
The Android Open Source Project
24d9c149c8 am fc97669a: am 72a6af1a: am 7d952644: merge from open-source master 2010-05-12 14:16:50 -07:00
The Android Open Source Project
72a6af1ab1 am 7d952644: merge from open-source master 
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken

* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
  Support to display message when operation is blocked due to FDN being enabled
 2010-05-12 14:12:25 -07:00
The Android Open Source Project
7d9526445c merge from open-source master 
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
 2010-05-12 14:10:23 -07:00
Costin Manolache
3a17fbb757 am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-12 09:24:20 -07:00
Costin Manolache
8579a4d726 am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging
 2010-05-12 07:55:32 -07:00
Costin Manolache
625de48897 am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging
 2010-05-12 07:49:16 -07:00
Jim Miller
f5eaee96b0 am c8212613: am 99dcfe7c: am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-11 10:28:06 -07:00
Jim Miller
99dcfe7cda am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken

* commit '4d89954dc4572a05339dc7a95ec683892558162b':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
 2010-05-11 10:23:42 -07:00
Jim Miller
4d89954dc4 am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp

* commit 'a27579016caf1438400a3637e3896bec653e3756':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
 2010-05-11 10:18:38 -07:00
Naveen Kalla
18573e9281 Support to display message when operation is blocked due to FDN being enabled 
The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.

Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
 2010-05-11 09:12:00 -07:00
Steve Block
52ab0b39fc Merge webkit.org at r58033 : Update the WebKit UA string and LayoutTest ignore list 
Change-Id: I620e6da3f7318f329f3401075799e5659cacda82
 2010-05-11 14:28:10 +01:00
Mike Lockwood
31ac8e9d56 Add new permission android.permission.ACCESS_USB to allow access to USB devices 
Change-Id: Ib3dd573a5ef3950d20b21251fe7a3efad56b5c1f
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-11 08:29:19 -04:00
Costin Manolache
161c75a0f3 Bug 2673557: rename datamessaging 
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
 2010-05-10 19:12:49 -07:00
Konstantin Lopyrev
6707341b28 Fixing bug 2660263, changed text for PIN unlock 
Change-Id: I904c7c4753b68195fbd547e97207aa3cceef3c6d
 2010-05-10 18:02:31 -07:00
Jim Miller
a27579016c Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6 Fix 2660488: Add LockScreen/InCallScreen resources to preloads 
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.

Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
 2010-05-10 15:24:47 -07:00
Robert Greenwalt
858510ca40 am 8ada6786: am da7bf206: am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:18:37 -07:00
Robert Greenwalt
da7bf20608 am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken

* commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
  String change to refer to wifi tether as hotspot
 2010-05-10 10:14:51 -07:00
Robert Greenwalt
c8d1556fb8 am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo 
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp

* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
  String change to refer to wifi tether as hotspot
 2010-05-10 10:12:58 -07:00
Robert Greenwalt
ebdbc7ec11 String change to refer to wifi tether as hotspot 
bug:2664412
Change-Id: I9ab110f88551d03a9215b81887675c50aa575d9a
 2010-05-08 15:07:53 -07:00
Daniel Sandler
ad2f9ff786 am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp

* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
  Fix "p.m." in lockscreen (locale: es).
 2010-05-06 17:24:22 -07:00