summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-10-0259-458/+1029
| | | | | Change-Id: I7a577c09972f5771ef6639fb8e8b417493ad8535 Auto-generated-cl: translation import
* am 1b0a7119: am 1b881bcc: Merge "Show appropriate empty state if not ↵Svetoslav2013-10-012-2/+6
|\ | | | | | | | | | | | | printers are found." into klp-dev * commit '1b0a71197f3629cebf4b354b6db835774b1276dc': Show appropriate empty state if not printers are found.
| * am 1b881bcc: Merge "Show appropriate empty state if not printers are found." ↵Svetoslav2013-10-012-2/+6
| |\ | | | | | | | | | | | | | | | | | | into klp-dev * commit '1b881bcc4181c240007a1d6d7a3e224b4f018933': Show appropriate empty state if not printers are found.
| | * Merge "Show appropriate empty state if not printers are found." into klp-devSvetoslav2013-10-012-2/+6
| | |\
| | | * Show appropriate empty state if not printers are found.Svetoslav2013-09-302-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One can search for printers in the print service settings and we need to show appropriate empty state if none is found. bug:11009053 Change-Id: If3ed6aa3a5e2eb4d7f7bae37f885e4b8eb0909b4
* | | | am 9d0c0b2f: am 033b5739: Merge "Remove Google Play specific search URIs ↵Svetoslav2013-10-013-50/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | from Settings." into klp-dev * commit '9d0c0b2fecc84ea6c6e156be9d87f2f6e26b012b': Remove Google Play specific search URIs from Settings.
| * | | am 033b5739: Merge "Remove Google Play specific search URIs from Settings." ↵Svetoslav2013-10-013-50/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '033b5739ba85fca62a8e74a6620c9a14cc9f3f5e': Remove Google Play specific search URIs from Settings.
| | * | Merge "Remove Google Play specific search URIs from Settings." into klp-devSvetoslav2013-09-303-50/+0
| | |\ \
| | | * | Remove Google Play specific search URIs from Settings.Svetoslav2013-09-303-50/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. If there are no installed print services or NFC payment services, we would like to allow the user to search for one in Play. However, Play is Google specific and we should not have hard coded URI that rely on it in settings. Declare secure settings for each of these URI and check at runtime if the URI is non-empty, then show the add menu item. bug:11011519 Change-Id: I2c5cb172015bbecd7d2f8ffd3cb7fd790b01dab8
* | | | am d0217f0f: am 7cdb34f5: Merge "Change location settings "Device sensors" ↵David Christie2013-10-011-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | to "Device only" (b/10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GP * commit 'd0217f0f88a692519a95768321c3923e97032530': Change location settings "Device sensors" to "Device only" (b/10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint your location"). We can also change the internal code variable names to not say "sensors" but I would suggest doing this after KLP as is a noop in UI.
| * | | am 7cdb34f5: Merge "Change location settings "Device sensors" to "Device ↵David Christie2013-10-011-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | only" (b/10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint * commit '7cdb34f50eb2c786998b4af943d49bb091b249cd': Change location settings "Device sensors" to "Device only" (b/10992469). Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint your location"). We can also change the internal code variable names to not say "sensors" but I would suggest doing this after KLP as is a noop in UI.
| | * | Change location settings "Device sensors" to "Device only" (b/10992469).David Christie2013-09-301-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Note this is the minimum change for things visible to the user. I double checked the accessibility string description and it is still valid as is (it says "Use GPS to pinpoint your location"). We can also change the internal code variable names to not say "sensors" but I would suggest doing this after KLP as is a noop in UI. Change-Id: I2f747a42388a82e30c59b4b6e91849c5d590e1af
| * | am 93e6a023: Merge "Set divider color for light theme" into klp-devRussell Brenner2013-09-303-2/+6
| |\ \ | | |/ | | | | | | | | | * commit '93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea': Set divider color for light theme
| * | am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-devMartijn Coenen2013-09-302-1/+18
| |\ \ | | | | | | | | | | | | | | | | * commit '86f74d2ad407214e23a717f2f24046ce9a89ea48': Tap & pay: change empty state UX and strings.
| * \ \ am 8181c816: Merge "Add icons to the printer list items in settings." into ↵Svetoslav2013-09-301-0/+67
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '8181c8166f2dcd74fab0c422edf02e0ff7148fe5': Add icons to the printer list items in settings.
* | \ \ \ am 93e6a023: Merge "Set divider color for light theme" into klp-devRussell Brenner2013-09-303-2/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit '93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea': Set divider color for light theme
| * | | | Merge "Set divider color for light theme" into klp-devRussell Brenner2013-09-273-2/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Set divider color for light themeRussell Brenner2013-09-263-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10928581 Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
* | | | | am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-devMartijn Coenen2013-09-302-1/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '86f74d2ad407214e23a717f2f24046ce9a89ea48': Tap & pay: change empty state UX and strings.
| * | | | Merge "Tap & pay: change empty state UX and strings." into klp-devMartijn Coenen2013-09-272-1/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Tap & pay: change empty state UX and strings.Martijn Coenen2013-09-272-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10965661 Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
* | | | | am 8181c816: Merge "Add icons to the printer list items in settings." into ↵Svetoslav2013-09-301-0/+67
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '8181c8166f2dcd74fab0c422edf02e0ff7148fe5': Add icons to the printer list items in settings.
| * | | | Add icons to the printer list items in settings.Svetoslav2013-09-261-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10955751 Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
* | | | | am 2a2fcdd6: am bc2c3db8: Add print job settings screen.Svetoslav Ganov2013-09-2610-3/+212
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit '2a2fcdd6dbeee06af8acca7c76fbe905c862cbd4': Add print job settings screen.
| * | | | am bc2c3db8: Add print job settings screen.Svetoslav Ganov2013-09-2610-3/+212
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'bc2c3db8f923b9ee25345f5ebbad9f6c762a1e23': Add print job settings screen.
| | * | | Add print job settings screen.Svetoslav Ganov2013-09-2610-3/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a list of active print jobs to the main print settings screen. Selecting a print job from there leads to a print job settings screen with more information about the print job and actions to change the prit job state such as cancel and restart. bug:10935736 Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
* | | | | am 01aa7930: am 077f83a2: Merge "Latest UX for Tap & pay." into klp-devMartijn Coenen2013-09-268-12/+38
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '01aa7930306e15ba4ce942844506e42df85a0a04': Latest UX for Tap & pay.
| * | | | am 077f83a2: Merge "Latest UX for Tap & pay." into klp-devMartijn Coenen2013-09-268-12/+38
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '077f83a22c3d9b8650b2ba4dab4f17e55fde59fb': Latest UX for Tap & pay.
| | * | | Merge "Latest UX for Tap & pay." into klp-devMartijn Coenen2013-09-268-12/+38
| | |\ \ \ | | | |/ /
| | | * | Latest UX for Tap & pay.Martijn Coenen2013-09-258-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10862185 Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
* | | | | am ff91e56f: am 873c3723: Merge "Updated de-blued backgrounds for settings ↵Mindy Pereira2013-09-264-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | power widget." into klp-dev * commit 'ff91e56f8b17f4f986dd5512c3e7444875f2427f': Updated de-blued backgrounds for settings power widget.
| * | | | am 873c3723: Merge "Updated de-blued backgrounds for settings power widget." ↵Mindy Pereira2013-09-264-0/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '873c3723233f3fffd2ccd58041579bcd454d1e55': Updated de-blued backgrounds for settings power widget.
| | * | | Updated de-blued backgrounds for settings power widget.Mindy Pereira2013-09-254-0/+0
| | | |/ | | |/| | | | | | | | | Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2557-135/+369
| | | | | | | | | | | | | | | | | | | | Change-Id: I8dc4ee767b10e74fa862573130e163c3a451c152 Auto-generated-cl: translation import
* | | | am 90a51e2b: am e57248e5: Merge "Replace blue pressed feedback with gray." ↵Rob Tsuk2013-09-259-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '90a51e2bf9c61a80ebc79f6c9ad5e7b774860bfc': Replace blue pressed feedback with gray.
| * | | am e57248e5: Merge "Replace blue pressed feedback with gray." into klp-devRob Tsuk2013-09-259-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e57248e5f63172a5c78184ff9c885c823cb1dae8': Replace blue pressed feedback with gray.
| | * | Merge "Replace blue pressed feedback with gray." into klp-devRob Tsuk2013-09-259-0/+0
| | |\ \
| | | * | Replace blue pressed feedback with gray.Rob Tsuk2013-09-259-0/+0
| | | |/ | | | | | | | | | | | | Change-Id: I03d5fbcd05975792dc27160d8ea44abdc1894624
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-2557-135/+369
| | |/ | | | | | | | | | | | | Change-Id: Id3d24fbbdc9140e85e5b5831a03b474641d3e871 Auto-generated-cl: translation import
* | | am 1146695e: am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, ↵Edward Jee2013-09-242-50/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | do not ask again." into klp-dev * commit '1146695e4b94dd3ea987f942ed8fd86d39a859ce': Once the user allows PBAP phonebook access, do not ask again.
| * | am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask ↵Edward Jee2013-09-242-50/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | again." into klp-dev * commit '5ad8bf0700cf3297773617e14456d82bbc8f9585': Once the user allows PBAP phonebook access, do not ask again.
| | * Merge "Once the user allows PBAP phonebook access, do not ask again." into ↵Edward Jee2013-09-242-50/+1
| | |\ | | | | | | | | | | | | klp-dev
| | | * Once the user allows PBAP phonebook access, do not ask again.Edward Jee2013-09-232-50/+1
| | | | | | | | | | | | | | | | | | | | Bug: 9876209 Change-Id: I8d9dcfa03e8d85577af4c4664fa34b3830e3d8f6
* | | | am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aospAmith Yamasani2013-09-241-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7dcd20f9a6877342a92d0e42c1692a25429960f5': Add Jakarta timezone
| * | | resolved conflicts for merge of 162b014c to klp-dev-plus-aospAmith Yamasani2013-09-241-0/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
| | * | Merge "Add Jakarta timezone" into klp-devAmith Yamasani2013-09-241-0/+1
| | |\ \
| | | * | Add Jakarta timezoneSungmin Choi2013-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10198358 Change-Id: Id35bf1f3e137587016649815d879052d9f8409d9
| | * | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2458-1017/+365
| | |\ \ \
| | | * | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2358-1017/+365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82e5be54e4bfd32b13af0cc450c9b3e7f2e66baa Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-2458-906/+310
|\ \ \ \ \ \
generated by cgit v1.1 at 2025-02-06 16:05:24 +0000