Amith Yamasani
1c40e49ff9
am 3a7eb5f1: am c26f2615: am 8cfce5de: (-s ours) am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '3a7eb5f1a8f1ef3821af41f45a75d8e29f58f57a':
2013-10-01 20:59:15 -07:00
Russell Brenner
e6524ed927
am 1bfd66c4: am 93e6a023: Merge "Set divider color for light theme" into klp-dev
...
* commit '1bfd66c4482506fab36a5e1c130cf7b517e3e62d':
2013-10-01 20:59:15 -07:00
Martijn Coenen
05e4f258a9
am c432a712: am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-dev
...
* commit 'c432a712274833222e42629d88fcda865842ec55':
2013-10-01 20:59:14 -07:00
Svetoslav
a668c16936
am 88cd02bb: am 8181c816: Merge "Add icons to the printer list items in settings." into klp-dev
...
* commit '88cd02bbce36576b9402ee136fb87df4965a0d24':
2013-10-01 20:59:13 -07:00
Lifu Tang
94c7d1a253
am 36f50e81: am 4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
...
* commit '36f50e81096c665ad112b39a143c1e91fd521c8a':
2013-10-01 20:59:12 -07:00
Lifu Tang
754a0b2492
am 0cdba449: am 2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
...
* commit '0cdba4493b7c5215ecf931255331455fdee882ce':
2013-10-01 20:59:12 -07:00
Dianne Hackborn
a09e5397d7
am 768dc8f7: Merge "Fix issue #10948509 : Crash in procstats when there is no data" into klp-dev
...
* commit '768dc8f7293356cdada32a13a476c7477f0bb126':
Fix issue #10948509 : Crash in procstats when there is no data
2013-10-01 18:45:12 -07:00
Amith Yamasani
3a7eb5f1a8
am c26f2615: am 8cfce5de: (-s ours) am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit 'c26f2615964b648515c86cac08b492cee19b0747':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-30 17:09:20 -07: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
Lifu Tang
36f50e8109
am 4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
...
* commit '4ba66781f30c7d96274bbf4b6395838495fea399':
Hacked to display Puzzle icon for GCore
2013-09-30 17:06:52 -07:00
Lifu Tang
0cdba4493b
am 2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
...
* commit '2f78d82ab3a2858b3265cf01099db455fb43f4b1':
Don't show help menu when browser unavailable
2013-09-30 17:06:51 -07:00
Alan Viverette
5a855a39dd
am 77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
...
* commit '77165f6d4bee9d367cb6e70a266645e1e755f3c6':
Restore default locale in Captioning Settings
2013-09-30 14:17:19 -07:00
Amith Yamasani
6a66be225a
am c26f2615: am 8cfce5de: (-s ours) am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit 'c26f2615964b648515c86cac08b492cee19b0747':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-30 14:17:12 -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
Lifu Tang
dc9adfa973
am 4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-dev
...
* commit '4ba66781f30c7d96274bbf4b6395838495fea399':
Hacked to display Puzzle icon for GCore
2013-09-30 14:13:20 -07:00
Lifu Tang
29557e64d2
am 2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-dev
...
* commit '2f78d82ab3a2858b3265cf01099db455fb43f4b1':
Don't show help menu when browser unavailable
2013-09-30 14:13:20 -07:00
Dianne Hackborn
768dc8f729
Merge "Fix issue #10948509 : Crash in procstats when there is no data" into klp-dev
2013-09-30 00:22:01 +00:00
Dianne Hackborn
5635594c38
Fix issue #10948509 : Crash in procstats when there is no data
...
Also make us much better about determining which app to blame for
a particular running process, organize the display of services by
their owning app, apply some new heuristics for deciding what goes
in the process list so that we can still display interesting processes
when we haven't collected pss data for them yet, etc.
Change-Id: I7e87225d3dabc66cf3ff020b5db48401b14aaf47
2013-09-29 17:07:49 -07:00
Alan Viverette
77165f6d4b
Merge "Restore default locale in Captioning Settings" into klp-dev
2013-09-27 23:13:05 +00:00
Amith Yamasani
c26f261596
am 8cfce5de: (-s ours) am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '8cfce5de838fb9599b1040840f6bbe164bf9afdb':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 15:58: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
Alan Viverette
c402322a5b
Restore default locale in Captioning Settings
...
BUG: 10967083
Change-Id: Id607a108d3d56a89fcecf345d2e12af88dc38690
2013-09-27 12:22:34 -07:00
Amith Yamasani
8cfce5de83
am da0e4483: am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit 'da0e448379ff4bcc778fbbe1f203ec322378244f':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:55:35 -07:00
Amith Yamasani
da0e448379
am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit 'aad8d90ce082d01e6420227572891a2fce65306a':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:51:16 -07:00
Amith Yamasani
aad8d90ce0
am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit 'b4881f79e1c065b40f234710b6fb28acce9e164f':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:46:25 -07:00
Amith Yamasani
b4881f79e1
am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '451d8225ef3ae407f52512a93bcf04e6400eb997':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:27:47 -07:00
Amith Yamasani
451d8225ef
am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '49187c9418dc2c5f404385596db3d82dd896c178':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:24:28 -07:00
Amith Yamasani
49187c9418
am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '53a56ad89cbd14410dcd8e5755c6765f1a438928':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:20:20 -07:00
Amith Yamasani
53a56ad89c
am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '447415f4f17dc91d3844394625f4e6fa10efedad':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:18:04 -07:00
Amith Yamasani
447415f4f1
am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '7870850387dabd32a54e3fca7d65dea5f45a9a16':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:14:30 -07:00
Amith Yamasani
7870850387
am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra
...
* commit '77aa51e5b7261638590af1d69ac03f4c8cd25692':
Make sure that external callers cannot pass in the confirm bypass extra
2013-09-27 11:10:37 -07:00
Svetoslav
8181c8166f
Merge "Add icons to the printer list items in settings." into klp-dev
2013-09-27 02:25:36 +00: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
Lifu Tang
4ba66781f3
Merge "Hacked to display Puzzle icon for GCore" into klp-dev
2013-09-27 00:18:22 +00:00
Lifu Tang
2f78d82ab3
Merge "Don't show help menu when browser unavailable" into klp-dev
2013-09-27 00:17:54 +00: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
Lifu Tang
9335f14082
Hacked to display Puzzle icon for GCore
...
- Fix b/10856957
Change-Id: I0716c9f5c6d818cd38dfc30a6b0b29deaa994367
2013-09-26 11:01:14 -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
