Jim Miller
5cd80fca11
am 60ad6f0a: am 3355e18f: Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
...
* commit '60ad6f0ac0179fcb624f3bbf8aae0b850d0f75b0':
Fix 3356338: Add recovery text to AccountUnlockScreen
2011-01-18 22:37:32 -08:00
Adam Powell
820b1bc469
am dd4760a2: am d63d3358: Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
...
* commit 'dd4760a2cdbe7599d7b600a4b6bbbfb08bad3947':
Fix bug 3362258 - Fastscroll is out of sync with the list
2011-01-18 22:03:35 -08:00
Romain Guy
268a79c10d
am 612ed43b: am 3cd030a4: Merge "Don\'t pass a null View to OnListItemClickListener. Bug #3365153 " into honeycomb
...
* commit '612ed43bc8bee58c8d6f80a53b607b64e2e00ab6':
Don't pass a null View to OnListItemClickListener. Bug #3365153
2011-01-18 22:03:13 -08:00
Romain Guy
9afbd5654d
am 3e4f4b88: am 064f6ad3: Merge "Recreate the EGL surface when ViewRoot\'s surface changes. Bug #3306150 " into honeycomb
...
* commit '3e4f4b88571a07ea08b8f6c8e98dc600dbe84f61':
Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150
2011-01-18 22:01:17 -08:00
Adam Powell
1526819427
am 6cd8a98d: am 92375756: Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
...
* commit '6cd8a98d6e38eddd6d7b5f1765f7acdce9144890':
Fix bug 3362979 - Holo light overflow button has stale focused state
2011-01-18 22:00:43 -08:00
Dianne Hackborn
375d008522
am a4605b72: am e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
...
* commit 'a4605b72c278be829b28bfa218cdba461c1667a7':
Just a little 'ol activity manager permission change.
2011-01-18 22:00:28 -08:00
Dianne Hackborn
310ae9b39c
am fe86e979: am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb
...
* commit 'fe86e9793ce62c6a1aa34e5712f16b45800efdd0':
Okay, new plan for dialogs.
2011-01-18 22:00:21 -08:00
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
Christopher Tate
a953359db5
am 31cd02ad: am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
...
* commit '31cd02ade3dd85c676bb278a1c2181f57179c390':
API CHANGE: add a no-View ctor for DragShadowBuilder
2011-01-18 21:58:32 -08:00
Romain Guy
7dfe1ab587
am 069f9b63: am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
...
* commit '069f9b6352951134a8c0b3d5320e31290e681206':
Smoother pinch-zoom in Browser.
2011-01-18 21:58:24 -08:00
John Reck
ded2bc5c5f
am 733e2047: am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
...
* commit '733e2047e7dbb53d5b3b2514bfb76edbcef8a149':
Create db path if it doesn't exit
2011-01-18 21:58:01 -08:00
Nick Pelly
5a6e65ed2e
am b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
...
* commit 'b6b426ad1c953555dd6393844c29be5c9a9cd700':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
2011-01-18 21:57:31 -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
Jeff Brown
7cca7e0b28
am 761a6b7f: am f4368c95: Merge "Filter virtual keys after touches." into honeycomb
...
* commit '761a6b7fdbe2bcc6db4306af9705dcb22b036068':
Filter virtual keys after touches.
2011-01-18 21:56:31 -08:00
Costin Manolache
b8c581ec64
am bf8e1627: am b8b671df: Merge "Add back NEW_TASK flag." into honeycomb
...
* commit 'bf8e162702d0e56a8f5bf97de4c40b0a87fd78a4':
Add back NEW_TASK flag.
2011-01-18 21:54:17 -08:00
Brad Fitzpatrick
6b6156a96b
am fe384670: am 3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb
...
* commit 'fe3846707b7fbe86681e49e88c9368213f0eb16a':
Fixing memory leak in PreferenceScreen.
2011-01-18 21:52:05 -08:00
Kenny Root
83239a4693
am 189854d0: am 241fc72b: Merge "Don\'t cache return of getService in Environment" into honeycomb
...
* commit '189854d0735eae7b251d39360c9582cbcbb0a642':
Don't cache return of getService in Environment
2011-01-18 21:51:04 -08:00
Brad Fitzpatrick
aef99bbc69
am 7adf8481: am b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
...
* commit '7adf848183b39ac4d0b8b67435ace94909ca3076':
StrictMode class instance limit interface.
2011-01-18 21:50:45 -08:00
Jim Miller
60ad6f0ac0
am 3355e18f: Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
...
* commit '3355e18f68c5a8fce62e783fe370afaf0899d655':
Fix 3356338: Add recovery text to AccountUnlockScreen
2011-01-18 21:17:04 -08:00
Jim Miller
3355e18f68
Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
2011-01-18 21:14:38 -08:00
Adam Powell
dd4760a2cd
am d63d3358: Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
...
* commit 'd63d33581051fdffd16789551852368d21b89fe1':
Fix bug 3362258 - Fastscroll is out of sync with the list
2011-01-18 20:46:26 -08:00
Adam Powell
d63d335810
Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
2011-01-18 20:44:44 -08:00
Adam Powell
b1f498afc3
Fix bug 3362258 - Fastscroll is out of sync with the list
...
Change-Id: I13282bfed355f5794041e83818ee2e9e97c1b318
2011-01-18 20:44:01 -08:00
Romain Guy
612ed43bc8
am 3cd030a4: Merge "Don\'t pass a null View to OnListItemClickListener. Bug #3365153 " into honeycomb
...
* commit '3cd030a4fe229155b252cee003c78e2467ff4d82':
Don't pass a null View to OnListItemClickListener. Bug #3365153
2011-01-18 20:29:30 -08:00
Romain Guy
3cd030a4fe
Merge "Don't pass a null View to OnListItemClickListener. Bug #3365153 " into honeycomb
2011-01-18 20:27:22 -08:00
Romain Guy
7890fe2da4
Don't pass a null View to OnListItemClickListener.
...
Bug #3365153
Change-Id: I1328a554408bf16ec592ae1a747e57a5fb9305e3
2011-01-18 20:24:18 -08:00
Eric Rowe
85d5b532dd
am f38bddbe: DO NOT MERGE Add connect HID/NAP BT stress test
...
* commit 'f38bddbeb42988c7960e20585aeee9ae64f4b985':
DO NOT MERGE Add connect HID/NAP BT stress test
2011-01-18 19:08:42 -08:00
Eric Rowe
993add8297
am a0d4d80f: DO NOT MERGE Cleaned up BT test utils
...
* commit 'a0d4d80fd2feaa04cb5f5242acd159cd783b25d4':
DO NOT MERGE Cleaned up BT test utils
2011-01-18 19:06:34 -08:00
Romain Guy
3e4f4b8857
am 064f6ad3: Merge "Recreate the EGL surface when ViewRoot\'s surface changes. Bug #3306150 " into honeycomb
...
* commit '064f6ad3928c51996359694c00a580115b2dabfc':
Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150
2011-01-18 18:41:29 -08:00
Adam Powell
6cd8a98d6e
am 92375756: Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
...
* commit '923757567ec834c0a1e2c68f4951990046e6e3c1':
Fix bug 3362979 - Holo light overflow button has stale focused state
2011-01-18 18:40:51 -08:00
Dianne Hackborn
a4605b72c2
am e6413270: Merge "Just a little \'ol activity manager permission change." into honeycomb
...
* commit 'e64132705279fea1769af3e5ef5c7384a2fef5d4':
Just a little 'ol activity manager permission change.
2011-01-18 18:40:29 -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
Christopher Tate
31cd02ade3
am 17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
...
* commit '17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
API CHANGE: add a no-View ctor for DragShadowBuilder
2011-01-18 18:36:06 -08:00
Romain Guy
069f9b6352
am 745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
...
* commit '745a529249c346656a404e38333f6d0ce6503fd7':
Smoother pinch-zoom in Browser.
2011-01-18 18:35:50 -08:00
John Reck
733e2047e7
am c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
...
* commit 'c098c1d348a183635561c504ccd67a9014a45475':
Create db path if it doesn't exit
2011-01-18 18:35:35 -08:00
Eric Rowe
f38bddbeb4
DO NOT MERGE Add connect HID/NAP BT stress test
...
Change-Id: I1d8cd5cb45583d1c4c5e94e72abbd8a9f04f53cf
2011-01-18 18:33:29 -08:00
Eric Rowe
a0d4d80fd2
DO NOT MERGE Cleaned up BT test utils
...
Change-Id: I905a468a04b5730258a9e6525165e4c4013d30c8
2011-01-18 18:33:29 -08:00
Romain Guy
2a83f001fd
Recreate the EGL surface when ViewRoot's surface changes.
...
Bug #3306150
Change-Id: Ifbf0ab9deca7a34eff7d844ea7276d12d7284788
2011-01-18 18:28:21 -08:00
Romain Guy
064f6ad392
Merge "Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150 " into honeycomb
2011-01-18 18:26:22 -08:00
Adam Powell
923757567e
Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
2011-01-18 18:03:23 -08:00
Adam Powell
0e6c3385eb
Fix bug 3362979 - Holo light overflow button has stale focused state
...
Change-Id: Id16dbbe2e800109b3cc2b491f3cd2c1e19c3bac2
2011-01-18 18:02:39 -08:00
Dianne Hackborn
e641327052
Merge "Just a little 'ol activity manager permission change." into honeycomb
2011-01-18 17:49:05 -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
Dianne Hackborn
6c2c5fc993
Just a little 'ol activity manager permission change.
...
We no longer enforce permissions for applications that are accessing
their own components. This allows an application to require a permission
on one of its components that it does not itself have. This is useful
for example with the new advanced widgets, which require a system-only
permission on the implementing service to ensure the app's data stays
private but it is nice to allow the application to still touch its own
widget service.
Change-Id: I5d61930a083816919545870039ad191314ed48c6
2011-01-18 17:02:33 -08:00
Jim Miller
31dae92650
Fix 3356338: Add recovery text to AccountUnlockScreen
...
This adds hint text to visit google.com/account/recovery if
the user forgets their google password.
Change-Id: I4c4c250b9e4116d2769b7760fdc291fa756c3db0
2011-01-18 17:02:04 -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
Nick Pelly
b6b426ad1c
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
2011-01-18 16:10:48 -08:00