Commit Graph

12403 Commits

Author SHA1 Message Date
Alon Albert
66d050bb4b Hide Camera in CryptKeeper
Bug: 10993393

Change-Id: Idaddd01f099ae40283eb86fd92232845f9d436b8
2013-09-30 17:57:14 -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
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
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
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
Jim Miller
277827fb27 Merge "Disable keyguard widgets on low memory devices" into klp-dev 2013-09-30 20:38:10 +00:00
Jim Miller
0366d14fb8 Disable keyguard widgets on low memory devices
Fixes bug 10784493

Change-Id: Idc1c35faf0715814fa1a257319888945c82527c6
2013-09-30 13:27:39 -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
Vinit Deshapnde
6c0a193050 Fix EAP-TLS reconnect after reboot issue
After a reboot, KeyStore is locked, and certificates encrypted with user
PIN are not accessible. So statemachines are not able to connect to
EAP-TLS networks. This change makes the problem less severe by

1. Not signing certificates with user PIN on devices with hardware backed
KeyStore.
2. Issuing a reconnect upon first USER_PRESENT event.

This means HH (which has a hardware backed keystore) will connect to
EAP-TLS networks without requiring user intervention; and other devices
will automatically connect to those networks after user punches PIN.

Bug: 10325089

Change-Id: I023d60e58d8214152f051bd9ec84b85b702d829a
2013-09-30 10:41:39 -07:00
The Android Automerger
08be396aa0 merge in klp-release history after reset to klp-dev 2013-09-30 06:00:40 -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
The Android Automerger
88e7aaca92 merge in klp-release history after reset to klp-dev 2013-09-29 06:01:41 -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
Mindy Pereira
28600d29f3 Updated de-blued backgrounds for settings power widget.
Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
2013-09-27 11:31:04 -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