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

1440 Commits

Author SHA1 Message Date
Dianne Hackborn
ba51c3d02d New fragment stuff: back stack, and layout integration. 
You can now have fragment transactions pushed on to a local back
stack, which will automatically be popped when the user pressed
back in the activity.

Fragments can also now be inserted into layouts.

Change-Id: Id1c9ae3fbc54f696cd8bb5ca5957bec4d3eabf18
 2010-05-06 13:19:35 -07:00
The Android Open Source Project
108817f3d8 am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master 2010-05-05 18:16:31 -07:00
The Android Open Source Project
579e08e657 am f7896449: merge from open-source master 
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
 2010-05-05 16:00:01 -07:00
The Android Open Source Project
f78964490d merge from open-source master 
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
 2010-05-05 15:57:42 -07:00
mogimo
b032bc0373 Add new keycodes for the convenience of Japanese IMEs 
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
 2010-05-05 13:37:21 -07:00
Steve Block
fe66eef15c Merge "Roll back the update to the WebKit UA string" 2010-05-05 07:28:37 -07:00
Daniel Sandler
5748ab3d8d am 59bfdab3: am f24e66db: am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 17:46:19 -07:00
Daniel Sandler
f24e66dbb9 am 342a3800: am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '342a3800b9b31929b337d298a24184d820f27f26' into kraken

* commit '342a3800b9b31929b337d298a24184d820f27f26':
  Increase the row height of menus by 1dip.
 2010-05-04 12:45:53 -07:00
Daniel Sandler
342a3800b9 am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo 
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp

* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
  Increase the row height of menus by 1dip.
 2010-05-04 12:42:48 -07:00
Daniel Sandler
5d0ef0d90a Increase the row height of menus by 1dip. 
This prevents CJK characters, which have extra-tall
ascenders, from being clipped by the drawable in
IconMenuItemView.

Bug: 2330380
Change-Id: I1256b85122e1634d5220c648111a5ffe43879f1f
 2010-05-04 14:33:28 -04:00
Daniel Lehmann
edd904fd31 Merge "Allow contact-sources to rename the term "All Contacts"" 2010-05-03 09:56:48 -07:00
Daniel Sandler
83b236c880 am b205daba: am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 15:07:37 -07:00
Daniel Lehmann
88e26c21cc Allow contact-sources to rename the term "All Contacts" 
Bug:2116002
Change-Id: I3609a8c0198dd33c5426a47e14720a4ccd7b8c10
 2010-04-30 13:55:38 -07:00
Daniel Sandler
b205dabaa7 am d47cdbb7: am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken

* commit 'd47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
  Tweak style of recent apps dialog title.
 2010-04-30 11:34:03 -07:00
Daniel Sandler
d47cdbb7ea am 3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo 
Merge commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp

* commit '3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
  Tweak style of recent apps dialog title.
 2010-04-30 11:30:29 -07:00
Daniel Sandler
3bb5e4d322 Merge "Tweak style of recent apps dialog title." into froyo 2010-04-30 10:55:03 -07:00
Daniel Sandler
e6f134ae63 Tweak style of recent apps dialog title. 
Lovingly hand-crafted to UX's specification.

Bug: 2614279
Change-Id: I14a50e80ed4d97e5d14c7a94586380a27c845263
 2010-04-30 13:36:13 -04:00
Dianne Hackborn
09d91ca47c am fefe7a22: Merge "Fix build." into kraken 2010-04-29 18:01:33 -07:00
Dianne Hackborn
22ec9ab3b8 Fix build. 
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
 2010-04-29 17:56:03 -07:00
Kenny Root
946db27161 am 82b027e9: am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo 2010-04-29 15:34:36 -07:00
Kenny Root
82b027e90e am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo 
Merge commit '48399e38c978a66ac4c6054c8681a246dfc94b4b' into kraken

* commit '48399e38c978a66ac4c6054c8681a246dfc94b4b':
  Import revised translations
 2010-04-29 15:31:23 -07:00
Kenny Root
48399e38c9 am 77a1beb1: Merge "Import revised translations" into froyo 
Merge commit '77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp

* commit '77a1beb137948ad45423bb8fcd7e424e36144133':
  Import revised translations
 2010-04-29 15:29:22 -07:00
Kenny Root
67d609e93f Import revised translations 
Change-Id: I94756035b7d3bfe2027c578a6c1578df5219f8ea
 2010-04-29 15:25:21 -07:00
Steve Block
fc4dfe1595 Roll back the update to the WebKit UA string 
This was incorrectly updated in the merge to WebKit r55033.

Change-Id: I35a3b591daed6970efd3f326335d414b99006568
 2010-04-29 18:37:21 +01:00
Steve Block
286fbce557 Merge "Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list" 2010-04-29 03:27:29 -07:00
Dianne Hackborn
8640c1d0e5 am 14cee9f6: New xlarge screen size. 2010-04-28 16:58:05 -07:00
Dianne Hackborn
14cee9f688 New xlarge screen size. 
Not complete, only for experimentation at this point.

This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.

The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.

Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
 2010-04-28 16:51:52 -07:00
Kenny Root
fb9856218a am 5d84df0c: am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo 2010-04-28 09:56:45 -07:00
Kenny Root
5d84df0c82 am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken

* commit '9fe55514524993936eafe9e77e3dd98ba17a78b6':
  Import revised translations
 2010-04-28 09:47:27 -07:00
Kenny Root
9fe5551452 am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp

* commit '4bba2149f3f2709b24dc40118461c5d683ed6965':
  Import revised translations
 2010-04-28 09:32:55 -07:00
Steve Howard
db1e48a9de Merge "New drawables for the pending update to the maps API." 2010-04-27 19:20:08 -07:00
Kenny Root
19d9bdedee Import revised translations 
Change-Id: I03670c68c861c85e299c020bef04b663ac28b69c
 2010-04-27 14:11:05 -07:00
Steve Block
79a81c2d38 Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list 
Change-Id: I7eab669b404dbd2ab534c14021d4a60db0caa803
 2010-04-27 20:11:29 +01:00
Tim Park
e008dab6a8 Merge "Update sym_action_call icon to match icon used elsewhere" 2010-04-26 18:03:47 -07:00
Leon Clarke
650e3d31db New assets for http://b/issue?id=2506670 
Change-Id: I989db44c3b2907f8a1b2d5db3709bfcd166d332a
 2010-04-26 12:33:09 +01:00
Adam Powell
b9eab6c793 resolved conflicts for merge of 81cd2e90 to master 
Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
 2010-04-23 16:49:54 -07:00
Adam Powell
81cd2e90cc Logo attribute for manifest and PackageManager methods to fetch it 
Change-Id: I2c5ac44a4e2af982a616b2012901d7395013b19f
 2010-04-23 15:49:07 -07:00
Tim Park
ff276bd716 Update sym_action_call icon to match icon used elsewhere 
Fix bug 2158676:  Update sym_action_call.png so that it matches phone
icon used elsewhere throughout the system.

Change-Id: I3ce9166dea6f8b626b6c68bec71f42d2797ce79f
 2010-04-23 13:30:03 -07:00
Steve Howard
157657b357 New drawables for the pending update to the maps API. 
Change-Id: Ic025df813723fad4f6a8772b38f80c67d5bfca3a
 2010-04-21 14:12:00 -07:00
Joe Onorato
d07d6c6ea7 am a8624186: am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 2010-04-21 11:20:59 -07:00
Joe Onorato
a8624186a6 am 46fba3b9: am 52e70b25: Add title to recent apps dialog. 
Merge commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873' into kraken

* commit '46fba3b9e1bb02aa603ffbb17907f081be0ca873':
  Add title to recent apps dialog.
 2010-04-21 11:12:29 -07:00
Joe Onorato
46fba3b9e1 am 52e70b25: Add title to recent apps dialog. 
Merge commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp

* commit '52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
  Add title to recent apps dialog.
 2010-04-21 11:07:43 -07:00
Joe Onorato
52e70b25f8 Add title to recent apps dialog. 
Bug: 2614279

Change-Id: I45ebcd2e45140901df246db10f756c07864cccb4
 2010-04-21 14:00:44 -04:00
android-build SharedAccount
120c457672 manual merge 
Change-Id: I235ae925559b5db6d64cc8f8b188704a84d7b6a2
 2010-04-15 16:36:34 -07:00
Dianne Hackborn
cd0d10f939 Introduce new API version to avoid breakage with the Froyo APIs; 
introduce padding in the resources to avoid cross-branch merge pain.

Change-Id: I9975f4320dfc625e3ed68dfdbbe94cc0c3b019f4
 2010-04-15 14:38:30 -07:00
Adam Powell
212db7d3f8 Added MultiSelectListPreference 
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.

MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.

Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
 2010-04-15 10:18:17 -07:00
Evan Millar
f82dcf4107 Merge "Clean up the fallback state of QuickContact" 2010-04-15 09:17:11 -07:00
Kenny Root
95bf9f6a0f am 2349dc5d: am fa22de79: Merge "Import revised translations" into froyo 
Merge commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319' into kraken

* commit '2349dc5d7aac9c0bde9fc38f69114db0f38ed319':
  Import revised translations
 2010-04-15 06:43:29 -07:00
Robert Greenwalt
59019368cf am eaa8b1a7: am 57e60854: am 22b3644a: Update the datause icons. 2010-04-15 06:38:02 -07:00
Kenny Root
2349dc5d7a am fa22de79: Merge "Import revised translations" into froyo 
Merge commit 'fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp

* commit 'fa22de7993f94d338330a888bdc2aeaaf857c719':
  Import revised translations
 2010-04-15 06:00:18 -07:00