Jean-Baptiste Queru
403a5e477e
reconcile korg/master into goog/master
2009-07-26 11:43:56 -07:00
Jean-Baptiste Queru
b2e4d94947
Merge korg/donut into korg/master
2009-07-25 17:48:03 -07:00
Dianne Hackborn
678008667e
Deal with canceled keys.
2009-07-24 17:30:26 -07:00
Dianne Hackborn
131c48dc74
am 32ce7f17: Update launcher to use new bitmap density API.
...
Merge commit '32ce7f17a85abf9b175f773371308876f7401547'
* commit '32ce7f17a85abf9b175f773371308876f7401547':
Update launcher to use new bitmap density API.
2009-07-24 16:08:52 -07:00
Dianne Hackborn
32ce7f17a8
Update launcher to use new bitmap density API.
2009-07-23 20:09:20 -07:00
Leon Scroggins
0b5d53f28b
am 142868a4: Change "Shortcut <> is installed" to "created"
...
Merge commit '142868a4a48a10dca5a0429c9631b8c57911a529'
* commit '142868a4a48a10dca5a0429c9631b8c57911a529':
Change "Shortcut <> is installed" to "created"
2009-07-22 11:27:42 -07:00
Android (Google) Code Review
a96065d87f
am d7013ca7: Merge change 8193 into donut
...
Merge commit 'd7013ca7ab781824da6eb574094cf05b55abab92'
* commit 'd7013ca7ab781824da6eb574094cf05b55abab92':
Add one more pixel of padding to the top of the Google logo used in the search widget.
2009-07-22 11:27:41 -07:00
Leon Scroggins
142868a4a4
Change "Shortcut <> is installed" to "created"
...
See http://b/issue?id=1861557
2009-07-22 13:15:14 -04:00
Android (Google) Code Review
d7013ca7ab
Merge change 8193 into donut
...
* changes:
Add one more pixel of padding to the top of the Google logo used in the search widget.
2009-07-22 09:01:20 -07:00
Mike LeBeau
20eecebd25
Add one more pixel of padding to the top of the Google logo used in the search widget.
2009-07-22 09:00:41 -07:00
Android (Google) Code Review
d8fc3f14c5
am efb38794: Merge change 8034 into donut
...
Merge commit 'efb38794c880510c943973570eab8301cc269a28'
* commit 'efb38794c880510c943973570eab8301cc269a28':
Remove gestures from Home.
2009-07-21 14:38:11 -07:00
Android (Google) Code Review
efb38794c8
Merge change 8034 into donut
...
* changes:
Remove gestures from Home.
2009-07-21 10:56:06 -07:00
Romain Guy
94dabf1be4
Remove gestures from Home.
2009-07-21 10:55:43 -07:00
Mike LeBeau
ac149afb92
am 18fdcb6d: Display a Google logo in the search widget if Google is the chosen web search provider. Listen for broadcasts of that setting changing to correctly update the widget as appropriate.
...
Merge commit '18fdcb6de7e1268ed6e5c7664b2c838fe9d494ae'
* commit '18fdcb6de7e1268ed6e5c7664b2c838fe9d494ae':
Display a Google logo in the search widget if Google is the chosen web
2009-07-20 23:34:12 -07:00
Mike LeBeau
18fdcb6de7
Display a Google logo in the search widget if Google is the chosen web
...
search provider. Listen for broadcasts of that setting changing to
correctly update the widget as appropriate.
2009-07-20 19:20:58 -07:00
Romain Guy
ed447f613b
am 6e1fd5b2: Prevents BadTokenException on rotation of the gestures window.
...
Merge commit '6e1fd5b2b0b79b8e97d458c40bc9ac1710c2852b'
* commit '6e1fd5b2b0b79b8e97d458c40bc9ac1710c2852b':
Prevents BadTokenException on rotation of the gestures window.
2009-07-19 20:28:39 -07:00
Romain Guy
925431c7e7
am 6da5b433: Adjust the padding in Home\'s all apps drawer
...
Merge commit '6da5b433c1b3d8b95371c418d4ab1aa88baa488c'
* commit '6da5b433c1b3d8b95371c418d4ab1aa88baa488c':
Adjust the padding in Home's all apps drawer
2009-07-19 20:20:18 -07:00
Romain Guy
9bd696bc31
am 6c8bbcb5: Fixes #1930069 . Prevents NPE in GesturesActivity. Ensures the store is always != null.
...
Merge commit '6c8bbcb5a2bbae2c83e1c684c2a06b8b72b47f52'
* commit '6c8bbcb5a2bbae2c83e1c684c2a06b8b72b47f52':
Fixes #1930069 . Prevents NPE in GesturesActivity. Ensures the store is always != null.
2009-07-19 20:20:14 -07:00
Romain Guy
c4f3925819
am 27f98955: Remove dead code from Home.
...
Merge commit '27f98955ad7d6aad05bdddba75b98067cc2e208f'
* commit '27f98955ad7d6aad05bdddba75b98067cc2e208f':
Remove dead code from Home.
2009-07-19 20:20:09 -07:00
Romain Guy
2c8f5343ce
am e59717b6: Remove unused asset.
...
Merge commit 'e59717b647a5a8d6b5c71d4d609f235c7b7b1f49'
* commit 'e59717b647a5a8d6b5c71d4d609f235c7b7b1f49':
Remove unused asset.
2009-07-19 20:20:05 -07:00
Romain Guy
130adf67e2
am e769bc76: Fixes #1987902 . Do not show the + button when not needed.
...
Merge commit 'e769bc7602f40a334f4489622b280fecb071d43a'
* commit 'e769bc7602f40a334f4489622b280fecb071d43a':
Fixes #1987902 . Do not show the + button when not needed.
2009-07-17 17:13:09 -07:00
Romain Guy
6e1fd5b2b0
Prevents BadTokenException on rotation of the gestures window.
2009-07-17 16:36:31 -07:00
Romain Guy
6da5b433c1
Adjust the padding in Home's all apps drawer
2009-07-17 16:29:15 -07:00
Romain Guy
6c8bbcb5a2
Fixes #1930069 . Prevents NPE in GesturesActivity. Ensures the store is always != null.
2009-07-17 16:18:27 -07:00
Romain Guy
27f98955ad
Remove dead code from Home.
2009-07-17 15:28:42 -07:00
Romain Guy
e59717b647
Remove unused asset.
2009-07-17 14:59:27 -07:00
Romain Guy
e769bc7602
Fixes #1987902 . Do not show the + button when not needed.
2009-07-17 14:20:24 -07:00
Romain Guy
4cae075e6e
am f9848949: Fix back button in gestures panel.
...
Merge commit 'f984894964281fef48b97bc0bc68a17feb244c25'
* commit 'f984894964281fef48b97bc0bc68a17feb244c25':
Fix back button in gestures panel.
2009-07-17 13:58:18 -07:00
Romain Guy
808e09d24d
am 6b3f51d3: More new gestures UI. Adds a back button at the bottom of the settings activity.
...
Merge commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1'
* commit '6b3f51d373f19711a7fac44f2f6df9dc89110eb1':
More new gestures UI. Adds a back button at the bottom of the settings activity.
2009-07-17 02:08:50 -07:00
Romain Guy
f984894964
Fix back button in gestures panel.
2009-07-17 01:24:40 -07:00
Romain Guy
aba68a3dbf
am 1dd3a077: New gestures UI.
...
Merge commit '1dd3a077a293bf3ac4e61e91dcc3dfc99487acd4'
* commit '1dd3a077a293bf3ac4e61e91dcc3dfc99487acd4':
New gestures UI.
2009-07-16 23:46:54 -07:00
Romain Guy
6b3f51d373
More new gestures UI. Adds a back button at the bottom of the settings activity.
2009-07-16 17:46:19 -07:00
Romain Guy
1dd3a077a2
New gestures UI.
2009-07-16 16:06:48 -07:00
Romain Guy
0c7ce8a4b4
am 68634c1c: Fixes OutOfMemoryError on Home.
...
Merge commit '68634c1c320bba0d9a49c2ad6ed78e244e89a57b'
* commit '68634c1c320bba0d9a49c2ad6ed78e244e89a57b':
Fixes OutOfMemoryError on Home.
2009-07-15 18:14:58 -07:00
Romain Guy
68634c1c32
Fixes OutOfMemoryError on Home.
2009-07-15 15:19:44 -07:00
Jean-Baptiste Queru
2eac12d4b8
Merge commit 'goog/readonly-korg-master' into merge_korg_master
2009-07-14 17:13:02 -07:00
Android (Google) Code Review
2962125fe9
am 949b3eb9: Merge change 7136 into donut
...
Merge commit '949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2'
* commit '949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2':
Fix the lock issue on Home. This was caused by onPrepareDialog().
2009-07-14 14:52:57 -07:00
Android (Google) Code Review
949b3eb9d3
Merge change 7136 into donut
...
* changes:
Fix the lock issue on Home. This was caused by onPrepareDialog().
2009-07-14 14:51:25 -07:00
Romain Guy
7b4ef330d9
Fix the lock issue on Home. This was caused by onPrepareDialog().
...
onPrepareDialog() is called after a dialog was created/shown at least once. But
onPrepareDialog() does not mean the dialog will be shown. Thus Home would
sometimes lock itself without showing the dialog the user would normally use to
unlock the workspace.
2009-07-14 13:58:08 -07:00
Romain Guy
2cef9ae6c8
am 6f227eba: Fixes #1977560 . Prevents NPE when rotating the gestures activity.
...
Merge commit '6f227eba4bdf96102e6dda24ff6c9961a6c41c38'
* commit '6f227eba4bdf96102e6dda24ff6c9961a6c41c38':
Fixes #1977560 . Prevents NPE when rotating the gestures activity.
2009-07-14 13:21:34 -07:00
Romain Guy
6f227eba4b
Fixes #1977560 . Prevents NPE when rotating the gestures activity.
2009-07-14 13:18:51 -07:00
Android (Google) Code Review
9d8ab69b47
am c5df5b61: Merge change 7061 into donut
...
Merge commit 'c5df5b61b8fee2969cf5413c98257959b84af327'
* commit 'c5df5b61b8fee2969cf5413c98257959b84af327':
Put in new version of search floater background image to put one pixel of padding
2009-07-14 10:21:31 -07:00
Android (Google) Code Review
c5df5b61b8
Merge change 7061 into donut
...
* changes:
Put in new version of search floater background image to put one pixel of padding and one less pixel of margin at the top.
2009-07-13 20:46:52 -07:00
Mike LeBeau
d717ca2d91
Put in new version of search floater background image to put one pixel of padding
...
and one less pixel of margin at the top.
2009-07-13 20:46:10 -07:00
Eric Fischer
3d95f65906
am f881f08d: Import new translations
...
Merge commit 'f881f08d3070f466a74400a7b154a6a5a69e6835'
* commit 'f881f08d3070f466a74400a7b154a6a5a69e6835':
Import new translations
2009-07-13 16:59:23 -07:00
Eric Fischer
f881f08d30
Import new translations
2009-07-13 15:48:21 -07:00
Romain Guy
b8698ba0f6
am 83fb0c1c: Remove unused resources from Home.
...
Merge commit '83fb0c1c42141211e04f43d2b85ceaec5e463c95'
* commit '83fb0c1c42141211e04f43d2b85ceaec5e463c95':
Remove unused resources from Home.
2009-07-09 14:59:53 -07:00
Romain Guy
83fb0c1c42
Remove unused resources from Home.
2009-07-09 14:57:27 -07:00
Bjorn Bringert
f9aca51136
am 0879cef6: Don\'t call SearchManager.isVisible() in Launcher.
...
Merge commit '0879cef6ddeda7e5e5409fe1277b9786aab32249'
* commit '0879cef6ddeda7e5e5409fe1277b9786aab32249':
Don't call SearchManager.isVisible() in Launcher.
2009-07-08 07:06:23 -07:00
Bjorn Bringert
0879cef6dd
Don't call SearchManager.isVisible() in Launcher.
...
SearchManager.isVisible() is a hidden method that should
not be used by applications. Also, SearchManager.stopSearch()
already checks whether the search dialog is visible before
tryinf to dimiss it, so the check in Launcher was redundant.
2009-07-08 12:38:25 +01:00