summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge "Make sure focusSearch doesn't return a detached webview" into jb-devJohn Reck2012-05-301-2/+4
| |\ \
| | * | Make sure focusSearch doesn't return a detached webviewJohn Reck2012-05-301-2/+4
| | |/ | | | | | | | | | | | | | | | Bug: 6535227 Change-Id: I18bf24117d8ffcbbd440b2a47b2db422e41894f4
* | | am 06b7e0fa: Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-303-13/+40
|\ \ \ | |/ / | | | | | | | | | * commit '06b7e0fafdee08f7045f419b19eb1aacb00d7d60': tighten nav bar layout & fix animation bug
| * | Merge "tighten nav bar layout & fix animation bug" into jb-devMichael Kolb2012-05-303-13/+40
| |\ \
| | * | tighten nav bar layout & fix animation bugMichael Kolb2012-05-293-13/+40
| | |/ | | | | | | | | | | | | | | | Bug: 6563289 Change-Id: I00fdecf645128bb1fec8e23be94aa2b85fb586f7
* | | am 41597569: Merge "Only change text in url input when it changed" into jb-devMichael Kolb2012-05-301-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit '4159756953c0ada88f774828d6a1f329564d222b': Only change text in url input when it changed
| * | Only change text in url input when it changedMichael Kolb2012-05-291-1/+3
| |/ | | | | | | | | | | Bug: 6556693 Change-Id: Iad0f285f89710de1bbdf7ab5f727bdc81d4ef387
* | am f695f6b4: Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
|\ \ | |/ | | | | | | * commit 'f695f6b4399f3a60a5d9d0aa39b8c341e8b8592a': Tell Browser to monitor the WebCore thread for responsiveness.
| * Tell Browser to monitor the WebCore thread for responsiveness.Ben Murdoch2012-05-241-0/+1
| | | | | | | | | | | | | | | | We no longer enable the WebCore thread watchdog for all WebViews, but we still want the functionality in Browser. Bug: 6447214 Change-Id: I1665bef875d53239203bc6313ac39af4bda6a60b
* | am c90effde: Merge "Disable fixed title bar in quick controls" into jb-devJohn Reck2012-05-231-3/+8
|\ \ | |/ | | | | | | * commit 'c90effdedc1c38eabc2c731d5a55c17f881862b1': Disable fixed title bar in quick controls
| * Disable fixed title bar in quick controlsJohn Reck2012-05-231-3/+8
| | | | | | | | | | | | Bug: 6546959 Change-Id: I7511497869ddf7b5107d73c378b88a6363d08ce6
* | am 57b7b8a3: Merge "Fix portrait\'s fixed title bar" into jb-devJohn Reck2012-05-213-24/+115
|\ \ | |/ | | | | | | * commit '57b7b8a301dcfd1686396ce118526c8a7e2d4245': Fix portrait's fixed title bar
| * Fix portrait's fixed title barJohn Reck2012-05-183-24/+115
| | | | | | | | | | | | Bug: 6468013 Change-Id: Ia6ee9645df9ebb8aa98734efef45b57db94651f7
* | am 501fa728: Merge "Added a menu item in Browser called Close other tabs"Jean-Baptiste Queru2012-05-173-0/+28
|\ \ | | | | | | | | | | | | * commit '501fa7284ae63fe28b8f81f403f24befa7c992dd': Added a menu item in Browser called Close other tabs
| * | Added a menu item in Browser called Close other tabsAfzal Najam2012-05-173-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | This closes all other tabs except the current one (only for the phone interface) Will submit patch for tablet interface once this is approved. It solves the problem of mass closing unneeded tabs to a certain extent. Preferred method would be to select multiple tabs like list items. Change-Id: I5af00f1c19043104987375f1da396eb6fefb5dd4
* | | am 26bebab1: Merge "Monkey" into jb-devJohn Reck2012-05-161-1/+3
|\ \ \ | | |/ | |/| | | | | | | * commit '26bebab15e925f887ed2f85bccda03083a182289': Monkey
| * | Merge "Monkey" into jb-devJohn Reck2012-05-161-1/+3
| |\ \
| | * | MonkeyJohn Reck2012-05-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6404028 Change-Id: I84935de2d159058c373551ebf22306381089ef05
* | | | am fe935632: Merge "Toggle QC request desktop icon" into jb-devMichael Kolb2012-05-163-1/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'fe9356329710e8fae22bb3dc5f6aea86ae3cb87e': Toggle QC request desktop icon
| * | | Merge "Toggle QC request desktop icon" into jb-devMichael Kolb2012-05-163-1/+13
| |\ \ \
| | * | | Toggle QC request desktop iconMichael Kolb2012-05-163-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6493939 Change-Id: I7787ab37b57fce8ea2332fefd1ace420357000ec
* | | | | am b9b29311: Merge "Add setting to control tabs per app behavior" into jb-devMichael Kolb2012-05-163-1/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b9b293119d3a4a94b5d05d8e555070738ca3c36f': Add setting to control tabs per app behavior
| * | | | Add setting to control tabs per app behaviorMichael Kolb2012-05-163-1/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 5890701 Change-Id: I6a47c7bff260dd8ded3a4c360f186ce8f670c67e
* | | | am 234eadcf: Don\'t wait on ContactsProviderBen Murdoch2012-05-162-20/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '234eadcf7d0dbf2d24f92c24f40343d518f6fe3a': Don't wait on ContactsProvider
| * | | Don't wait on ContactsProviderBen Murdoch2012-05-162-20/+43
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now during the initial WebSettings sync to native we wait for the autofill profile to be loaded from disk so that it can be synced. If there's no profile set, then we try to infer a profile from the user's Me contact profile. Querying the Me contact can be slow and in some extreme cases can cause the settings sync on the UI thread to block long enough to show an ANR. Instead signal the threads (via the CountdownLatch) waiting on the initial import before we do the Me profile lookup. Note that we still may block the UI thread if the lookup of an already saved profile takes an exceptionally long time. This is so that when a user has saved a profile, we'll never resort to showing them the "setup autofill" message. (But all ANR reports to date have shown that we were querying the Me contact at the time of ANR). Bug: 6371781 Change-Id: Ibb0d5e285ec3587d9f9bad3e69b79890850c2f6d
* | | am 54217b39: Hide webview when showing a custom viewMichael Kolb2012-05-151-0/+2
|\ \ \ | |/ / | | | | | | | | | * commit '54217b39d7d097f2f4fe9fac928a1c3bf1b9f13f': Hide webview when showing a custom view
| * | Hide webview when showing a custom viewMichael Kolb2012-05-151-0/+2
| | | | | | | | | | | | | | | | | | bug:6477718 Change-Id: Id3253096755ac4c174a791115f06dcb195b699c7
* | | am 2b552f51: Monkey proofingMichael Kolb2012-05-141-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '2b552f5154fb582ddfd3296eaa8ec35675edb613': Monkey proofing
| * | Monkey proofingMichael Kolb2012-05-141-1/+1
| | | | | | | | | | | | | | | | | | Bug: 6482880 Change-Id: I0fe14b6828098071ebd6dc4782cf092dc018ee3e
* | | am 40e7f350: MonkeyJohn Reck2012-05-091-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit '40e7f350e0aee6308b03d206721fcf80cfff051f': Monkey
| * | MonkeyJohn Reck2012-05-091-1/+3
| | | | | | | | | | | | | | | | | | Bug: 6438833 Change-Id: Ia4a45612cdb91837b104b8cdd23c1a17e5b7ae91
* | | am 7286427e: Don\'t capture pictureMichael Kolb2012-05-092-4/+13
|\ \ \ | |/ / | | | | | | | | | * commit '7286427ee44435acf5f0ccd1146d9d0b15a36d02': Don't capture picture
| * | Don't capture pictureMichael Kolb2012-05-072-4/+13
| | | | | | | | | | | | | | | | | | Bug: 6439427 Change-Id: I7704d8c81bbb9e612faf3a3206cee245e746035b
* | | am 52eafbb7: Merge "fix monkey NPE" into jb-devMichael Kolb2012-05-071-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit '52eafbb7601eac6ce0011edeb2a73ffccb6fb751': fix monkey NPE
| * | fix monkey NPEMichael Kolb2012-05-071-1/+3
| | | | | | | | | | | | | | | | | | Bug: 6445628 Change-Id: I4a4e2aa2e76596501deea5b6b6b05ea5bcda396e
* | | am 9ee87d9c: Fix getItemId()John Reck2012-05-043-3/+10
|\ \ \ | |/ / | | | | | | | | | * commit '9ee87d9ce5aae1460f53bea66bfcafd3671505a0': Fix getItemId()
| * | Fix getItemId()John Reck2012-05-043-3/+10
| | | | | | | | | | | | | | | | | | Bug: 6446119 Change-Id: If8c13c9f2cb9b93c6f3575f12111059aeeacd5cb
* | | am b0fb2baa: Merge "Remove voice search handling" into jb-devMichael Kolb2012-05-0320-722/+42
|\ \ \ | |/ / | | | | | | | | | * commit 'b0fb2baae970c52b0dcf2f0677df5d89078f1480': Remove voice search handling
| * | Merge "Remove voice search handling" into jb-devMichael Kolb2012-05-0320-722/+42
| |\ \
| | * | Remove voice search handlingMichael Kolb2012-05-0320-722/+42
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6439925 Change-Id: I1b7161a67fa0c20d87f147d6ed19c02e53093054
* | | | am 3e455284: Fix NPEJohn Reck2012-05-031-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3e455284e1e0432fd533de7f082e1426d152d78d': Fix NPE
| * | | Fix NPEJohn Reck2012-05-031-1/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Bug: 6400217 Old saved pages won't have a data file to delete as their data is entirely in the DB. Change-Id: I8f497cec72ca543718b3a1f207e71b0eaa2c14ea
* | | am f6504f86: Don\'t block fast QC selectionMichael Kolb2012-05-031-2/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'f6504f863a407c9b4615ac14de9b623775f65f69': Don't block fast QC selection
| * | Don't block fast QC selectionMichael Kolb2012-05-021-2/+4
| | | | | | | | | | | | | | | | | | Bug: 6434532 Change-Id: I42391bc3bb398e4ced9f15acdbfb270d5755fc5a
* | | am d6c13e16: Merge "UserAgent not propagated from Browser to DownloadProvider"Jean-Baptiste Queru2012-05-021-0/+1
|\ \ \ | |/ / |/| / | |/ | | * commit 'd6c13e1635ddb4cb42d120c2dfdca1ada6d1a7b2': UserAgent not propagated from Browser to DownloadProvider
| * Merge "UserAgent not propagated from Browser to DownloadProvider"Jean-Baptiste Queru2012-05-021-0/+1
| |\
| | * UserAgent not propagated from Browser to DownloadProviderPatrik Stenkilsson2012-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Browser does not propagate the userAgent to DownloadProvider for downloads. When downloads are started the default userAgent in DownloadProvider is used instead of using the userAgent of the Browser. This makes downloads on some services / web pages fail. This is solved this by including the Browser userAgent in the request to the DownloadManager. Change-Id: If4e0f3c29eb7fd5fc585dd01987ae7f0b54ffc32
| * | am 0ffa9713: DO NOT MERGE Fix generic filter checkJohn Reck2012-01-041-1/+1
| |\ \ | | |/ | |/| | | | | | | * commit '0ffa9713dc66c4b0db3027a1edab52c99a3af129': DO NOT MERGE Fix generic filter check
| | * DO NOT MERGE Fix generic filter checkJohn Reck2012-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Bug: 5768794 Cherry pick from master Change-Id: I7bace7a33fe1601039a5aacc5c3af7167d566a1d
| * | Make static fields of WSF$Site package-privateConley Owens2011-12-211-3/+3
| |/ | | | | | | | | | | | | | | | | | | This makes a little more sense since they are accessed outside of the class that they are defined in. In addition, this fixes errors created by proguard when building with OpenJDK. Change-Id: I41d9bbb687628140038eb517ea08517cee37e0c7