summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2014-11-1772-409/+228
| | | | | Change-Id: I9009062e2607659a7f84b39c09edb81cc26b7d19 Auto-generated-cl: translation import
* am 00719714: am 82e6e69c: am 26e8a3e3: Remove call to deleted method ↵Jeff Brown2014-11-151-7/+0
|\ | | | | | | | | | | | | AsyncTask.init(). * commit '0071971480f08740ef4e77b420c565e4a336c096': Remove call to deleted method AsyncTask.init().
| * am 82e6e69c: am 26e8a3e3: Remove call to deleted method AsyncTask.init().Jeff Brown2014-11-151-7/+0
| |\ | | | | | | | | | | | | * commit '82e6e69c53a46139a9c2bd9e4b6043f02115428d': Remove call to deleted method AsyncTask.init().
| | * am 26e8a3e3: Remove call to deleted method AsyncTask.init().Jeff Brown2014-11-151-7/+0
| | |\ | | | | | | | | | | | | | | | | * commit '26e8a3e31a8caf5daf303ce2f31e72a11236444f': Remove call to deleted method AsyncTask.init().
| | | * Remove call to deleted method AsyncTask.init().Jeff Brown2014-11-141-7/+0
| | | | | | | | | | | | | | | | | | | | Bug: 18192406 Change-Id: I94df77ad8aaac8da5583ab80572c0bbd120b980e
* | | | am 55e64e96: am d9edbcd2: am d2575cb1: Merge "Add padding around empty list ↵Andrew Lee2014-11-131-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | text view." into lmp-mr1-dev * commit '55e64e96e583b707c803aa3c01ef6105fb36b68a': Add padding around empty list text view.
| * | | am d9edbcd2: am d2575cb1: Merge "Add padding around empty list text view." ↵Andrew Lee2014-11-131-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'd9edbcd2c7d2919c990e7c1b076d77bec1f26126': Add padding around empty list text view.
| | * | am d2575cb1: Merge "Add padding around empty list text view." into lmp-mr1-devAndrew Lee2014-11-121-1/+3
| | |\| | | | | | | | | | | | | | | | | * commit 'd2575cb1f3daa4145478b4778318f67f9d0ccb27': Add padding around empty list text view.
| | | * Merge "Add padding around empty list text view." into lmp-mr1-devAndrew Lee2014-11-121-1/+3
| | | |\
| | | | * Add padding around empty list text view.Andrew Lee2014-11-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After removing newlines from the string, it's going to the edge of the string because it's pretty long. We don't want to do newlines this way because it makes life harder for translations, which could well be shorter and fit on one line. Bug: 17446974 Change-Id: Ie758668c2b70f82916993017fa5c3611c150f257
* | | | | am 859a9548: (-s ours) am 36e5a1de: (-s ours) am 4efde5eb: (-s ours) Merge ↵Geoff Mendal2014-11-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '859a9548ae095a2eb237c6c94680cec2963e6bd3': Import translations. DO NOT MERGE
| * | | | am 36e5a1de: (-s ours) am 4efde5eb: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2014-11-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into lmp-mr1-dev * commit '36e5a1de725f790ab63bec58f58bed01f2eea466': Import translations. DO NOT MERGE
| | * | | am 4efde5eb: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-11-120-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '4efde5ebbd235c564f12f71f6b17e8c28d611dd7': Import translations. DO NOT MERGE
| | | * | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-11-1272-3103/+2917
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2014-11-1272-3103/+2917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieae5d7bbff7d3441caf2494f71b53cf05055adf6 Auto-generated-cl: translation import
* | | | | | am ac2b5e93: am a91c8003: am 00f44af6: Merge "Use the highlight color ↵Nancy Chen2014-11-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of the tint color" into lmp-mr1-dev * commit 'ac2b5e9377123426ad9d5808586be866eb686f4e': Use the highlight color instead of the tint color
| * | | | | am a91c8003: am 00f44af6: Merge "Use the highlight color instead of the tint ↵Nancy Chen2014-11-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | color" into lmp-mr1-dev * commit 'a91c8003b84fa882dcf2b64fc21397419265ed25': Use the highlight color instead of the tint color
| | * | | | am 00f44af6: Merge "Use the highlight color instead of the tint color" into ↵Nancy Chen2014-11-121-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '00f44af6f5d4fc38060deddad5796315fb6a83fc': Use the highlight color instead of the tint color
| | | * | | Merge "Use the highlight color instead of the tint color" into lmp-mr1-devNancy Chen2014-11-121-1/+1
| | | |\ \ \
| | | | * | | Use the highlight color instead of the tint colorNancy Chen2014-11-121-1/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tint color of a phone account only refers to the color of the icon, the highlight color is the general display color used for text, backgrounds etc. We should use highlight color in Dialer Bug: 18192071 Change-Id: Ia7e1c6cf055357df98b2b2f481b32a727d1f6d61
* | | | | | am 3a13c56e: am c599b6f4: am afb64682: Merge "Lookup badge member variables ↵Yorke Lee2014-11-131-19/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly during bindBadge" into lmp-mr1-dev * commit '3a13c56eca834717f1a5888551febc1d5e94390d': Lookup badge member variables correctly during bindBadge
| * | | | | am c599b6f4: am afb64682: Merge "Lookup badge member variables correctly ↵Yorke Lee2014-11-121-19/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during bindBadge" into lmp-mr1-dev * commit 'c599b6f4ef7b4f53d1f98acdb5bf24e6d7085110': Lookup badge member variables correctly during bindBadge
| | * | | | am afb64682: Merge "Lookup badge member variables correctly during ↵Yorke Lee2014-11-121-19/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bindBadge" into lmp-mr1-dev * commit 'afb64682dabf7b40d7bd4dc8cbd90b347ced1b14': Lookup badge member variables correctly during bindBadge
| | | * | | Merge "Lookup badge member variables correctly during bindBadge" into ↵Yorke Lee2014-11-121-19/+22
| | | |\ \ \ | | | | |/ / | | | |/| | | | | | | | lmp-mr1-dev
| | | | * | Lookup badge member variables correctly during bindBadgeYorke Lee2014-11-101-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a new call log view is provided, make sure to correctly find and stash the correct member variables inside bindBadge. Bug: 18016618 Change-Id: If01a68fc6c468905ab576b1c5927afa308238786
* | | | | | am 50e61bee: (-s ours) am 3bf6d4a5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '50e61bee5ac52f7e63d018c13115240f6fc4af11': Import translations. DO NOT MERGE
| * | | | | am 3bf6d4a5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-120-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bf6d4a5cf326824c44ffb3c1db97b72df989369': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1255-2365/+2237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib9bf0cf9d99777cd98a1f90d3d25a1661cddf616 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-11-1272-2815/+2773
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-1272-2815/+2773
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib3935094ae54a0369c2ca78a44047a1bb50c0729 Auto-generated-cl: translation import
* | | | | | | am 512f5637: am ba445653: am 97670b46: Remove summary/secondary text from ↵Nancy Chen2014-11-122-13/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | settings. * commit '512f563730d88f27e9e69e7ee2972253d643af13': Remove summary/secondary text from settings.
| * | | | | am ba445653: am 97670b46: Remove summary/secondary text from settings.Nancy Chen2014-11-122-13/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ba4456538ff8a622a26e29ca9db18e92ba48e4ae': Remove summary/secondary text from settings.
| | * | | | am 97670b46: Remove summary/secondary text from settings.Nancy Chen2014-11-122-13/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97670b46b3958cec0d07cfc17133fdda313ddf3e': Remove summary/secondary text from settings.
| | | * | | Remove summary/secondary text from settings.Nancy Chen2014-11-112-13/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per settings design guildelines, we should not be using the second line to describe the contents of a setting with subscreen navigation (this second line is now used for just status). Remove these second lines from the dialer settings UI. Bug: 17446974 Change-Id: Idbeace64c088805a19a77b1438dd66a618387848
* | | | | am 835ac921: am 988a4329: am 050e2a8d: Merge "Fix IOOB exception in ↵Yorke Lee2014-11-121-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ViewDragHelper" into lmp-mr1-dev * commit '835ac9216232a00cca5040a554e0f7075159554c': Fix IOOB exception in ViewDragHelper
| * | | | am 988a4329: am 050e2a8d: Merge "Fix IOOB exception in ViewDragHelper" into ↵Yorke Lee2014-11-121-1/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '988a4329a558ecd45c99da16fdbf02b2690e835d': Fix IOOB exception in ViewDragHelper
| | * | | am 050e2a8d: Merge "Fix IOOB exception in ViewDragHelper" into lmp-mr1-devYorke Lee2014-11-111-1/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '050e2a8d5aef356b7b7b35ab5242669dd7a79dfd': Fix IOOB exception in ViewDragHelper
| | | * | Merge "Fix IOOB exception in ViewDragHelper" into lmp-mr1-devYorke Lee2014-11-111-1/+7
| | | |\ \
| | | | * | Fix IOOB exception in ViewDragHelperYorke Lee2014-11-111-1/+7
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If findPointerIndex returns -1, ignore the motion event. The equivalent fix is done for other handlers of motion events as well. Bug: 18186775 Change-Id: Ia7548335eeb84310510260381a8bcedf6556aa40
* | | | | am 51c4dfb5: am 34bfbee9: am 94264587: Update PhoneAccount icon API (3/6)Ihab Awad2014-11-121-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '51c4dfb5d20c8da65deb4b9d1f79f65d9df52608': Update PhoneAccount icon API (3/6)
| * | | | am 34bfbee9: am 94264587: Update PhoneAccount icon API (3/6)Ihab Awad2014-11-121-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '34bfbee9bbb5e618fa5e7c6f4fcbc7da58c6f279': Update PhoneAccount icon API (3/6)
| | * | | am 94264587: Update PhoneAccount icon API (3/6)Ihab Awad2014-11-111-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '942645871f85cf8868f5167c5d10f95083474e72': Update PhoneAccount icon API (3/6)
| | | * | Update PhoneAccount icon API (3/6)Ihab Awad2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18291787 Change-Id: Id53193a2597ac6a7827a484279e130d8bfb78b77
* | | | | am e5ada122: am 08d5edff: am 0de75e45: Merge "String resource edits for ↵Nancy Chen2014-11-111-45/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dialer." into lmp-mr1-dev * commit 'e5ada1226d25e0db8e9f616c4d0240b0909fca4d': String resource edits for Dialer.
| * | | | am 08d5edff: am 0de75e45: Merge "String resource edits for Dialer." into ↵Nancy Chen2014-11-111-45/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '08d5edff6cbde662ca9c297e762bedad0258b543': String resource edits for Dialer.
| | * | | am 0de75e45: Merge "String resource edits for Dialer." into lmp-mr1-devNancy Chen2014-11-101-45/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '0de75e45957a995a1c08c5a1fbcb5e06ce12ff6f': String resource edits for Dialer.
| | | * | Merge "String resource edits for Dialer." into lmp-mr1-devNancy Chen2014-11-101-45/+39
| | | |\ \ | | | | |/ | | | |/|
| | | | * String resource edits for Dialer.Nancy Chen2014-11-101-45/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust strings in dialer per ewong@'s edits. Bug: 17446974 Change-Id: Iee616072c3774567d13064157f4e9a87267e0182
* | | | | am 54c543d4: am 4622011c: am 612f818e: Merge "Allow ILD information to be ↵Evan Charlton2014-11-112-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | populated" into lmp-mr1-dev * commit '54c543d487a49f477756e7afeaafd68238229c50': Allow ILD information to be populated
| * | | | am 4622011c: am 612f818e: Merge "Allow ILD information to be populated" into ↵Evan Charlton2014-11-112-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '4622011cfd3e7320c9dfd08f875584712b0f8717': Allow ILD information to be populated
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 08:32:16 +0000