Commit Graph

11821 Commits

Author SHA1 Message Date
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
Martijn Coenen
4e778dd966 am e1f522ad: am 028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev
* commit 'e1f522ad4bac2d39bcaddf60a91256e15d9ab942':
  Don't show tap&pay if NFC is off.
2013-10-01 20:59:18 -07:00
Matthew Xie
60714665fa am c9320341: am 3b2fbe2f: Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev
* commit 'c9320341e458b02c1700f167c8036d51790cc795':
  Add Bluetooth Privileged permission to use pairing apis
2013-10-01 20:59:17 -07:00
Dianne Hackborn
7372f9a757 am d0ebb052: am 768dc8f7: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
* commit 'd0ebb0520c64e717948d3bd98f0eb53c15828f94':
2013-10-01 20:59:17 -07:00
Alan Viverette
3b39438308 am 1e33aac9: am 77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '1e33aac9ef0a731b05297f87e7318a68d074c13b':
2013-10-01 20:59:16 -07:00
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
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
Martijn Coenen
e1f522ad4b am 028b6b3f: Merge "Don\'t show tap&pay if NFC is off." into klp-dev
* commit '028b6b3f7cc79587a42583351e2c032f71e7ac8c':
  Don't show tap&pay if NFC is off.
2013-10-01 05:26:08 -07:00
Matthew Xie
c9320341e4 am 3b2fbe2f: Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev
* commit '3b2fbe2fb374c8b825b716b372d1c46fdc610bfa':
  Add Bluetooth Privileged permission to use pairing apis
2013-10-01 05:26:07 -07:00
Dianne Hackborn
d0ebb0520c 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-09-30 17:10:56 -07:00
Alan Viverette
1e33aac9ef am 77165f6d: Merge "Restore default locale in Captioning Settings" into klp-dev
* commit '77165f6d4bee9d367cb6e70a266645e1e755f3c6':
  Restore default locale in Captioning Settings
2013-09-30 17:09:28 -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
David Christie
7cdb34f50e 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 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." into klp-dev 2013-09-30 20:19:00 +00: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
Martijn Coenen
028b6b3f7c Merge "Don't show tap&pay if NFC is off." into klp-dev 2013-09-30 19:11:52 +00:00
Martijn Coenen
81ab81778b Don't show tap&pay if NFC is off.
Bug: 11007036
Change-Id: Ie19609fa928b2806c76b8bd94cdfd1872b9da032
2013-09-30 12:07:02 -07:00
Matthew Xie
3b2fbe2fb3 Merge "Add Bluetooth Privileged permission to use pairing apis" into klp-dev 2013-09-30 18:57:15 +00: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