Svetoslav
3b2fd79dc7
am 9d0c0b2f: am 033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev
...
* commit '9d0c0b2fecc84ea6c6e156be9d87f2f6e26b012b':
Remove Google Play specific search URIs from Settings.
2013-10-01 23:10:32 -07:00
Svetoslav
1b0a71197f
am 1b881bcc: Merge "Show appropriate empty state if not printers are found." into klp-dev
...
* commit '1b881bcc4181c240007a1d6d7a3e224b4f018933':
Show appropriate empty state if not printers are found.
2013-10-01 22:21:57 -07:00
Svetoslav
9d0c0b2fec
am 033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev
...
* commit '033b5739ba85fca62a8e74a6620c9a14cc9f3f5e':
Remove Google Play specific search URIs from Settings.
2013-10-01 22:21:37 -07:00
David Christie
5e89a79c1f
am d0217f0f: am 7cdb34f5: Merge "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 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.
2013-10-01 20:59:19 -07:00
Lifu Tang
5ab9fa432d
Renamed "App settings" back to "Location services"
...
- Fix b/10610559
Change-Id: Id98a1b4e8d04238f371322fe6232647fa13b5c4a
2013-10-01 12:29:17 -07:00
Maggie Benthall
490e072c84
Merge "UX tweaks for CA cert monitoring" into klp-dev
2013-10-01 15:45:25 +00:00
David Christie
d0217f0f88
am 7cdb34f5: Merge "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
...
* 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.
2013-10-01 05:26:44 -07:00
Svetoslav
1b881bcc41
Merge "Show appropriate empty state if not printers are found." into klp-dev
2013-10-01 00:25:35 +00:00
Russell Brenner
1bfd66c448
am 93e6a023: Merge "Set divider color for light theme" into klp-dev
...
* commit '93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
2013-09-30 17:09:00 -07:00
Martijn Coenen
c432a71227
am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
...
* commit '86f74d2ad407214e23a717f2f24046ce9a89ea48':
Tap & pay: change empty state UX and strings.
2013-09-30 17:08:54 -07:00
Svetoslav
88cd02bbce
am 8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
...
* commit '8181c8166f2dcd74fab0c422edf02e0ff7148fe5':
Add icons to the printer list items in settings.
2013-09-30 17:07:14 -07:00
Svetoslav
033b5739ba
Merge "Remove Google Play specific search URIs from Settings." into klp-dev
2013-09-30 23:41:08 +00:00
Svetoslav
9a2ace9587
Show appropriate empty state if not printers are found.
...
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
2013-09-30 16:22:33 -07:00
Svetoslav
5c30529368
Remove Google Play specific search URIs from Settings.
...
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
2013-09-30 15:59:46 -07:00
Russell Brenner
359f7662e6
am 93e6a023: Merge "Set divider color for light theme" into klp-dev
...
* commit '93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea':
Set divider color for light theme
2013-09-30 14:16:45 -07:00
Martijn Coenen
a5326d11ea
am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
...
* commit '86f74d2ad407214e23a717f2f24046ce9a89ea48':
Tap & pay: change empty state UX and strings.
2013-09-30 14:16:40 -07:00
Svetoslav
2141b08e09
am 8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
...
* commit '8181c8166f2dcd74fab0c422edf02e0ff7148fe5':
Add icons to the printer list items in settings.
2013-09-30 14:13:49 -07:00
David Christie
07301cf157
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-Id: I2f747a42388a82e30c59b4b6e91849c5d590e1af
2013-09-30 12:33:09 -07:00
Russell Brenner
93e6a023c5
Merge "Set divider color for light theme" into klp-dev
2013-09-27 22:41:33 +00:00
Martijn Coenen
86f74d2ad4
Merge "Tap & pay: change empty state UX and strings." into klp-dev
2013-09-27 22:37:37 +00:00
Martijn Coenen
b412e18296
Tap & pay: change empty state UX and strings.
...
Bug: 10965661
Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
2013-09-27 14:51:46 -07:00
Svetoslav
a749adae03
Add icons to the printer list items in settings.
...
bug:10955751
Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
2013-09-26 18:56:27 -07:00
Russell Brenner
2ef377d47d
Set divider color for light theme
...
Bug: 10928581
Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
2013-09-26 16:07:52 -07:00
Svetoslav Ganov
40f946ad89
am 2a2fcdd6: am bc2c3db8: Add print job settings screen.
...
* commit '2a2fcdd6dbeee06af8acca7c76fbe905c862cbd4':
Add print job settings screen.
2013-09-26 14:18:21 -07:00
Svetoslav Ganov
2a2fcdd6db
am bc2c3db8: Add print job settings screen.
...
* commit 'bc2c3db8f923b9ee25345f5ebbad9f6c762a1e23':
Add print job settings screen.
2013-09-26 14:14:55 -07:00
Svetoslav Ganov
bc2c3db8f9
Add print job settings screen.
...
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
2013-09-26 13:58:59 -07:00
Martijn Coenen
9ccde1132c
am 01aa7930: am 077f83a2: Merge "Latest UX for Tap & pay." into klp-dev
...
* commit '01aa7930306e15ba4ce942844506e42df85a0a04':
Latest UX for Tap & pay.
2013-09-26 11:05:48 -07:00
Martijn Coenen
01aa793030
am 077f83a2: Merge "Latest UX for Tap & pay." into klp-dev
...
* commit '077f83a22c3d9b8650b2ba4dab4f17e55fde59fb':
Latest UX for Tap & pay.
2013-09-26 11:00:49 -07:00
Martijn Coenen
077f83a22c
Merge "Latest UX for Tap & pay." into klp-dev
2013-09-26 17:57:47 +00:00
Mindy Pereira
2da0c7cc14
am ff91e56f: am 873c3723: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
...
* commit 'ff91e56f8b17f4f986dd5512c3e7444875f2427f':
Updated de-blued backgrounds for settings power widget.
2013-09-26 10:52:26 -07:00
Mindy Pereira
ff91e56f8b
am 873c3723: Merge "Updated de-blued backgrounds for settings power widget." into klp-dev
...
* commit '873c3723233f3fffd2ccd58041579bcd454d1e55':
Updated de-blued backgrounds for settings power widget.
2013-09-26 10:50:51 -07:00
Baligh Uddin
ac9b068726
Import translations. DO NOT MERGE
...
Change-Id: I8dc4ee767b10e74fa862573130e163c3a451c152
Auto-generated-cl: translation import
2013-09-25 20:31:24 -07:00
Mindy Pereira
8431988aaf
Updated de-blued backgrounds for settings power widget.
...
Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
2013-09-25 16:37:55 -07:00
Martijn Coenen
0e940d6c00
Latest UX for Tap & pay.
...
Bug: 10862185
Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
2013-09-25 15:01:24 -07:00
Rob Tsuk
306d52afb6
am 90a51e2b: am e57248e5: Merge "Replace blue pressed feedback with gray." into klp-dev
...
* commit '90a51e2bf9c61a80ebc79f6c9ad5e7b774860bfc':
Replace blue pressed feedback with gray.
2013-09-25 14:00:52 -07:00
Rob Tsuk
90a51e2bf9
am e57248e5: Merge "Replace blue pressed feedback with gray." into klp-dev
...
* commit 'e57248e5f63172a5c78184ff9c885c823cb1dae8':
Replace blue pressed feedback with gray.
2013-09-25 13:55:04 -07:00
Rob Tsuk
e57248e5f6
Merge "Replace blue pressed feedback with gray." into klp-dev
2013-09-25 20:52:04 +00:00
Rob Tsuk
1fa7880c86
Replace blue pressed feedback with gray.
...
Change-Id: I03d5fbcd05975792dc27160d8ea44abdc1894624
2013-09-25 13:16:59 -07:00
Baligh Uddin
a4d1b88707
Import translations. DO NOT MERGE
...
Change-Id: Id3d24fbbdc9140e85e5b5831a03b474641d3e871
Auto-generated-cl: translation import
2013-09-25 09:55:18 -07:00
Edward Jee
5fb79db91b
am 1146695e: am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
...
* commit '1146695e4b94dd3ea987f942ed8fd86d39a859ce':
Once the user allows PBAP phonebook access, do not ask again.
2013-09-24 15:29:37 -07:00
Edward Jee
1146695e4b
am 5ad8bf07: Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
...
* commit '5ad8bf0700cf3297773617e14456d82bbc8f9585':
Once the user allows PBAP phonebook access, do not ask again.
2013-09-24 15:26:23 -07:00
Edward Jee
5ad8bf0700
Merge "Once the user allows PBAP phonebook access, do not ask again." into klp-dev
2013-09-24 22:23:26 +00:00
Amith Yamasani
7c84c7f422
am 7dcd20f9: resolved conflicts for merge of 162b014c to klp-dev-plus-aosp
...
* commit '7dcd20f9a6877342a92d0e42c1692a25429960f5':
Add Jakarta timezone
2013-09-24 15:05:02 -07:00
Amith Yamasani
7dcd20f9a6
resolved conflicts for merge of 162b014c to klp-dev-plus-aosp
...
Change-Id: I46175a9fa7775e7b53a5c4e149c7fd6247c5de9b
2013-09-24 14:59:11 -07:00
Amith Yamasani
162b014cea
Merge "Add Jakarta timezone" into klp-dev
2013-09-24 21:49:54 +00:00
Baligh Uddin
82b2d313db
Merge "Import translations. DO NOT MERGE"
2013-09-24 21:27:56 +00:00
Baligh Uddin
0865ffb32d
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-09-24 21:27:51 +00:00
Christopher Tate
22781873ee
am c268bf37: am 254975aa: Merge "Use a generic icon for Home" into klp-dev
...
* commit 'c268bf379b3da1f29507f75fe8c9115b63acb3a8':
Use a generic icon for Home
2013-09-24 11:48:30 -07:00
Christopher Tate
c268bf379b
am 254975aa: Merge "Use a generic icon for Home" into klp-dev
...
* commit '254975aac1e42997c2e068a623e7221470525ee1':
Use a generic icon for Home
2013-09-24 11:46:11 -07:00
Dianne Hackborn
718f4d9734
am 6be9bffa: am 88cf7709: Implement issue #10895990 : Better durations for proc stats
...
* commit '6be9bffa6fb5ff3def3ed38dae61dc19f88c0185':
Implement issue #10895990 : Better durations for proc stats
2013-09-24 10:24:53 -07:00