Adam Powell
1539a2967b
am eb7a7a04: am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
...
* commit 'eb7a7a044adba95216152e848fa692ec2869e06b':
Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
2011-01-18 22:00:06 -08:00
Dianne Hackborn
7fc5d4b8e7
am 2ec5a716: am 36c84403: Merge "Fix issue #3362484 : Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
...
* commit '2ec5a7160b3d32887b2428edef7a751ee3700809':
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
2011-01-18 21:56:45 -08:00
Dianne Hackborn
fe86e9793c
am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
...
* commit '661b6cfb2bcecdd335540db7059e5d8e22c2e79a':
Okay, new plan for dialogs.
2011-01-18 18:40:22 -08:00
Adam Powell
eb7a7a044a
am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
...
* commit '6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590':
Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
2011-01-18 18:39:10 -08:00
Dianne Hackborn
661b6cfb2b
Merge "Okay, new plan for dialogs." into honeycomb
2011-01-18 17:48:22 -08:00
Dianne Hackborn
ef57575887
Okay, new plan for dialogs.
...
Don't dismiss by default when tapping outside, even for AlertDialog.
If AlertDialog doesn't have any buttons, tapping outside will dismiss it.
Applications can make their own dialogs (or activities looking like
dialogs) can use the existing and new APIs to control this behavior
themselves so that it does the right thing.
Change-Id: I02bfb9161e169de0033200211b3a7ec80080bd83
2011-01-18 17:35:17 -08:00
Adam Powell
6cfc7a0acb
Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
2011-01-18 16:57:59 -08:00
Adam Powell
a1e6358a4c
Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
...
Change-Id: I9e7ec4ab14c6008397d26c499ccf478f8875f918
2011-01-18 16:51:22 -08:00
Dianne Hackborn
2ec5a7160b
am 36c84403: Merge "Fix issue #3362484 : Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
...
* commit '36c84403ec07439d11ed284ac5f9a9db807fbf92':
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
2011-01-18 15:32:44 -08:00
Dianne Hackborn
36c84403ec
Merge "Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog" into honeycomb
2011-01-18 15:31:21 -08:00
Dianne Hackborn
cfaf8878de
Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog
...
Change-Id: Idc2fe5a86c61e8f94fe9d902a0087a05f6f7918e
2011-01-18 15:28:41 -08:00
Dianne Hackborn
2e1469a13d
am f6759102: am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
...
* commit 'f67591025debf040695e9ed0d0edeff5ef0c5db2':
Fix issue #3362666 Activities launched from ongoing notifications don't animate
2011-01-18 12:10:36 -08:00
Dianne Hackborn
f67591025d
am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
...
* commit '3aa959b9ce7ac4ac241033b3eea9f2c0ce34d554':
Fix issue #3362666 Activities launched from ongoing notifications don't animate
2011-01-18 11:20:29 -08:00
Dianne Hackborn
08121bca5b
Fix issue #3362666 Activities launched from ongoing notifications don't animate
...
The phone-oriented code for turning off animations when the screen is entirely
covered by the status bar was not appropriate for the tablet.
Change-Id: Ica3e0db989f16b9187eacd6ecf4ac3d17661dd6d
2011-01-18 11:08:40 -08:00
Jim Miller
8fac287664
am b70d39fd: am 6e3212a3: Merge "Fix 3329600: Always enable screen rotation in lockscreen." into honeycomb
...
* commit 'b70d39fda198a2f6d37fec9bbdb67462df9de40c':
Fix 3329600: Always enable screen rotation in lockscreen.
2011-01-17 23:31:59 -08:00
Jim Miller
0d1aa05fa6
am d0861c89: am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb
...
* commit 'd0861c8992356296115dc203feb50ce8a8794bd9':
Fix 3210299: Extend lock screen wake timeout to 10s
2011-01-17 23:31:21 -08:00
Jim Miller
b70d39fda1
am 6e3212a3: Merge "Fix 3329600: Always enable screen rotation in lockscreen." into honeycomb
...
* commit '6e3212a38b503e35563ec93c35a6851c99d95c77':
Fix 3329600: Always enable screen rotation in lockscreen.
2011-01-17 20:00:14 -08:00
Jim Miller
d0861c8992
am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb
...
* commit '3d7a9707a58bb043147f30dc81c61deeeffeeef7':
Fix 3210299: Extend lock screen wake timeout to 10s
2011-01-17 17:03:51 -08:00
Jim Miller
6e3212a38b
Merge "Fix 3329600: Always enable screen rotation in lockscreen." into honeycomb
2011-01-17 16:23:16 -08:00
Jim Miller
e28016c286
Fix 3329600: Always enable screen rotation in lockscreen.
...
Sometimes we get the wrong value for the sensor resource we
use to configure lockscreen orientation. However, the current
UI design has LockScreen always respond to orientation (when
enabled in settings) so we don't need to rely on this for the time-being.
Change-Id: If37314befd25a7b3306500643155523ad4fe6657
2011-01-17 16:12:39 -08:00
Jeff Brown
0f6226b9f4
Merge "Add joystick support to framework."
2011-01-17 15:57:44 -08:00
Jim Miller
3d7a9707a5
Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb
2011-01-17 15:53:42 -08:00
Jim Miller
77274695a7
Fix 3210299: Extend lock screen wake timeout to 10s
...
Change-Id: I9e4f8761a80271b97ff6411a41664642273baaef
2011-01-17 15:28:21 -08:00
Jeff Brown
cb1404e456
Add joystick support to framework.
...
Change-Id: I95374436708752e1a9cff3f85c5b9bc3e0987961
2011-01-17 13:51:00 -08:00
Adam Powell
98893db9dc
am 4ba7f35e: am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
...
* commit '4ba7f35e0f9cfdf59ed6e8f9092992893da46d4a':
Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
2011-01-16 23:08:54 -08:00
Jim Miller
5fbda0427a
am f0c53e66: am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb
...
* commit 'f0c53e66997bf781fb52f76e58aa0928fd8b64eb':
Fix 3005526: Properly update StatusView from Password/PIN unlock
2011-01-16 23:08:30 -08:00
Jim Miller
9e8d9b6cd9
am a55c1280: am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
...
* commit 'a55c1280f9b674619368ee61e4fe6b8db64eb2ce':
Fix 3342063: Correctly update StatusView when battery changes.
2011-01-16 23:06:59 -08:00
Jim Miller
a3006a46d0
am 3530ebe4: resolved conflicts for merge of 578e73da to honeycomb-plus-aosp
...
* commit '3530ebe451fea39b159baa9b8c9f9cd851de42a3':
Fix 3106227: use WeakReferences for receivers in DigitalClock class
2011-01-16 23:04:55 -08:00
Jim Miller
4169700edd
am 76e75335: am 1f6e37ef: Merge "Fix 3355957: Don\'t hide the keyboard for PIN/Password" into honeycomb
...
* commit '76e75335648f1c0c695701a94499bfd4625eba5d':
Fix 3355957: Don't hide the keyboard for PIN/Password
2011-01-16 23:04:09 -08:00
Jeff Brown
21e4fa5539
am 7d5f9095: am 85562dde: Merge "Fix keyboard hidden states." into honeycomb
...
* commit '7d5f9095a6feb40aa0c87d5671050df7c24609ef':
Fix keyboard hidden states.
2011-01-16 23:02:00 -08:00
Adam Powell
4ba7f35e0f
am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
...
* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4':
Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
2011-01-16 20:00:17 -08:00
Adam Powell
92cd4d0296
Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
2011-01-16 19:58:51 -08:00
Adam Powell
8f68f4fe79
Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and
...
FEATURE_ACTION_MODE_OVERLAY to coexist.
Fix "custom title" dialog window decor for holo.
Change-Id: Ia732caeb89e12d8d754be31c3bd2faf13a8c95d6
2011-01-16 19:55:21 -08:00
Jim Miller
f0c53e6699
am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb
...
* commit 'bdac9e0fbe874cf7414228624bd0d3af4f715ccc':
Fix 3005526: Properly update StatusView from Password/PIN unlock
2011-01-16 19:28:25 -08:00
Jim Miller
305093f911
Fix 3005526: Properly update StatusView from Password/PIN unlock
...
This uses the newly added setHelpMessage() to properly show PIN and
password help in StatusView.
Change-Id: I8662e179e989c6e72f657c81f23b1b2fa7982727
2011-01-16 19:09:15 -08:00
Jim Miller
a55c1280f9
am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
...
* commit '057d9f16f793c3796751913ad2eeb12582a7626b':
Fix 3342063: Correctly update StatusView when battery changes.
2011-01-16 17:52:39 -08:00
Jim Miller
057d9f16f7
Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
2011-01-16 17:51:04 -08:00
Jim Miller
fc5001a592
Fix 3342063: Correctly update StatusView when battery changes.
...
LockScreen wasn't correctly updating StatusView when the battery
status changed. In addition, the messages aren't supposed to
"pop" when changed, so changed visibility state from GONE to INVISIBLE
when not in use.
Change-Id: Icacbf7e2275c77a28e7e0a9d1247abdbebadcd4f
2011-01-16 17:45:46 -08:00
Jim Miller
3530ebe451
resolved conflicts for merge of 578e73da to honeycomb-plus-aosp
...
Change-Id: I334ae5382220a84881521885b6e3c3991fd8bbb0
2011-01-16 16:55:28 -08:00
Jim Miller
6687ecb447
Merge "Fix 3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
2011-01-16 16:14:52 -08:00
Jim Miller
b47bed9c48
Fix 3355957: Don't hide the keyboard for PIN/Password
...
BT or USB keyboards currently cause the on-screen keyboard to
be hidden. This will probably need to be refactored in the
future but the change is too complicated for the current
release.
Change-Id: Ieb655b85622f7c174ed4a5d1c3766d130a9d32f1
2011-01-16 15:48:54 -08:00
Jeff Brown
d04a88cb8e
Fix keyboard hidden states.
...
Bug: 3355957
Change-Id: I7ff8f83421ebd89bacd3ba472e23eeba99732cb1
2011-01-16 14:05:47 -08:00
Jeff Brown
ddb16aa8a6
am 9f1ae205: am 06bc9721: Merge "Disable soft keyboard when keyboard attached." into honeycomb
...
* commit '9f1ae205b40a2cc730b3e07b1a408ad2803c40fd':
Disable soft keyboard when keyboard attached.
2011-01-16 10:41:22 -08:00
Jeff Brown
db10a638fd
am 12116af5: am c8276990: Merge "Add volume down as a safe mode key for Stingray." into honeycomb
...
* commit '12116af5c422608d609ec884939ee8ceba3279b9':
Add volume down as a safe mode key for Stingray.
2011-01-16 10:40:20 -08:00
Jim Miller
8b886fab54
Fix 3106227: use WeakReferences for receivers in DigitalClock class
...
This works around a bug in the framework where LockScreen wouldn't
get GC'd under certain circumstances which would lead to an OOM
crash. It now uses WeakReferences for observers inside the
DigitalClock container class and unregisters them if the containing
DigitalClock goes away.
Also removed mLive variable which was unused and could potentially
leak the receivers.
Left mAttached for debugging so we can use it to determine if the
calls to onAttachToWindow() and onDetachFromWindow() are grossly
unbalanced which may be the root cause of the original problem.
Have cleanUp() explicitly clear unused references to make
tracing through hprof references easier.
Change-Id: I99a7e0c356001b05eab5aa729564553666febfea
2011-01-14 18:01:12 -08:00
Jeff Brown
06bc9721d8
Merge "Disable soft keyboard when keyboard attached." into honeycomb
2011-01-14 17:48:09 -08:00
Jeff Brown
4aed78b505
Disable soft keyboard when keyboard attached.
...
Also hide menu shortcuts everywhere until we can get around to
redesigning the menu UI to be more consistent.
Bug: 3306545
Bug: 3330748
Change-Id: I4d4e19525cdfc93d9aae0dcaa1e6266fb552c5bc
2011-01-14 17:36:55 -08:00
Jeff Brown
c8276990df
Merge "Add volume down as a safe mode key for Stingray." into honeycomb
2011-01-14 17:22:53 -08:00
Anders Hammar1
0ce53b47d6
DO NOT MERGE Make the Phone options dialog use current language
...
The title of the Phone options dialog is displayed using wrong
translation if the user changes the current language setting. Moving
the setTitle call to prepareDialog to ensure that the title gets
updated before the dialog is shown.
Change-Id: I6f8f460789effd22de5be8339cc46667269e78c0
2011-01-14 16:00:47 -08:00
Anders Hammar1
e79223ed41
Make the Phone options dialog use current language
...
The title of the Phone options dialog is displayed using wrong
translation if the user changes the current language setting. Moving
the setTitle call to prepareDialog to ensure that the title gets
updated before the dialog is shown.
Change-Id: I03ff59c7f4ff711a06b05de7cca94fa928cf67ef
2011-01-14 12:32:16 -08:00