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

144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
9015e149fb am 397f18b6: Put vibration patterns in resources. 
Merge commit '397f18b642426c5d4d86d188fb3c9d0eef034306'

* commit '397f18b642426c5d4d86d188fb3c9d0eef034306':
  Put vibration patterns in resources.
 2009-08-30 11:11:14 -07:00
Dianne Hackborn
181ceb5c78 Put vibration patterns in resources. 
Change-Id: If7c9d4c3bee4bc3319379fbb588265d6202c2bee
 2009-08-27 22:58:01 -07:00
Mike Lockwood
05d9a55251 am 1305547f: Merge change 22959 into eclair 
Merge commit '1305547fc59120b281609f7d68d8ff21af66df5a'

* commit '1305547fc59120b281609f7d68d8ff21af66df5a':
  Don't activate keyguard if screen is turned off while proximity sensor is active.
 2009-08-27 14:34:52 -07:00
Paul Eastham
e10cd555bf am 38c00992: Increase vibrate duration on vkey haptics so they can be felt. 
Merge commit '38c00992e083d73b5c0ead154c6a1b5add42661d'

* commit '38c00992e083d73b5c0ead154c6a1b5add42661d':
  Increase vibrate duration on vkey haptics so they can be felt.
 2009-08-27 14:34:51 -07:00
Android (Google) Code Review
7ca3b4277d Merge change 22959 into eclair 
* changes:
  Don't activate keyguard if screen is turned off while proximity sensor is active.
 2009-08-27 14:31:17 -07:00
Paul Eastham
d6b903d950 Increase vibrate duration on vkey haptics so they can be felt. 2009-08-27 14:11:23 -07:00
Mike Lockwood
33303d76cc Don't activate keyguard if screen is turned off while proximity sensor is active. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-27 13:27:51 -07:00
Dan Murphy
168b0a95fe am 1cdcc3cc: policy/impl: Add option to disable screen-unlock-on-slider-open 
Merge commit '1cdcc3cc653432b6f479d4759ebb01bbb93ae278'

* commit '1cdcc3cc653432b6f479d4759ebb01bbb93ae278':
  policy/impl: Add option to disable screen-unlock-on-slider-open
 2009-08-26 21:02:24 -07:00
Dan Murphy
ab97c84da5 policy/impl: Add option to disable screen-unlock-on-slider-open 
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
 2009-08-26 08:51:09 -07:00
Karl Rosaen
36d5e41d13 am 7d8a2c39: Adjust \'account unlock\' scenario to make \'forgot pattern\' more forgiving. 
Merge commit '7d8a2c39cba15bced65acabc88344d6313bd09db'

* commit '7d8a2c39cba15bced65acabc88344d6313bd09db':
  Adjust 'account unlock' scenario to make 'forgot pattern' more forgiving.
 2009-08-25 09:41:50 -07:00
Karl Rosaen
84999d69e0 Adjust 'account unlock' scenario to make 'forgot pattern' more forgiving. 
When a user hits the 'forgot pattern' button, they aren't permanently forced into
using the account to unlock the screen; they can get back to the pattern screen by
hitting the back key, or by turning off the screen (e.g it's not sticky).

Also, show progress dialog while checking account, and make sure we are on the UI thread
when doing stuff from the account callback.
 2009-08-25 09:27:47 -07:00
Mike Lockwood
b261908fe2 am e0905994: PhoneWindowManager: Rotate display when phone is docked 
Merge commit 'e0905994fb3e66007582ca86a868a0ea2b6327ef'

* commit 'e0905994fb3e66007582ca86a868a0ea2b6327ef':
  PhoneWindowManager: Rotate display when phone is docked
 2009-08-24 15:51:38 -07:00
Mike Lockwood
1753f7f64d PhoneWindowManager: Rotate display when phone is docked 
Also moved the number of degrees of rotation for keyboard open state to a resource.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-08-24 15:40:28 -07:00
Romain Guy
1c92706e68 am 5df4494c: Remove unused field from PhoneWindow.DecorView. 
Merge commit '5df4494c6ca3cf2e90dc6612234b8a40980a217a'

* commit '5df4494c6ca3cf2e90dc6612234b8a40980a217a':
  Remove unused field from PhoneWindow.DecorView.
 2009-08-21 00:32:27 -07:00
Romain Guy
8e9a594936 Remove unused field from PhoneWindow.DecorView. 2009-08-20 23:34:42 -07:00
Dianne Hackborn
f4680a4f31 am 0257f52e: Update to implement new APIs. 
Merge commit '0257f52edc7f718d9598fd54d3a5580255f329b9'

* commit '0257f52edc7f718d9598fd54d3a5580255f329b9':
  Update to implement new APIs.
 2009-08-20 20:39:24 -07:00
Dianne Hackborn
93a0a5f2ca Update to implement new APIs. 2009-08-20 19:33:02 -07:00
Dianne Hackborn
2c6dc736f0 am 8e7ee46c: New wallpaper transition constants. 
Merge commit '8e7ee46cd28529fd9d03267986bcf40f926f4ae6'

* commit '8e7ee46cd28529fd9d03267986bcf40f926f4ae6':
  New wallpaper transition constants.
 2009-08-19 17:22:22 -07:00
Dianne Hackborn
3c3bd44fd4 New wallpaper transition constants. 2009-08-19 17:09:46 -07:00
Fred Quintana
c56d4aebfa am 393b2b8f: (-s ours) do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6797f2 from master branch 
Merge commit '393b2b8fbf39d36337c2763ead76e22a81888e87'

* commit '393b2b8fbf39d36337c2763ead76e22a81888e87':
  do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6797f2 from master branch
 2009-08-16 17:20:18 -07:00
Fred Quintana
1c01c8bc79 do not merge: cherrypicked 53f5bc273b81a3761242d3356ed8490b5e6797f2 from master branch 2009-08-15 21:46:24 -07:00
Fred Quintana
4aaab1583a cleanup the AccountManager API 2009-08-14 21:35:35 -07:00
Dianne Hackborn
4bf7bcf89b Add support for new wallpaper theme attribute. 2009-08-09 17:23:00 -07:00
Dianne Hackborn
b7cd8b9144 Add knowledge about new wallpaper window type. 2009-08-08 20:53:03 -07:00
Jean-Baptiste Queru
3fd974ec60 merge from open-source master 2009-08-04 09:00:28 -07:00
Jean-Baptiste Queru
4abd816610 merge from donut 2009-08-03 07:45:46 -07:00
Joe Onorato
51afe5c404 Fix bug 1982892 - batteryservice turns off device even while plugged in 
Also, make the battery service do it, not some keyguard thing.
 2009-07-30 08:04:53 -07:00
Dianne Hackborn
dad563e3f3 am 1dc1ccaf: Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden 
Merge commit '1dc1ccaf5c8cc136b71537f310a3f13150aaef41'

* commit '1dc1ccaf5c8cc136b71537f310a3f13150aaef41':
  Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden
 2009-07-29 16:45:08 -07:00
Jean-Baptiste Queru
2a57a8097f merge from donut 2009-07-29 14:57:05 -07:00
Dianne Hackborn
94a679daba Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden 
Re-arrange various things to ensure that the search dialog is told about system windows being
closed before it is told about the navigation back to home.
 2009-07-28 17:51:07 -07:00
Jean-Baptiste Queru
1f651caac5 reconcile korg/master into goog/master 2009-07-26 11:43:55 -07:00
Jean-Baptiste Queru
8033359de9 Merge korg/donut into korg/master 2009-07-25 17:48:02 -07:00
Dianne Hackborn
0041e97ce6 Update for virtual key haptic feedback, deal with canceled keys. 2009-07-24 17:14:43 -07:00
Eric Laurent
413cb9debd Fix issue 1795088 Improve audio routing code 
Initial commit for review.
 2009-07-23 09:58:08 -07:00
Karl Rosaen
39ac33abdd am 1d903521: have "search" as the reason when dismissing system dialogs for search. 
Merge commit '1d903521ffc93b5128ebc445d7dd046ee0d5fbc4'

* commit '1d903521ffc93b5128ebc445d7dd046ee0d5fbc4':
  have "search" as the reason when dismissing system dialogs for search.
 2009-07-21 14:38:28 -07:00
Karl Rosaen
323216beeb have "search" as the reason when dismissing system dialogs for search. 
this way search can't dismiss itself.  can't use the constant because it is
in policy.  would rather leave it this way instead of moving constants for
system dialog dismissal to framework.
 2009-07-20 14:00:29 -07:00
Joe Onorato
b41c0dc334 am 83cf383b: Close the global actions menu when the screen goes off. 
Merge commit '83cf383bf462ecb53b4233fc3ae7f1202938d80b'

* commit '83cf383bf462ecb53b4233fc3ae7f1202938d80b':
  Close the global actions menu when the screen goes off.
 2009-07-17 15:43:01 -07:00
Joe Onorato
78866b1e07 Close the global actions menu when the screen goes off. 
Previously, the global actions menu was closed when the keyguard was shown, but
when the menu was shown from within the keyguard, it wasn't closed ever again
when the screen goes off.  That had the result that if your pocket managed to
bring up the dialog, the menu would likely never go away on its own, and
eventually do something awful like go into airplane mode.
 2009-07-17 13:09:27 -04:00
Android (Google) Code Review
36c7b19264 Merge change 7362 
* changes:
  Disable fallback screen that asks for usr/pwd if we have SAML accounts which require web login.
 2009-07-15 13:15:08 -07:00
Ilia Tulchinsky
24cfa450fa Disable fallback screen that asks for usr/pwd if we have SAML accounts which require web login. 2009-07-14 20:53:39 -07:00
Jean-Baptiste Queru
c594343cd7 Merge commit 'goog/readonly-korg-master' into merge_korg_master 2009-07-14 17:12:43 -07:00
Karl Rosaen
6bc6a508f6 am 5785bc2d: Dismiss system windows when search is launched. 
Merge commit '5785bc2dad36c7ad34a548865ba77c04c46ed097'

* commit '5785bc2dad36c7ad34a548865ba77c04c46ed097':
  Dismiss system windows when search is launched.
 2009-07-14 15:06:42 -07:00
Karl Rosaen
32a9cd8f69 Dismiss system windows when search is launched. 2009-07-14 14:57:47 -07:00
Joe Onorato
bea76ea3d0 am 7db439ee: Fix bug 1317754 - "Idle screen displays "Charging (100%)" even when fully charged." 
Merge commit '7db439ee518b97881625f13ee738ecb891b573a8'

* commit '7db439ee518b97881625f13ee738ecb891b573a8':
  Fix bug 1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
 2009-07-06 12:43:30 -07:00
Joe Onorato
f46d2db932 Fix bug 1317754 - "Idle screen displays "Charging (100%)" even when fully charged." 2009-07-06 15:02:38 -04:00
Dianne Hackborn
c3978f40b6 am ea85711f: Remove unnused variable. 
Merge commit 'ea85711f1bba755e55439f7d1471067167cc15b3'

* commit 'ea85711f1bba755e55439f7d1471067167cc15b3':
  Remove unnused variable.
 2009-06-29 20:20:05 -07:00
Dianne Hackborn
0a88e648b5 Remove unnused variable. 2009-06-26 18:19:32 -07:00
Karl Rosaen
61c2cb6f22 am ee09f4ad: Fix case where the lock screen information won\'t fit on screen. 
Merge commit 'ee09f4ad02d04066e2ded84471e1940e91d458c8'

* commit 'ee09f4ad02d04066e2ded84471e1940e91d458c8':
  Fix case where the lock screen information won't fit on screen.
 2009-06-24 13:12:24 -07:00
Android (Google) Code Review
4c72461b9a am 7baa113d: Merge change 5165 into donut 
Merge commit '7baa113d5793e5cf9df15c8ffdac117672ee8af0'

* commit '7baa113d5793e5cf9df15c8ffdac117672ee8af0':
  When the sim is missing, show "press menu to unlock or place emergency call" on lock screen instead of just "press menu to unlock".
 2009-06-24 13:12:23 -07:00
Karl Rosaen
3af5ee44a4 Fix case where the lock screen information won't fit on screen. 
The case is in landscape, 'next alarm' showing, and the plmn is showing.
In this case, don't show the next alarm.
 2009-06-23 18:21:46 -07:00