Dianne Hackborn
8f5a94d938
am a718bc86: am 7df202e2: am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit 'a718bc863aafd21a2bc7240974ca2a51d6af92cf':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:48:13 -07:00
Daniel Sandler
1a93f5b3da
am 5f784230: am 501ddf14: am c30b6da8: Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev
...
* commit '5f7842309ed09220d77296c055c9a62a17ad2368':
Bring back the notification panel handle peek animation.
2012-10-04 12:48:07 -07:00
Scott Main
a35333c171
am c465ae32: am 688447e5: fix the lesson title names
...
* commit 'c465ae324521fa1cb6e130f297fbb6da72a5072e':
fix the lesson title names
2012-10-04 12:47:59 -07:00
Scott Main
c465ae3245
am 688447e5: fix the lesson title names
...
* commit '688447e512185dab4acd9ddfc9f22066d164ff4e':
fix the lesson title names
2012-10-04 12:45:29 -07:00
Dianne Hackborn
a718bc863a
am 7df202e2: am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit '7df202e27a34bc1dc8832e4521a2189279de2030':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:45:23 -07:00
Daniel Sandler
5f7842309e
am 501ddf14: am c30b6da8: Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev
...
* commit '501ddf14c9b15ddcfedad28918c9b93ca090163e':
Bring back the notification panel handle peek animation.
2012-10-04 12:45:20 -07:00
Elliott Hughes
6141b125b5
am 7e30cc58: am 1f7bddce: am 3594e855: Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
...
* commit '7e30cc588da2e16f0194ca6580691d9eabfd9aee':
Fix Catalan ("ca") date formatting.
2012-10-04 12:44:22 -07:00
Dianne Hackborn
7df202e27a
am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit '8a2291952528303d284878468fe260ec41998db3':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:43:15 -07:00
Daniel Sandler
501ddf14c9
am c30b6da8: Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev
...
* commit 'c30b6da804483e65eddda059e971727e1c80b7bf':
Bring back the notification panel handle peek animation.
2012-10-04 12:43:12 -07:00
Scott Main
688447e512
fix the lesson title names
...
Change-Id: I09ba41685664b92b5082376a8b9e885bf444415f
2012-10-04 12:43:05 -07:00
Elliott Hughes
7e30cc588d
am 1f7bddce: am 3594e855: Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
...
* commit '1f7bddce7943b26185da1ba9ac3475f3028f5c2e':
Fix Catalan ("ca") date formatting.
2012-10-04 12:42:37 -07:00
Dianne Hackborn
8a22919525
Merge "Fix issue #6968859 : home not exiting an ANR'd dream" into jb-mr1-dev
2012-10-04 12:41:41 -07:00
Daniel Sandler
c30b6da804
Merge "Bring back the notification panel handle peek animation." into jb-mr1-dev
2012-10-04 12:41:41 -07:00
Elliott Hughes
1f7bddce79
am 3594e855: Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
...
* commit '3594e855a46fcfd9b9db62d6f6a39e6cbbe90794':
Fix Catalan ("ca") date formatting.
2012-10-04 12:40:32 -07:00
Elliott Hughes
3594e855a4
Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev
2012-10-04 12:38:24 -07:00
Daniel Sandler
0c1b75c17b
Bring back the notification panel handle peek animation.
...
Bug: 7286201
Change-Id: Id93d6a00689ffb7f97e89af935460b1debec3850
2012-10-04 15:37:13 -04:00
Svetoslav Ganov
aaf8e5ab74
am 5ef98234: am c37dc69c: am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
...
* commit '5ef98234cff47b5119dcda6e2d10bc8e2942ca64':
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:36:33 -07:00
John Spurlock
8ca650bca5
am 775ba8bb: am cbf64feb: am 6ebbe1b9: Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev
...
* commit '775ba8bbb4baef4fda7bdbda241fa3ec0fd67d21':
Invoking the global action dialog stops dreaming.
2012-10-04 12:36:29 -07:00
Svetoslav Ganov
5ef98234cf
am c37dc69c: am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
...
* commit 'c37dc69ca272ef86a9bc3593ad6a65010294f7ae':
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:34:32 -07:00
John Spurlock
775ba8bbb4
am cbf64feb: am 6ebbe1b9: Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev
...
* commit 'cbf64feb138ca8812620bfac3bee1c840b5a2bd8':
Invoking the global action dialog stops dreaming.
2012-10-04 12:34:28 -07:00
John Spurlock
1f34c36d65
am 13f271b4: am 4d97bc2a: am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
...
* commit '13f271b42b56ebfeb592c6da30571ae6aeb305fd':
Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:33:50 -07:00
Svetoslav Ganov
c37dc69ca2
am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
...
* commit 'd367b70c4ad5d8e6cdbcc0d6d429428413cd39b3':
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:32:38 -07:00
John Spurlock
cbf64feb13
am 6ebbe1b9: Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev
...
* commit '6ebbe1b97005a40850a1633aa4fc12af0392e986':
Invoking the global action dialog stops dreaming.
2012-10-04 12:32:35 -07:00
Svetoslav Ganov
d367b70c4a
Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
2012-10-04 12:31:02 -07:00
John Spurlock
13f271b42b
am 4d97bc2a: am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
...
* commit '4d97bc2a58fcd206f77948427efd86e035a44a16':
Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:30:50 -07:00
John Spurlock
6ebbe1b970
Merge "Invoking the global action dialog stops dreaming." into jb-mr1-dev
2012-10-04 12:29:46 -07:00
Philip Milne
fa48eedec3
am 160ae004: am 2881ae9d: am e4ed0920: Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev
...
* commit '160ae004e76fd8e6e70552f4b864d40d188c298c':
Fix for bug: 7274232. Bold date on lock screen.
2012-10-04 12:29:08 -07:00
Daniel Sandler
f15baefc96
am b94f8160: am 8b4b24b2: am 0a890b3c: Merge "Remove Start Dreaming^W^W Sleep Now 1x1 widget." into jb-mr1-dev
...
* commit 'b94f8160cb9b35856b95bdbe15ac69915737ba04':
Remove Start Dreaming^W^W Sleep Now 1x1 widget.
2012-10-04 12:29:04 -07:00
Amith Yamasani
a87071cbd9
am a96ae6eb: am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
...
* commit 'a96ae6ebeadb111ca160968b68e51c5495cb9c23':
Read in the disable-keyguard-features flag from the XML file
2012-10-04 12:28:58 -07:00
Amith Yamasani
e527e11e81
am ac6c4cbb: am 0cf4c3d4: am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev
...
* commit 'ac6c4cbb6c961fe89d45bb7a6d8f3465ae495a92':
Fix launching home when there are multiple launchers installed
2012-10-04 12:28:54 -07:00
John Spurlock
4d97bc2a58
am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
...
* commit '27b3819df0ff3bbfb680b5bac54ef7e9b4d3aac1':
Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:28:53 -07:00
Scott Main
3111deba32
am 1723bc81: am 64070e53: am 2babbe19: am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev
...
* commit '1723bc812c6232ba5826d3bf9d1a57a83871812d':
Doc update: TTL change.
2012-10-04 12:28:49 -07:00
Baligh Uddin
c1486a0180
am 73646da5: (-s ours) am 5dba4eaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '73646da5e566e9d0425a9c500ec258f5c2943ee2':
Import translations. DO NOT MERGE
2012-10-04 12:28:30 -07:00
Victoria Lease
41a2493d2c
am 51a0daa5: am f9d5a079: am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev
...
* commit '51a0daa522c5d9b34db64a51e79565f1c6d7a387':
throw SecurityException in isProviderEnabled()
2012-10-04 12:28:26 -07:00
John Spurlock
27b3819df0
Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
2012-10-04 12:26:18 -07:00
Philip Milne
160ae004e7
am 2881ae9d: am e4ed0920: Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev
...
* commit '2881ae9dbaf9680dfb33071468a225832e8747fd':
Fix for bug: 7274232. Bold date on lock screen.
2012-10-04 12:18:50 -07:00
Daniel Sandler
b94f8160cb
am 8b4b24b2: am 0a890b3c: Merge "Remove Start Dreaming^W^W Sleep Now 1x1 widget." into jb-mr1-dev
...
* commit '8b4b24b2be876d79924f10d82412dd5974ff703b':
Remove Start Dreaming^W^W Sleep Now 1x1 widget.
2012-10-04 12:18:47 -07:00
Philip Milne
2881ae9dba
am e4ed0920: Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev
...
* commit 'e4ed092076430e4cc8aa2e179883f721da5b2a61':
Fix for bug: 7274232. Bold date on lock screen.
2012-10-04 12:16:48 -07:00
Daniel Sandler
8b4b24b2be
am 0a890b3c: Merge "Remove Start Dreaming^W^W Sleep Now 1x1 widget." into jb-mr1-dev
...
* commit '0a890b3ce2d1b67c3bada85528c46045d3cd6230':
Remove Start Dreaming^W^W Sleep Now 1x1 widget.
2012-10-04 12:16:44 -07:00
Philip Milne
e4ed092076
Merge "Fix for bug: 7274232. Bold date on lock screen." into jb-mr1-dev
2012-10-04 12:14:45 -07:00
Daniel Sandler
0a890b3ce2
Merge "Remove Start Dreaming^W^W Sleep Now 1x1 widget." into jb-mr1-dev
2012-10-04 12:14:15 -07:00
Dianne Hackborn
5fe7e2a304
Fix issue #6968859 : home not exiting an ANR'd dream
...
Add a new call to the activity manager for the input dispatcher
to report about any pid having an ANR. This has a new feature
where it can also tell the activity manager that it is above the
system alert layer, so the activity manager can pop its ANR dialog
on top of everything if it needs to. (Normally we don't want
these dialogs appearing on top of the lock screen.)
Also fixed some debugging stuff here and there that was useful
as I was working on this -- windows now very clearly include
their uid, various system dialogs now have titles so you know
what they are in the window manager, etc.
Change-Id: Ib8f5d29a5572542cc506e6d338599ab64088ce4e
2012-10-04 12:04:58 -07:00
Daniel Sandler
7aa88f7aad
Remove Start Dreaming^W^W Sleep Now 1x1 widget.
...
If you need its functionality for testing:
$ adb shell am start -n com.android.systemui/.Somnambulator
Bug: 7267723
Change-Id: I9e0dd9d020e251d1ced4377329436ea46c3a8af5
2012-10-04 15:03:22 -04:00
Philip Milne
2d1cf35fc9
Fix for bug: 7274232. Bold date on lock screen.
...
Change-Id: Ic3fc3e7c0770b2431139c3faf10296d307f1175e
2012-10-04 12:01:41 -07:00
Amith Yamasani
a96ae6ebea
am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
...
* commit '58b4cc4d2206ba0df9ed0931f1acce2058c5acea':
Read in the disable-keyguard-features flag from the XML file
2012-10-04 11:59:59 -07:00
Amith Yamasani
ac6c4cbb6c
am 0cf4c3d4: am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev
...
* commit '0cf4c3d4a05f68b27895a527af158c976cfc9975':
Fix launching home when there are multiple launchers installed
2012-10-04 11:59:55 -07:00
Amith Yamasani
58b4cc4d22
am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
...
* commit 'dcf5a663cdec5ed1aa6b5d583cdac177a0974fcb':
Read in the disable-keyguard-features flag from the XML file
2012-10-04 11:58:11 -07:00
Amith Yamasani
0cf4c3d4a0
am 3364b2ff: Merge "Fix launching home when there are multiple launchers installed" into jb-mr1-dev
...
* commit '3364b2ff7970bea9013b53554caf98c2d5f783ed':
Fix launching home when there are multiple launchers installed
2012-10-04 11:58:07 -07:00
Scott Main
1723bc812c
am 64070e53: am 2babbe19: am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev
...
* commit '64070e53353f663f3c7a1638a6fe594e54f29397':
Doc update: TTL change.
2012-10-04 11:57:16 -07:00
Amith Yamasani
dcf5a663cd
Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
2012-10-04 11:56:29 -07:00