| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | am b9b29311: Merge "Add setting to control tabs per app behavior" into jb-dev | Michael Kolb | 2012-05-16 | 6 | -2/+113 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b9b293119d3a4a94b5d05d8e555070738ca3c36f': Add setting to control tabs per app behavior | |||||
| | | * | | | | | | Merge "Add setting to control tabs per app behavior" into jb-dev | Michael Kolb | 2012-05-16 | 6 | -2/+113 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Add setting to control tabs per app behavior | Michael Kolb | 2012-05-16 | 6 | -2/+113 | |
| | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5890701 Change-Id: I6a47c7bff260dd8ded3a4c360f186ce8f670c67e | |||||
| * | | | | | | | | am 4a6d851f: (-s ours) am 95f45048: Import translations. DO NOT MERGE | Eric Fischer | 2012-05-17 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a6d851f150a5a5c30fce63985333182138e5f02': Import translations. DO NOT MERGE | |||||
| | * | | | | | | | am 95f45048: Import translations. DO NOT MERGE | Eric Fischer | 2012-05-16 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * commit '95f4504859cc835f47b7cc92cd516be037da3e43': Import translations. DO NOT MERGE | |||||
| | | * | | | | | | Import translations. DO NOT MERGE | Eric Fischer | 2012-05-16 | 1 | -2/+2 | |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | Change-Id: I350959a9393639093fa43b8971b5353735297a08 | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Eric Fischer | 2012-05-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26c643304b0417ecc03eac99cd9af0a3b9c59ba6 | |||||
| * | | | | | | | am db2b8d0f: am 234eadcf: Don\'t wait on ContactsProvider | Ben Murdoch | 2012-05-16 | 2 | -20/+43 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | * commit 'db2b8d0f6cee93a4ddeb046a347c3e67901ef857': Don't wait on ContactsProvider | |||||
| | * | | | | | | am 234eadcf: Don\'t wait on ContactsProvider | Ben Murdoch | 2012-05-16 | 2 | -20/+43 | |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | * commit '234eadcf7d0dbf2d24f92c24f40343d518f6fe3a': Don't wait on ContactsProvider | |||||
| | | * | | | | | Don't wait on ContactsProvider | Ben Murdoch | 2012-05-16 | 2 | -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 b21b50db: Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | * commit 'b21b50dbe068c3b4630da10e52d4fb09437c27f7': Fix typo | |||||
| | | | | | | | ||||||
| | | \ \ \ \ | ||||||
| | *-. \ \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | | | |_|/ | | | |/| | | Change-Id: Id4489ede7670faf70f532424a2ed3729a8aadfe1 | |||||
| | | | * | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-16 | 0 | -0/+0 | |
| | | | |\ \ \ | | | | |/ / | | | |/| | | ||||||
| | | | | * | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-15 | 0 | -0/+0 | |
| | | | | |\ \ | ||||||
| | | * | | \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-16 | 0 | -0/+0 | |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | | * | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-15 | 0 | -0/+0 | |
| | | | |\ \ \ \ | | | | |/ / / | | | |/| / / | | | | |/ / | ||||||
| | | | | * | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-10 | 0 | -0/+0 | |
| | | | | |\ \ | ||||||
| | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-09 | 0 | -0/+0 | |
| | | | | | |\ \ | ||||||
| | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-08 | 0 | -0/+0 | |
| | | | | | | |\ \ | ||||||
| | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-06 | 0 | -0/+0 | |
| | | | | | | | |\ \ | ||||||
| | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-04 | 0 | -0/+0 | |
| | | | | | | | | |\ \ | ||||||
| | | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-03 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-02 | 0 | -0/+0 | |
| | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-01 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-30 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-04-25 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | * | | Fix typo | John Reck | 2012-04-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6380858 Change-Id: Iaa5f5629b02a37bf4b5425d06857808f53e05ec9 | |||||
| | | | | | | | | | | | | | | | * | | merge in jb-release history after reset to master | The Android Automerger | 2012-04-24 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-23 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-18 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-17 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-16 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-12 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-11 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-10 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-09 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-04 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-04-02 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-29 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-28 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-27 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-21 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in jb-release history after reset to master | The Android Automerger | 2012-03-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-15 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-release history after reset to master | The Android Automerger | 2012-03-14 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | ||||||
 |
index : packages_apps_Browser.git | |
| Unnamed repository; edit this file 'description' to name the repository. | git repository hosting |
| summaryrefslogtreecommitdiffstats |