summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 36276c61: am 1aad6c66: Omit duplicate images, query for management UI.Jeff Sharkey2013-09-101-4/+38
|\ | | | | | | | | * commit '36276c61fc07509b65b06f8ee4be2bd9e82dfd91': Omit duplicate images, query for management UI.
| * am 1aad6c66: Omit duplicate images, query for management UI.Jeff Sharkey2013-09-101-4/+38
| |\ | | | | | | | | | | | | * commit '1aad6c663ee188b02449e5e4d3e40e5c09c8fc14': Omit duplicate images, query for management UI.
| | * Omit duplicate images, query for management UI.Jeff Sharkey2013-09-101-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When returning recent files, omit images that have been scanned and provided by the Images backend. Return in-progress files when queried for management UI, otherwise only return complete files. Bug: 10659651 Change-Id: I8f05e6fcf53422905d7f51cc55611ca00af301bf
* | | am 7e9b6e27: (-s ours) am 5a0bf765: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit '7e9b6e27cdfa1354fe3fe39736cc5b551bc7c347': Import translations. DO NOT MERGE
| * | am 5a0bf765: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-100-0/+0
| |\| | | | | | | | | | | | | * commit '5a0bf765ff2ede5d964d7a1632d588d12c2ba0f7': Import translations. DO NOT MERGE
| | * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1059-0/+78
| | |\
| | | * Import translations. DO NOT MERGEBaligh Uddin2013-09-0959-0/+78
| | | | | | | | | | | | | | | | | | | | Change-Id: I0514b35f22ed9a725d76734c300e1501047975a6 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-1059-0/+78
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0959-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie630faaeafa03a919ed0bb294703da9b71514dbe Auto-generated-cl: translation import
* | | | | am b6ad4a04: am 66bdbe48: Hint sorting, remove XML, follow refactor.Jeff Sharkey2013-09-093-35/+17
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'b6ad4a04301263ef30d452d44b30588165849a89': Hint sorting, remove XML, follow refactor.
| * | | am 66bdbe48: Hint sorting, remove XML, follow refactor.Jeff Sharkey2013-09-093-35/+17
| |\| | | | | | | | | | | | | | | | | | * commit '66bdbe486e572aee1b06e3dbea9daf87ceb0e1bb': Hint sorting, remove XML, follow refactor.
| | * | Hint sorting, remove XML, follow refactor.Jeff Sharkey2013-09-093-35/+17
| | |/ | | | | | | | | | | | | Bug: 10672973, 10577809 Change-Id: I92314c35b37ac590830e881489e6a88afd860de4
* | | am 4a2779e1: am 3c03d1b8: Extend trampoline to show dialogs.Jeff Sharkey2013-09-068-69/+263
|\| | | | | | | | | | | | | | * commit '4a2779e183330fc89866bbb4181c06b1fe1c252f': Extend trampoline to show dialogs.
| * | am 3c03d1b8: Extend trampoline to show dialogs.Jeff Sharkey2013-09-068-69/+263
| |\| | | | | | | | | | | | | * commit '3c03d1b8b7d96209d7b83b6881421ddfc17ccc52': Extend trampoline to show dialogs.
| | * Extend trampoline to show dialogs.Jeff Sharkey2013-09-068-69/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | Handle incoming manage requests by launching finished downloads, or showing various retry dialogs. Pipe through summary, show percentage when in progress, and always show total size and MIME type. Bug: 10531347, 10599641 Change-Id: I3be2bc67ea3c0ef795146177200f5be77ad5114e
* | | am 75642678: am dd00499d: Merge "Relay content change notifications to ↵Jeff Sharkey2013-09-051-0/+7
|\| | | | | | | | | | | | | | | | | | | | documents." into klp-dev * commit '756426788d32821e265e021142eae9dabbdeaa78': Relay content change notifications to documents.
| * | am dd00499d: Merge "Relay content change notifications to documents." into ↵Jeff Sharkey2013-09-051-0/+7
| |\| | | | | | | | | | | | | | | | | | | klp-dev * commit 'dd00499d5806ab043e6c882641433a21a9406b6a': Relay content change notifications to documents.
| | * Merge "Relay content change notifications to documents." into klp-devJeff Sharkey2013-09-051-0/+7
| | |\
| | | * Relay content change notifications to documents.Jeff Sharkey2013-09-051-0/+7
| | | | | | | | | | | | | | | | | | | | Bug: 10531347 Change-Id: Ia704b233623e913da3a5cb7c8aa5e024900e1d3a
* | | | am 8bbc3571: (-s ours) am ec96960f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-030-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '8bbc35713d730ce64d78c40b775826a174c3f4c9': Import translations. DO NOT MERGE
| * | | am ec96960f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-09-030-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'ec96960f2ce6d2aa79bbdc9895909ff11c3bc2b5': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-033-3/+3
| | |/ | | | | | | | | | | | | Change-Id: I78ad6b89138262e745cb31d0e145a97d1bedf377 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-09-033-3/+3
| | | | | | | | | | | | | | | Change-Id: I91cebc244f1e3f9d17d440446aa33c47ecd96961 Auto-generated-cl: translation import
* | | am 1cc80cde: am 5669bb20: Merge "Remove content flags to indicate */* ↵Jeff Sharkey2013-09-021-3/+1
|\| | | | | | | | | | | | | | | | | | | | support." into klp-dev * commit '1cc80cdee35abe20ec1c3f44bdcf54442b0138cd': Remove content flags to indicate */* support.
| * | am 5669bb20: Merge "Remove content flags to indicate */* support." into klp-devJeff Sharkey2013-09-021-3/+1
| |\| | | | | | | | | | | | | * commit '5669bb20b45b14670f9b6844e1ddaa428058cdb1': Remove content flags to indicate */* support.
| | * Merge "Remove content flags to indicate */* support." into klp-devJeff Sharkey2013-09-031-3/+1
| | |\
| | | * Remove content flags to indicate */* support.Jeff Sharkey2013-09-021-3/+1
| | | | | | | | | | | | | | | | | | | | Bug: 10597317 Change-Id: Ia32f4ec34847680135c300dfe8fe73694da4c57a
* | | | am 747c95dc: am 0ceb40f6: Merge "New recent documents behavior." into klp-devJeff Sharkey2013-09-021-1/+23
|\| | | | | | | | | | | | | | | | | | | * commit '747c95dcd7ba22184c71067673edf6dfd336f9fe': New recent documents behavior.
| * | | am 0ceb40f6: Merge "New recent documents behavior." into klp-devJeff Sharkey2013-09-021-1/+23
| |\| | | | | | | | | | | | | | | | | | * commit '0ceb40f6fdacb93d15cfaebd61ce5aee27b74823': New recent documents behavior.
| | * | Merge "New recent documents behavior." into klp-devJeff Sharkey2013-09-031-1/+23
| | |\|
| | | * New recent documents behavior.Jeff Sharkey2013-09-021-1/+23
| | | | | | | | | | | | | | | | | | | | Bug: 10593596 Change-Id: I708d2396266d083a494e57eab2637471e54e1cdc
* | | | am 79397ab8: am 7298c1c8: Merge "Follow refactoring of DocumentsContract." ↵Jeff Sharkey2013-09-021-34/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '79397ab8411080ced3899d3e28655fa0ec8621b1': Follow refactoring of DocumentsContract.
| * | | am 7298c1c8: Merge "Follow refactoring of DocumentsContract." into klp-devJeff Sharkey2013-09-021-34/+44
| |\| | | | | | | | | | | | | | | | | | * commit '7298c1c8865cf37e7f3a63ac26e4e45673c9792b': Follow refactoring of DocumentsContract.
| | * | Merge "Follow refactoring of DocumentsContract." into klp-devJeff Sharkey2013-09-031-34/+44
| | |\|
| | | * Follow refactoring of DocumentsContract.Jeff Sharkey2013-08-311-34/+44
| | | | | | | | | | | | | | | | | | | | Bug: 10567557 Change-Id: If03f352f865073b0e332a6a1c40cc34d83425b62
* | | | am c537ad51: (-s ours) am 3d5d27e2: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-08-290-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'c537ad51049e99c4c3fc8e56978a069d67134dbc': Import translations. DO NOT MERGE
| * | | am 3d5d27e2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-08-290-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit '3d5d27e227050096b2c77086b1d7d37cb495c794': Import translations. DO NOT MERGE
| | * | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-08-292-0/+124
| | |\ \ | | | |/ | | |/|
| | | * Import translations. DO NOT MERGEBaligh Uddin2013-08-292-0/+124
| | | | | | | | | | | | | | | | | | | | Change-Id: I107503db5dd53420ad908e8bd6e489ebf5971e71 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-294-0/+224
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-08-294-0/+224
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I463fc73199ebd089b6c01a128e2970e1abea7604 Auto-generated-cl: translation import
* | | | | am b6a2614a: am ec62bdf2: Follow stronger DocumentsProvider contract.Jeff Sharkey2013-08-285-205/+104
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'b6a2614a57e8177f2ce60717477d8eaa9881f77d': Follow stronger DocumentsProvider contract.
| * | | am ec62bdf2: Follow stronger DocumentsProvider contract.Jeff Sharkey2013-08-285-205/+104
| |\| | | | | | | | | | | | | | | | | | * commit 'ec62bdf20cbfa709c9dea9101fe668fec315c103': Follow stronger DocumentsProvider contract.
| | * | Follow stronger DocumentsProvider contract.Jeff Sharkey2013-08-285-205/+104
| | |/ | | | | | | | | | | | | | | | | | | | | | Provides same functionality, but follows updated DocumentsProvider contract in framework. Bug: 10497206 Change-Id: Ie1f6180047ff7bad289679a14f3368238d47b1d6
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-08-2817-3/+899
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-08-2617-3/+899
| | | | | | | | | | | | | | | | | | | | Change-Id: I082a4ee7f23b01276fa122bcdc7391033060674b Auto-generated-cl: translation import
* | | | am 281b1f71: (-s ours) am fd07263f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-260-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '281b1f71411cba6f61ca52350585919c01eb70c5': Import translations. DO NOT MERGE
| * | am fd07263f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-260-0/+0
| |\| | | | | | | | | | | | | * commit 'fd07263f824134d4bce91a3e1d51c851894bf758': Import translations. DO NOT MERGE
| | * Import translations. DO NOT MERGEBaligh Uddin2013-08-239-3/+499
| | | | | | | | | | | | | | | Change-Id: I60a8cd64b094a32b747f51882fb0b3b30d69680e Auto-generated-cl: translation import
* | | am 6831b8ea: (-s ours) am 3173474b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-08-220-0/+0
|\| | | | | | | | | | | | | | * commit '6831b8eacb3058f733bcc6a5058b18ada5ed5889': Import translations. DO NOT MERGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 02:30:26 +0000