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

21427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
5c16039adf am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo 
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp

* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
  docs: revise and add documentation for backup APIs
 2010-05-04 14:21:21 -07:00
Scott Main
014517569f Merge "docs: revise and add documentation for backup APIs" into froyo 2010-05-04 14:20:02 -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
70c6bb0d3e Merge "Increase the row height of menus by 1dip." into froyo 2010-05-04 12:40:54 -07:00
Dan Morrill
f7ebcfeccb am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp

* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
  Adding the backward-compatible filtering heuristics for the new device
 2010-05-04 12:38:03 -07:00
Joe Onorato
77da731221 am f140be6c: Call into app widget hosts when the provider is updated. 
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp

* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
  Call into app widget hosts when the provider is updated.
 2010-05-04 12:37:59 -07:00
Dan Morrill
e17b4e7115 Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 12:03:45 -07:00
Joe Onorato
f140be6c3c Call into app widget hosts when the provider is updated. 
Change-Id: If0a2459901e88cf04810b23178e4673d44fa69cc
 2010-05-04 11:49:12 -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
The Android Open Source Project
6de3a6fdd3 merge from open-source master 
Change-Id: I5f552b45caae639170674213c23f154437b58afd
 2010-05-04 09:20:16 -07:00
Dan Morrill
89d97c1418 Adding the backward-compatible filtering heuristics for the new device 
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
 2010-05-04 08:39:03 -07:00
Romain Guy
5bc30057e0 Merge "Fix typo of <p> end tag in appwidgets.xml" 2010-05-03 16:25:34 -07:00
The Android Open Source Project
007ad7700a merge from open-source master 
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
 2010-05-03 16:19:31 -07:00
Jean-Baptiste Queru
0c388fd29c Adapt to new location of libcore 
Change-Id: Ie4fb163fb9f04a96f8412a996d43321accb28cc8
 2010-05-03 09:50:38 -07:00
Jean-Baptiste Queru
2529d4eab8 Adapt to new location of libcore 
Change-Id: I495bf86a8195c85d16917c129dcbb0f4c5de68d2
 2010-04-30 13:23:32 -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
Patrick Tsai
bd742e4336 Fix typo of <p> end tag in appwidgets.xml 
Change-Id: Ic1f4d8ade0d32f3b74decbe557d4275dc2e19466
 2010-05-01 00:30:19 +08:00
Scott Main
d17da43c82 docs: revise and add documentation for backup APIs 
Change-Id: I0b015a6de16da07ccd31756b8d2329dc2785c2f7
 2010-04-29 21:42:58 -07:00
Scott Main
27963bbc25 am cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo 
Merge commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp

* commit 'cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
  docs: editorial revisions to the bmgr tool doc
 2010-04-29 21:23:10 -07:00
Scott Main
cd8f7bd4e5 Merge "docs: editorial revisions to the bmgr tool doc" into froyo 2010-04-29 21:22:17 -07:00
Marc Blank
9ca816649b am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo 
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues
 2010-04-29 15:40:30 -07:00
Marc Blank
794cd640bf Merge "Expose _id in ExtendedProperties subValues" into froyo 2010-04-29 15:39:37 -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
77a1beb137 Merge "Import revised translations" into froyo 2010-04-29 15:28:15 -07:00
Kenny Root
67d609e93f Import revised translations 
Change-Id: I94756035b7d3bfe2027c578a6c1578df5219f8ea
 2010-04-29 15:25:21 -07:00
Scott Main
1d32803327 am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 
Merge commit '764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp

* commit '764caf2481d935ce6870ec141f1e845178df8b47':
  docs: rewrite information about using shared preferences, internal and
 2010-04-29 15:23:32 -07:00
Scott Main
764caf2481 Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 2010-04-29 15:21:34 -07:00
takuo
42b21c3333 Parse custom text header and ignore it. 
Some MMS carrier append own custom header as text into PduData. We should parse it and ignore it at the moment.

Change-Id: I4d6cf20f5cf99172ebbe310ab18101316eb04c77
 2010-04-30 07:11:53 +09:00
Marc Blank
8f643c1040 Expose _id in ExtendedProperties subValues 
* ExtendedValues' "name" and "value" columns are exposed in Entry
  entity subvalues, but it is clumsy to change a value, as the _id
  of the ExtendedValues row isn't also exposed.  (We otherwise have to
  perform a potentially slow query)
* This CL adds the _id column to the columns exposed

Bug: 2638762
Change-Id: Iaffeffed620af78439f5f73aa5f3257b0f8a0fd0
 2010-04-29 14:50:37 -07:00
Scott Main
779de5c040 docs: rewrite information about using shared preferences, internal and 
external storage (including new apis), and sqlite databases.

Change-Id: Ib951f14764759a04beca7b24767fb1e927245ebd
 2010-04-29 13:50:52 -07:00
takuo
334dc0b270 Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart). 
And take the first part of parsed as a parent part data.

Change-Id: I2752654f41d642524061802772e2a7eaa10a4e2d
 2010-04-30 05:12:19 +09:00
Dianne Hackborn
d8f34720a1 am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update 
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp

* commit 'c956f37567593a71271bae107eafec47575f7dcc':
  Fix issue #2641875: Apps on sdcard not accesible after update
 2010-04-29 12:20:42 -07:00
Dianne Hackborn
c956f37567 Fix issue #2641875: Apps on sdcard not accesible after update 
Change-Id: I541aa040939e6a872f0b7e8e82e44f96de49d97a
 2010-04-29 11:56:40 -07:00
Jean-Baptiste Queru
85ff3fe19e Merge "Fix an NPE in InputMethodService when mExtractAction is null." 2010-04-29 10:03:40 -07:00
Jey
2eebf5cacd 'uses-library' was not working for persistent applications. 
Fix by generating the applicationInfo, when asked for info.

Change-Id: I44686d5a306562c6649148dce8f709e682adcdf4
 2010-04-29 08:19:06 -07:00
Adam Powell
6483f6d546 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early 
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
 2010-04-28 19:34:49 -07:00
Steve Kondik
59eb69192c Fix an NPE in InputMethodService when mExtractAction is null. 
This happens with certain third-party IMEs.

Fixes: http://code.google.com/p/cyanogenmod/issues/detail?id=231

Change-Id: Idf4349ee9c7c8f73c255745bc65b49ba9b593874
 2010-04-28 16:37:01 -07:00
Adam Powell
b40c42f1ff Fix bug 2639949 - Don't stop a Scroller early 
Change-Id: Ia827199a27d03289b6fa573dd6f2b13517943400
 2010-04-28 16:36:37 -07:00
Steve Howard
3b20c9e805 am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 
Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp

* commit '81ac367be66905a5b53b8e7e98160546802bd98b':
  Fix a minor bug in transitions to left-edge-up landscape.
 2010-04-28 16:03:28 -07:00
Steve Howard
81ac367be6 Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 2010-04-28 15:59:39 -07:00
The Android Open Source Project
c8652199d1 merge from open-source master 
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
 2010-04-28 15:50:56 -07:00
Vasu Nori
91a62f3d4a am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 
Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp

* commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
 2010-04-28 15:38:44 -07:00
Vasu Nori
a07c4cbea9 Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" into froyo 2010-04-28 15:35:57 -07:00
Vasu Nori
020e534579 bug:2622719 move 'forcing of cursor execution' to ContentProvider 
revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
and add it to ContentProvider.query() to force query execution
in worker thread, instead of having the main thread incur the cost
of query execution and potentially get ANR

Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
 2010-04-28 15:32:54 -07:00
Amith Yamasani
087b25f7e2 am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp

* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
  Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
 2010-04-28 15:21:37 -07:00
Amith Yamasani
6e4895b63a Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 2010-04-28 15:18:15 -07:00
Steve Howard
c64d537e9b Fix a minor bug in transitions to left-edge-up landscape. 
Fix MAX_TRANSITION_TILT to remove the entry for upside-down
orientation, which should've been removed when that orientation itself
was removed.  This was causing the phone to require further vertical
tilt for transitions to left-edge-up landscape, as compared to
right-edge-up landscape or portait mode.

Bug: 2639310
Change-Id: I8fe2e2baecd6a9c2cecae95d316b0d4e2f8ee251
 2010-04-28 15:08:45 -07:00
Fred Quintana
00b92b943f am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel
 2010-04-28 14:13:55 -07:00