Adam Powell
e1dcf88c60
am 0cc969a7: am 47892388: Make AutoCompleteTextView#setText(CharSequence, boolean) public
...
* commit '0cc969a7ab86f6e2700c907c8f595baf55d8df9b':
Make AutoCompleteTextView#setText(CharSequence, boolean) public
2012-08-02 18:28:30 -07:00
Adam Powell
0cc969a7ab
am 47892388: Make AutoCompleteTextView#setText(CharSequence, boolean) public
...
* commit '478923885da8fac0c1e0a8b7d85b98d1988504bc':
Make AutoCompleteTextView#setText(CharSequence, boolean) public
2012-08-02 18:26:31 -07:00
Robert Greenwalt
272843be3d
am d671cdd7: am 84aa999e: am 2cb7db11: resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp
...
* commit 'd671cdd7e278f925e7bcc8dcdabd9c0998ff1ad8':
Fix a logging NPE problem
2012-08-02 17:30:37 -07:00
Adam Powell
478923885d
Make AutoCompleteTextView#setText(CharSequence, boolean) public
...
Bug 6807326
Public bug http://code.google.com/p/android/issues/detail?id=34690
Make this available for use by applications that wish to make
programmatic changes to the AutoCompleteTextView without filtering.
Change-Id: I889452d3b19b378258ad9247f3d254afee1e8408
2012-08-02 17:30:32 -07:00
Robert Greenwalt
d671cdd7e2
am 84aa999e: am 2cb7db11: resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp
...
* commit '84aa999ed202b3f2fc6fbf5cd39d66dad1af1ed3':
Fix a logging NPE problem
2012-08-02 17:28:28 -07:00
Robert Greenwalt
84aa999ed2
am 2cb7db11: resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp
...
* commit '2cb7db116f738b9c88f3aeceb345cbdc99de04ce':
Fix a logging NPE problem
2012-08-02 17:26:29 -07:00
Robert Greenwalt
2cb7db116f
resolved conflicts for merge of 41508f05 to jb-dev-plus-aosp
...
Change-Id: I7232528f0f438ce9cf7759643631a250f545306e
2012-08-02 17:15:43 -07:00
George Mount
ed85b04ebd
am 8502ab91: am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
...
* commit '8502ab91bdd8ed34eeebed2daac90dea7b3da0ea':
Cancel handler for JS unload handler prevents hang.
2012-08-02 16:33:30 -07:00
George Mount
8502ab91bd
am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
...
* commit 'daceb30bf5e54aeb73a3909a26f51322d3f8efdc':
Cancel handler for JS unload handler prevents hang.
2012-08-02 16:31:05 -07:00
George Mount
daceb30bf5
Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
2012-08-02 16:28:03 -07:00
Svetoslav Ganov
b16c018ca3
am c171d515: am 25dd892c: am e1c47324: am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
...
* commit 'c171d515b3b2d31d0bc58dcf0563b7daf1116fc7':
Notification panel on tablet does not handle back and home key events.
2012-08-02 16:13:46 -07:00
Svetoslav Ganov
c171d515b3
am 25dd892c: am e1c47324: am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
...
* commit '25dd892ce9dc7d83970a3aa55f25ec8e110dfe84':
Notification panel on tablet does not handle back and home key events.
2012-08-02 16:10:38 -07:00
Svetoslav Ganov
25dd892ce9
am e1c47324: am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
...
* commit 'e1c47324fc22f86f378cb6ccc51e4554eec5156b':
Notification panel on tablet does not handle back and home key events.
2012-08-02 16:07:35 -07:00
Robert Greenwalt
41508f0544
Fix a logging NPE problem
...
bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
2012-08-02 16:06:56 -07:00
Dirk Dougherty
9b060ff52d
am 06faa929: am 66779511: am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
...
* commit '06faa929adc9179679ecd0c35856975cb957461d':
Doc change: add trademarks attribution.
2012-08-02 15:47:55 -07:00
Dirk Dougherty
06faa929ad
am 66779511: am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
...
* commit '6677951135f6062c678f98af2f8fb42f8241ae9b':
Doc change: add trademarks attribution.
2012-08-02 15:43:53 -07:00
Dirk Dougherty
6677951135
am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
...
* commit '265eea82ae24b5620dc84fa6c51ba72aca9a1cf6':
Doc change: add trademarks attribution.
2012-08-02 15:39:55 -07:00
Svetoslav Ganov
e1c47324fc
am 9a59f6e0: Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
...
* commit '9a59f6e02fdcabbf2debd5b836b01f7b22a4b21a':
Notification panel on tablet does not handle back and home key events.
2012-08-02 15:19:03 -07:00
Svetoslav Ganov
9a59f6e02f
Merge "Notification panel on tablet does not handle back and home key events." into jb-dev
2012-08-02 15:16:03 -07:00
George Mount
df9cae4de3
Cancel handler for JS unload handler prevents hang.
...
Bug 6803309
When the alert dialog raised by the JS unload handler was pressed
outside the alert region, it was canceled and no response was
sent back to WebViewCore. This captures the cancel event so that
WebViewCore doesn't hang.
Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
2012-08-02 15:14:39 -07:00
Jeff Brown
26714f8acf
am 961e0862: am f95f3ebf: Merge "Allow access to display manager service from isolated processes." into jb-mr1-dev
...
* commit '961e0862a6189568866052b470e97a7315efb2ef':
Allow access to display manager service from isolated processes.
2012-08-02 15:11:18 -07:00
Brian Carlstrom
02aecd44de
am a69e9ae1: am 7786687e: am 4040fccd: am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
...
* commit 'a69e9ae16d66d69d2c21994ed47c12ec2529501f':
Change KeyStore to use Modified UTF-8 to match NativeCrypto
2012-08-02 15:11:14 -07:00
Brian Carlstrom
aa3014e1bc
am d89de8ef: am d9ea9c98: am fb64fe1b: am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
...
* commit 'd89de8ef2cce14be261859573bab1fbfb3866d5e':
Improve test key names to reproduce public issue
2012-08-02 15:11:09 -07:00
Adam Powell
b7061d5847
am 6b225b09: am 19e662ba: Merge "Fix some ActionBar menu issues around config changes" into jb-mr1-dev
...
* commit '6b225b0962c63d83d9f4dbe9a569ec8e7eb657b7':
Fix some ActionBar menu issues around config changes
2012-08-02 15:10:51 -07:00
Craig Mautner
c3edff71bf
am d844e4f2: am 2a642a45: Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev
...
* commit 'd844e4f285348ede6e4f40e71d727e2fe4866c3e':
Refactor DisplayManagerService to be functional.
2012-08-02 15:10:46 -07:00
rich cannings
3cfe6d5cef
am 8c968174: am 9866d60e: Merge "Pass URLs to package verifiers" into jb-mr1-dev
...
* commit '8c96817480863aff8554f95da4f2151b0e9ee5e9':
Pass URLs to package verifiers
2012-08-02 15:10:40 -07:00
Marco Nelissen
698f951634
am 0290250c: am 8ab2dc2f: Improve scan time for some cases
...
* commit '0290250cc973b83fcded715189d8814fbfc0a091':
Improve scan time for some cases
2012-08-02 15:10:36 -07:00
Adam Powell
446b54565a
am 0f5a749c: am b1758cf8: Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev
...
* commit '0f5a749c60d489683112fe6cf5220d1a576582ca':
Make MediaRouteButton focusable by default
2012-08-02 15:10:32 -07:00
George Mount
12b7b7fea8
am be38cccd: am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev
...
* commit 'be38cccd91e12576ed994719b6b83371c5749bb9':
Don't restart input in the middle of a batch.
2012-08-02 15:10:28 -07:00
Chris Wren
453eb4fc54
am c0e102cf: am dfa6c268: Merge "Venetian blinds policy for one-finger notification expansion." into jb-mr1-dev
...
* commit 'c0e102cf3b2155d10c6333e23a464e2c2249c77e':
Venetian blinds policy for one-finger notification expansion.
2012-08-02 15:10:24 -07:00
Scott Main
c2c6cee6b5
am a99c569b: am 26ea2e5d: am 80adeb53: am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
...
* commit 'a99c569ba3a59c6f3949e7c39baa121519e12de7':
fix markup for gl pie
2012-08-02 15:10:20 -07:00
Katie McCormick
e0f968f7a2
am 3d55a4c9: am 1d377a19: am 27ed953f: (-s ours) am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
...
* commit '3d55a4c92688724e20a8cd7239c031880a61ff4a':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
2012-08-02 15:10:16 -07:00
Craig Mautner
7f24ce696a
am ccafb1ad: am 437a0fbd: Merge "Introduce multiple displays with DisplayContent." into jb-mr1-dev
...
* commit 'ccafb1ad5d60d70baa7f4fbf155e906261e42953':
Introduce multiple displays with DisplayContent.
2012-08-02 15:08:51 -07:00
Jeff Brown
961e0862a6
am f95f3ebf: Merge "Allow access to display manager service from isolated processes." into jb-mr1-dev
...
* commit 'f95f3ebf12bf9ee23b8ed4e940ab007cbc22f3f3':
Allow access to display manager service from isolated processes.
2012-08-02 15:02:54 -07:00
Brian Carlstrom
a69e9ae16d
am 7786687e: am 4040fccd: am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
...
* commit '7786687e7eb17c7670dacb08eca3346a945232aa':
Change KeyStore to use Modified UTF-8 to match NativeCrypto
2012-08-02 15:02:49 -07:00
Brian Carlstrom
d89de8ef2c
am d9ea9c98: am fb64fe1b: am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
...
* commit 'd9ea9c985147ec019f84ac6ae4c42cc08fd22768':
Improve test key names to reproduce public issue
2012-08-02 15:02:44 -07:00
Jeff Brown
f95f3ebf12
Merge "Allow access to display manager service from isolated processes." into jb-mr1-dev
2012-08-02 14:58:47 -07:00
Adam Powell
6b225b0962
am 19e662ba: Merge "Fix some ActionBar menu issues around config changes" into jb-mr1-dev
...
* commit '19e662baa9f439ffa95001a6fd7b69b2667735b4':
Fix some ActionBar menu issues around config changes
2012-08-02 14:58:13 -07:00
Craig Mautner
d844e4f285
am 2a642a45: Merge "Refactor DisplayManagerService to be functional." into jb-mr1-dev
...
* commit '2a642a450a07dfdb94d897ef06d2348855dcc431':
Refactor DisplayManagerService to be functional.
2012-08-02 14:58:08 -07:00
rich cannings
8c96817480
am 9866d60e: Merge "Pass URLs to package verifiers" into jb-mr1-dev
...
* commit '9866d60ea4f7476df781230a7f33ed5c2af031c9':
Pass URLs to package verifiers
2012-08-02 14:58:03 -07:00
Marco Nelissen
0290250cc9
am 8ab2dc2f: Improve scan time for some cases
...
* commit '8ab2dc2f9680307febe997631c2148729f714e3d':
Improve scan time for some cases
2012-08-02 14:57:59 -07:00
Adam Powell
0f5a749c60
am b1758cf8: Merge "Make MediaRouteButton focusable by default" into jb-mr1-dev
...
* commit 'b1758cf8cd007bfffb3d8adceca25f3b0c82bd77':
Make MediaRouteButton focusable by default
2012-08-02 14:57:54 -07:00
Dirk Dougherty
265eea82ae
am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev
...
* commit '568db47b770cbfaacdd54914540923258cd6f847':
Doc change: add trademarks attribution.
2012-08-02 14:57:50 -07:00
George Mount
be38cccd91
am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev
...
* commit 'ed9960ff7f93167cc31b779529a3118731873b40':
Don't restart input in the middle of a batch.
2012-08-02 14:57:45 -07:00
Chris Wren
c0e102cf3b
am dfa6c268: Merge "Venetian blinds policy for one-finger notification expansion." into jb-mr1-dev
...
* commit 'dfa6c2681de4d7185a55218444c54f407ca5eb15':
Venetian blinds policy for one-finger notification expansion.
2012-08-02 14:57:39 -07:00
Scott Main
a99c569ba3
am 26ea2e5d: am 80adeb53: am 5ae754c9: Merge "fix markup for gl pie" into jb-dev
...
* commit '26ea2e5df58edfd14717c86854f6bb99975b6a77':
fix markup for gl pie
2012-08-02 14:57:32 -07:00
Katie McCormick
3d55a4c926
am 1d377a19: am 27ed953f: (-s ours) am 9f942089: Merge changes I9bd42a8a,I613d0b12 into jb-dev
...
* commit '1d377a19aaf1f3f91b1e45059c3bb2d871f6f776':
cherrypick from master docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Doc update: Misc minor GCM updates.
2012-08-02 14:57:27 -07:00
Brian Carlstrom
7786687e7e
am 4040fccd: am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"
...
* commit '4040fccdddcc4669b01979572c8289b2d674a711':
Change KeyStore to use Modified UTF-8 to match NativeCrypto
2012-08-02 14:56:59 -07:00
Brian Carlstrom
d9ea9c9851
am fb64fe1b: am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"
...
* commit 'fb64fe1b6ed02f9e52694029f1efe47665353d48':
Improve test key names to reproduce public issue
2012-08-02 14:56:55 -07:00
Jeff Brown
e7c1d88fba
Allow access to display manager service from isolated processes.
...
Bug: 6921302
Change-Id: I9eed4a24992538e18ad0540b96a8cea2c8a9ef76
2012-08-02 14:55:26 -07:00