OSDN Git Service

android-x86/frameworks-base.git
9 years agoam c8b5e94c: am b1c6208c: Merge "Limit number of fingerprint templates that can be...
Jim Miller [Tue, 16 Jun 2015 04:05:07 +0000 (04:05 +0000)]
am c8b5e94c: am b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev

* commit 'c8b5e94c2b65ddd92690c90038070e6dd31ddc78':
  Limit number of fingerprint templates that can be enrolled per device user

9 years agoam a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves...
Erik Kline [Tue, 16 Jun 2015 04:05:03 +0000 (04:05 +0000)]
am a01b9e6f: am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev

* commit 'a01b9e6f43b2c5d6a083b34ae0c8140abb09806a':
  Add a test that Network#getNetworkHandle() behaves sanely.

9 years agoam b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per...
Jim Miller [Tue, 16 Jun 2015 03:55:59 +0000 (03:55 +0000)]
am b1c6208c: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev

* commit 'b1c6208c27041e6d161cc46b4f130b4abfcf8f88':
  Limit number of fingerprint templates that can be enrolled per device user

9 years agoam 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into...
Erik Kline [Tue, 16 Jun 2015 03:55:55 +0000 (03:55 +0000)]
am 0d16281a: Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev

* commit '0d16281a03722f3f66a076718251c2166518d122':
  Add a test that Network#getNetworkHandle() behaves sanely.

9 years agoMerge "Limit number of fingerprint templates that can be enrolled per device user...
Jim Miller [Tue, 16 Jun 2015 03:48:55 +0000 (03:48 +0000)]
Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev

9 years agoMerge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev
Erik Kline [Tue, 16 Jun 2015 03:43:53 +0000 (03:43 +0000)]
Merge "Add a test that Network#getNetworkHandle() behaves sanely." into mnc-dev

9 years agoLimit number of fingerprint templates that can be enrolled per device user
Jim Miller [Tue, 16 Jun 2015 03:39:44 +0000 (20:39 -0700)]
Limit number of fingerprint templates that can be enrolled per device user

This change places an upper limit on the number of fingerprint templates that
can be enrolled per account.  This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.

Fixes bug 20731847

Change-Id: I5bc337698bef682cdf67940906d24842e1dffc28

9 years agoam 4e3fb992: am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into...
Daichi Hirono [Tue, 16 Jun 2015 01:49:38 +0000 (01:49 +0000)]
am 4e3fb992: am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev

* commit '4e3fb992b7e5b84dfd54552cba1890eeb0296e46':
  Fix API doc of MtpDevice#getObjectHandles.

9 years agoam 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
Daichi Hirono [Tue, 16 Jun 2015 01:38:31 +0000 (01:38 +0000)]
am 100e1c92: Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev

* commit '100e1c9235720ac020a20009da8b85f64efd4c11':
  Fix API doc of MtpDevice#getObjectHandles.

9 years agoam 5f6e00d8: am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade...
Adrian Roos [Tue, 16 Jun 2015 01:31:53 +0000 (01:31 +0000)]
am 5f6e00d8: am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev

* commit '5f6e00d809ae8b027ba84ccd9363742f1401e323':
  Fix unnecessairy announcements when collapsing shade

9 years agoam e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into...
Ruben Brunk [Tue, 16 Jun 2015 01:31:49 +0000 (01:31 +0000)]
am e9a1f181: am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev

* commit 'e9a1f181ee35dd376803ea98214e1bdbdc9250ef':
  Add metadata for pre-distortion dimensions.

9 years agoam 73f2f66a: am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev
Christopher Tate [Tue, 16 Jun 2015 01:31:44 +0000 (01:31 +0000)]
am 73f2f66a: am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev

* commit '73f2f66ae0292713ffa2c13f2293d79319c36623':
  Clean up app-link verification policy

9 years agoMerge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev
Daichi Hirono [Tue, 16 Jun 2015 01:30:28 +0000 (01:30 +0000)]
Merge "Fix API doc of MtpDevice#getObjectHandles." into mnc-dev

9 years agoam 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 01:27:35 +0000 (01:27 +0000)]
am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev

* commit '2bfe96513884f0c4a4836a615a80e17a1ba30173':
  Fix unnecessairy announcements when collapsing shade

9 years agoam 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev
Ruben Brunk [Tue, 16 Jun 2015 01:22:41 +0000 (01:22 +0000)]
am 9a2da54e: Merge "Add metadata for pre-distortion dimensions." into mnc-dev

* commit '9a2da54e3c7b5f382d2654eeb5228b945edd8e39':
  Add metadata for pre-distortion dimensions.

9 years agoam 60177af8: Merge "Clean up app-link verification policy" into mnc-dev
Christopher Tate [Tue, 16 Jun 2015 01:22:36 +0000 (01:22 +0000)]
am 60177af8: Merge "Clean up app-link verification policy" into mnc-dev

* commit '60177af86aca7712e2e442ca8e39376dad33a545':
  Clean up app-link verification policy

9 years agoMerge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 01:17:59 +0000 (01:17 +0000)]
Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev

9 years agoFix unnecessairy announcements when collapsing shade
Adrian Roos [Tue, 16 Jun 2015 01:16:58 +0000 (18:16 -0700)]
Fix unnecessairy announcements when collapsing shade

Bug: 20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330

9 years agoMerge "Add metadata for pre-distortion dimensions." into mnc-dev
Ruben Brunk [Tue, 16 Jun 2015 01:12:56 +0000 (01:12 +0000)]
Merge "Add metadata for pre-distortion dimensions." into mnc-dev

9 years agoam 2ae1caf9: am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users...
Makoto Onuki [Tue, 16 Jun 2015 01:12:14 +0000 (01:12 +0000)]
am 2ae1caf9: am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev

* commit '2ae1caf984261113f2b6c1959b4a5ef54b3c16f3':
  Allow killApplicationWithAppId() on secondary users

9 years agoMerge "Clean up app-link verification policy" into mnc-dev
Christopher Tate [Tue, 16 Jun 2015 01:10:41 +0000 (01:10 +0000)]
Merge "Clean up app-link verification policy" into mnc-dev

9 years agoAdd metadata for pre-distortion dimensions.
Ruben Brunk [Tue, 16 Jun 2015 00:32:06 +0000 (17:32 -0700)]
Add metadata for pre-distortion dimensions.

Bug: 20491394
Change-Id: I6b95a7fe2fd765571bcd2774aee486d18169a727

9 years agoam f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into...
Adam Lesinski [Tue, 16 Jun 2015 01:01:01 +0000 (01:01 +0000)]
am f86b2096: am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev

* commit 'f86b2096e5b5e2bae440da8b90d27bc17f8d24a5':
  Bluetooth energy: fix overflow in calculation

9 years agoam 7383bf33: am d719215f: Merge "Fix accessibility ghosts in quick settings detail...
Adrian Roos [Tue, 16 Jun 2015 01:00:57 +0000 (01:00 +0000)]
am 7383bf33: am d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev

* commit '7383bf334d14b3049c8d08cba535335df2a5e515':
  Fix accessibility ghosts in quick settings detail

9 years agoam e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 01:00:49 +0000 (01:00 +0000)]
am e43bf4bb: Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev

* commit 'e43bf4bb4511ec756512a44164ff79cce3a02348':
  Allow killApplicationWithAppId() on secondary users

9 years agoMerge "Allow killApplicationWithAppId() on secondary users" into mnc-dev
Makoto Onuki [Tue, 16 Jun 2015 00:51:35 +0000 (00:51 +0000)]
Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev

9 years agoam d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev
Adam Lesinski [Tue, 16 Jun 2015 00:48:29 +0000 (00:48 +0000)]
am d5e5151f: Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev

* commit 'd5e5151f6ceab498e3a35928c1f6f7a177c1544e':
  Bluetooth energy: fix overflow in calculation

9 years agoam d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:48:24 +0000 (00:48 +0000)]
am d719215f: Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev

* commit 'd719215fed261b41ae29acf87faef00f76c8faa7':
  Fix accessibility ghosts in quick settings detail

9 years agoMerge "Bluetooth energy: fix overflow in calculation" into mnc-dev
Adam Lesinski [Tue, 16 Jun 2015 00:46:04 +0000 (00:46 +0000)]
Merge "Bluetooth energy: fix overflow in calculation" into mnc-dev

9 years agoMerge "Fix accessibility ghosts in quick settings detail" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:35:11 +0000 (00:35 +0000)]
Merge "Fix accessibility ghosts in quick settings detail" into mnc-dev

9 years agoAllow killApplicationWithAppId() on secondary users
Makoto Onuki [Tue, 16 Jun 2015 00:26:40 +0000 (17:26 -0700)]
Allow killApplicationWithAppId() on secondary users

Bug 20949609

Change-Id: If0e766aeb3e8b4aa6aebed3b75bcedd75251e382

9 years agoFix accessibility ghosts in quick settings detail
Adrian Roos [Tue, 16 Jun 2015 00:27:01 +0000 (17:27 -0700)]
Fix accessibility ghosts in quick settings detail

Fixes a bug where the tile that was just clicked on
to go to the detail view would become visible and cause
confusion to accessibility services.

Bug: 20209718
Change-Id: I1678a4fc35e8d739b7c657e868b02a25eddcba1d

9 years agoBluetooth energy: fix overflow in calculation
Adam Lesinski [Tue, 16 Jun 2015 00:19:07 +0000 (17:19 -0700)]
Bluetooth energy: fix overflow in calculation

Use longs instead of ints, because the energy values can get pretty
high.

Change-Id: I43e696ad9e5965c2e616b11920db5bfae5db1671

9 years agoam b7f9e8a4: am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierco...
Junda Liu [Tue, 16 Jun 2015 00:12:58 +0000 (00:12 +0000)]
am b7f9e8a4: am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev

* commit 'b7f9e8a44dae86cefacb8e3a1ca47821a6852050':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.

9 years agoam ffb09270: am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:12:54 +0000 (00:12 +0000)]
am ffb09270: am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev

* commit 'ffb09270aa675de35a333f3de9cf5638b0de1843':
  Add AssistUtils

9 years agoam 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager...
Junda Liu [Tue, 16 Jun 2015 00:00:50 +0000 (00:00 +0000)]
am 73d04323: Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev

* commit '73d043232434f3ad37af26615919eac3117536b7':
  Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.

9 years agoam 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev
Adrian Roos [Tue, 16 Jun 2015 00:00:45 +0000 (00:00 +0000)]
am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev

* commit '6ecdcf2aa01b2510bf6d506b92172dbc32beeec9':
  Add AssistUtils

9 years agoMerge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev
Junda Liu [Mon, 15 Jun 2015 23:54:36 +0000 (23:54 +0000)]
Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev

9 years agoMerge "Add AssistUtils" into mnc-dev
Adrian Roos [Mon, 15 Jun 2015 23:49:17 +0000 (23:49 +0000)]
Merge "Add AssistUtils" into mnc-dev

9 years agoam 79ae28ec: am 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links...
Quddus Chong [Mon, 15 Jun 2015 23:39:50 +0000 (23:39 +0000)]
am 79ae28ec: am 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

* commit '79ae28ec5f59a0ad3fdb9fff08895d205fd9d362':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571

9 years agoam 86e34ca9: am 9f33d6cb: Fix stuck orientation in SetupWizard
Adrian Roos [Mon, 15 Jun 2015 23:39:44 +0000 (23:39 +0000)]
am 86e34ca9: am 9f33d6cb: Fix stuck orientation in SetupWizard

* commit '86e34ca902ea4ef6e22d3b590a468c221620fefa':
  Fix stuck orientation in SetupWizard

9 years agoam 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev
Zhijun He [Mon, 15 Jun 2015 23:39:39 +0000 (23:39 +0000)]
am 5e83c908: am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev

* commit '5e83c9080c71111955bf7e2559b453ffeb5b2c0d':
  Camera2: fix Surface cast issue

9 years agoam 1e17afa7: am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix...
John Spurlock [Mon, 15 Jun 2015 23:39:34 +0000 (23:39 +0000)]
am 1e17afa7: am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit '1e17afa76a76ffd1ac3c8eb9596de5513ca27c28':
  Fix typo in TtsSpan.

9 years agoam 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishi...
Quddus Chong [Mon, 15 Jun 2015 23:16:43 +0000 (23:16 +0000)]
am 0e5dc780: am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

* commit '0e5dc780f00b6c91d0bcfd46512759c6e8a2a81b':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571

9 years agoam 9f33d6cb: Fix stuck orientation in SetupWizard
Adrian Roos [Mon, 15 Jun 2015 23:16:39 +0000 (23:16 +0000)]
am 9f33d6cb: Fix stuck orientation in SetupWizard

* commit '9f33d6cb2ed90e2fff3d99cfcf90f6074b1b9f04':
  Fix stuck orientation in SetupWizard

9 years agoAdd KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.
Junda Liu [Mon, 15 Jun 2015 20:15:28 +0000 (13:15 -0700)]
Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager.

Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b

9 years agoam 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist...
Quddus Chong [Mon, 15 Jun 2015 23:11:02 +0000 (23:11 +0000)]
am 418ff647: am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

* commit '418ff64748cb866d3dec8a448efffb0cbceec52d':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571

9 years agoAdd AssistUtils
Adrian Roos [Mon, 15 Jun 2015 20:23:14 +0000 (13:23 -0700)]
Add AssistUtils

Enables code sharing with Settings for consistent
default value handling.

Bug: 21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a

9 years agoam fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev
Zhijun He [Mon, 15 Jun 2015 23:06:18 +0000 (23:06 +0000)]
am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev

* commit 'fa4b7fb856a0f978529626fabcddf45fd57ecc3e':
  Camera2: fix Surface cast issue

9 years agoam 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 23:06:13 +0000 (23:06 +0000)]
am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit '9f206bec2d58e5edcebb134013e2d9a23659a4d4':
  Fix typo in TtsSpan.

9 years agoFix stuck orientation in SetupWizard
Adrian Roos [Mon, 15 Jun 2015 22:58:35 +0000 (15:58 -0700)]
Fix stuck orientation in SetupWizard

Bug: 21755092
Change-Id: I3144a81523ce2ef4bf6dc457c0ea4b9723dae489

9 years agoam 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 1929857...
Quddus Chong [Mon, 15 Jun 2015 22:59:13 +0000 (22:59 +0000)]
am 79b30681: Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

* commit '79b30681bbe26b95a8705e17957c1063517ec8f3':
  docs: Fixed broken links in TV publishing checklist. bug: 19298571

9 years agoMerge "Camera2: fix Surface cast issue" into mnc-dev
Zhijun He [Mon, 15 Jun 2015 22:58:47 +0000 (22:58 +0000)]
Merge "Camera2: fix Surface cast issue" into mnc-dev

9 years agoam 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys requiring...
Alex Klyubin [Mon, 15 Jun 2015 22:58:30 +0000 (22:58 +0000)]
am 24244c44: am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev

* commit '24244c443109f5cb4ea02a4ef406e01fcb590453':
  Fix Android Keystore key gen for keys requiring user auth.

9 years agoam 0e250edb: am 9f6d39f8: Merge "Add addional scale component for radialDistortion...
Ruben Brunk [Mon, 15 Jun 2015 22:58:26 +0000 (22:58 +0000)]
am 0e250edb: am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev

* commit '0e250edbfd4f6ec1f59d73dfca4f5f806386a5e1':
  Add addional scale component for radialDistortion.

9 years agoam 1a95a5c7: am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into...
Selim Cinek [Mon, 15 Jun 2015 22:58:22 +0000 (22:58 +0000)]
am 1a95a5c7: am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev

* commit '1a95a5c7201385744851da7c17407a6399d3ec0f':
  Fixed a bug when resolving theme attributes

9 years agoClean up app-link verification policy
Christopher Tate [Sat, 13 Jun 2015 01:31:24 +0000 (18:31 -0700)]
Clean up app-link verification policy

If an app claims to be the official auto-verified app for any domain
and thus the automatic handler for ACTION_VIEW / {http,https}://...
intents naming that domain, then we require that it verify as the
official app for *all* domains it purports to handle, even if the
other domains are not flagged for verify.

Bug 21335460

Change-Id: I3fdd8620defa31aea36ce738fa63ac94fc53c5f7

9 years agoam 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:50:51 +0000 (22:50 +0000)]
am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit '4393a7d2645cfb9097e616016c58887b9929be55':
  Fix typo in TtsSpan.

9 years agoam a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into...
Alex Klyubin [Mon, 15 Jun 2015 22:50:40 +0000 (22:50 +0000)]
am a8232452: Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev

* commit 'a8232452b6bea3c291a56a4e005e7a95eb99c5de':
  Fix Android Keystore key gen for keys requiring user auth.

9 years agoam 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev
Ruben Brunk [Mon, 15 Jun 2015 22:46:09 +0000 (22:46 +0000)]
am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev

* commit '9f6d39f84423d59705c0c7a8746d40cc610caee7':
  Add addional scale component for radialDistortion.

9 years agoam 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev
Selim Cinek [Mon, 15 Jun 2015 22:46:05 +0000 (22:46 +0000)]
am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev

* commit '4fef43dcf81d479d55bd642646c66e5153f73dcc':
  Fixed a bug when resolving theme attributes

9 years agoam 6f084e4b: am 28a8cf68: Merge "Adding config variables for triggering CI action...
Amit Mahajan [Mon, 15 Jun 2015 22:43:58 +0000 (22:43 +0000)]
am 6f084e4b: am 28a8cf68: Merge "Adding config variables for triggering CI action on System update." into mnc-dev

* commit '6f084e4b083a994a4bf656b7060d02f66883de6c':
  Adding config variables for triggering CI action on System update.

9 years agoMerge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc...
Quddus Chong [Mon, 15 Jun 2015 22:42:41 +0000 (22:42 +0000)]
Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs

9 years agoMerge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev
Alex Klyubin [Mon, 15 Jun 2015 22:42:02 +0000 (22:42 +0000)]
Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev

9 years agodocs: Fixed broken links in TV publishing checklist.
Quddus Chong [Mon, 15 Jun 2015 22:27:17 +0000 (15:27 -0700)]
docs: Fixed broken links in TV publishing checklist.
bug: 19298571

Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013

9 years agoam c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:39:12 +0000 (22:39 +0000)]
am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.

9 years agoMerge "Add addional scale component for radialDistortion." into mnc-dev
Ruben Brunk [Mon, 15 Jun 2015 22:34:18 +0000 (22:34 +0000)]
Merge "Add addional scale component for radialDistortion." into mnc-dev

9 years agoam 28a8cf68: Merge "Adding config variables for triggering CI action on System update...
Amit Mahajan [Mon, 15 Jun 2015 22:33:16 +0000 (22:33 +0000)]
am 28a8cf68: Merge "Adding config variables for triggering CI action on System update." into mnc-dev

* commit '28a8cf6883478d568f9c85065e94ba39c5c439d4':
  Adding config variables for triggering CI action on System update.

9 years agoAdd addional scale component for radialDistortion.
Ruben Brunk [Mon, 15 Jun 2015 22:33:09 +0000 (15:33 -0700)]
Add addional scale component for radialDistortion.

Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7

9 years agoMerge "Fixed a bug when resolving theme attributes" into mnc-dev
Selim Cinek [Mon, 15 Jun 2015 22:30:50 +0000 (22:30 +0000)]
Merge "Fixed a bug when resolving theme attributes" into mnc-dev

9 years agoam 076c599f: am 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:23:24 +0000 (22:23 +0000)]
am 076c599f: am 1ad5c813: Fix typo in TtsSpan.

* commit '076c599feb9a18b250de7020c2f1c01561c509f9':
  Fix typo in TtsSpan.

9 years agoFix Android Keystore key gen for keys requiring user auth.
Alex Klyubin [Mon, 15 Jun 2015 22:16:09 +0000 (15:16 -0700)]
Fix Android Keystore key gen for keys requiring user auth.

When Android Keystore generates an asymmetric key pair, it needs to
create a self-signed certificate for that pair, in order to expose
the key pair in the JCA KeyStore abstraction through which keys are
later retrieved. The self-signed certificate is normally signed with
the private key.

This CL avoids using the private key to sign the certificate if the
private key can be used only once the user has been authenticated.
For such keys, a fake (non-verifying) signature is used on the
certificate, same as for cases where the key is not authorized for
signing.

Bug: 21852844
Change-Id: Id78bc1f51d12950db4e37c1e0da6c60057d4e693

9 years agoMerge "Adding config variables for triggering CI action on System update." into mnc-dev
Amit Mahajan [Mon, 15 Jun 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Adding config variables for triggering CI action on System update." into mnc-dev

9 years agoam 1ad5c813: Fix typo in TtsSpan.
John Spurlock [Mon, 15 Jun 2015 22:11:30 +0000 (22:11 +0000)]
am 1ad5c813: Fix typo in TtsSpan.

* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.

9 years agoam 61744be8: am e1debb75: Merge "Fix ascent and descent of Droid Sans Mono to match...
Raph Levien [Mon, 15 Jun 2015 21:47:29 +0000 (21:47 +0000)]
am 61744be8: am e1debb75: Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev

* commit '61744be86a20d1b60e6d5907d6c0063cebdf6788':
  Fix ascent and descent of Droid Sans Mono to match Roboto.

9 years agoam 8d308309: am a5f59258: Merge "Send broadcast when default dialer changes" into...
Yorke Lee [Mon, 15 Jun 2015 21:47:25 +0000 (21:47 +0000)]
am 8d308309: am a5f59258: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit '8d308309e0e686c4c040cfd29b4d7ae36793aca1':
  Send broadcast when default dialer changes

9 years agoam e1debb75: Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into...
Raph Levien [Mon, 15 Jun 2015 21:36:12 +0000 (21:36 +0000)]
am e1debb75: Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev

* commit 'e1debb754b5563db19cec701475618f84ebbe2d6':
  Fix ascent and descent of Droid Sans Mono to match Roboto.

9 years agoam a5f59258: Merge "Send broadcast when default dialer changes" into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 21:36:08 +0000 (21:36 +0000)]
am a5f59258: Merge "Send broadcast when default dialer changes" into mnc-dev

* commit 'a5f592582b36130c75483a3631dccf8df8b1d011':
  Send broadcast when default dialer changes

9 years agoam 1c8ff1dd: am 727a6cf6: Fix blink in Explode transition.
George Mount [Mon, 15 Jun 2015 21:31:32 +0000 (21:31 +0000)]
am 1c8ff1dd: am 727a6cf6: Fix blink in Explode transition.

* commit '1c8ff1dd32f4f6a0d94a58aecf4a44524ff4192b':
  Fix blink in Explode transition.

9 years agoam a7d98a05: am 23a6262f: Merge "QS: Add disable animations for the DND tile." into...
John Spurlock [Mon, 15 Jun 2015 21:31:28 +0000 (21:31 +0000)]
am a7d98a05: am 23a6262f: Merge "QS: Add disable animations for the DND tile." into mnc-dev

* commit 'a7d98a05cc3a59c48e3e77c37feaa87c7ecdf29e':
  QS: Add disable animations for the DND tile.

9 years agoMerge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev
Raph Levien [Mon, 15 Jun 2015 21:29:45 +0000 (21:29 +0000)]
Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev

9 years agoMerge "Send broadcast when default dialer changes" into mnc-dev
Yorke Lee [Mon, 15 Jun 2015 21:23:26 +0000 (21:23 +0000)]
Merge "Send broadcast when default dialer changes" into mnc-dev

9 years agoam 727a6cf6: Fix blink in Explode transition.
George Mount [Mon, 15 Jun 2015 21:21:49 +0000 (21:21 +0000)]
am 727a6cf6: Fix blink in Explode transition.

* commit '727a6cf6ad06bbb43c0c309c33776394a0012895':
  Fix blink in Explode transition.

9 years agoam 23a6262f: Merge "QS: Add disable animations for the DND tile." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 21:14:21 +0000 (21:14 +0000)]
am 23a6262f: Merge "QS: Add disable animations for the DND tile." into mnc-dev

* commit '23a6262fe9d2e23cfb49cbfbf6595485bb329438':
  QS: Add disable animations for the DND tile.

9 years agoFix blink in Explode transition.
George Mount [Thu, 11 Jun 2015 22:32:14 +0000 (15:32 -0700)]
Fix blink in Explode transition.

Bug 21785708

Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc

9 years agoMerge "QS: Add disable animations for the DND tile." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 21:03:53 +0000 (21:03 +0000)]
Merge "QS: Add disable animations for the DND tile." into mnc-dev

9 years agoam 59e7029e: am ab051ef8: Merge "QS icon sizes should be 24dp." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:38:34 +0000 (20:38 +0000)]
am 59e7029e: am ab051ef8: Merge "QS icon sizes should be 24dp." into mnc-dev

* commit '59e7029e1f87433869488d5a9a3f1f3cbfe6f9a1':
  QS icon sizes should be 24dp.

9 years agoQS: Add disable animations for the DND tile.
John Spurlock [Mon, 15 Jun 2015 17:49:57 +0000 (13:49 -0400)]
QS: Add disable animations for the DND tile.

Elide the disabled -> enabled anim, since we launch
the detail panel instead.

Bug: 21118976
Change-Id: I392f848641190f114b7838515acb13f22c96e37d

9 years agoam ab051ef8: Merge "QS icon sizes should be 24dp." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:25:40 +0000 (20:25 +0000)]
am ab051ef8: Merge "QS icon sizes should be 24dp." into mnc-dev

* commit 'ab051ef8050a7ca2fa7c03616b39dd35f3c12b54':
  QS icon sizes should be 24dp.

9 years agoMerge "QS icon sizes should be 24dp." into mnc-dev
John Spurlock [Mon, 15 Jun 2015 20:14:48 +0000 (20:14 +0000)]
Merge "QS icon sizes should be 24dp." into mnc-dev

9 years agoFixed a bug when resolving theme attributes
Selim Cinek [Mon, 15 Jun 2015 20:09:25 +0000 (13:09 -0700)]
Fixed a bug when resolving theme attributes

This could lead to a crash.

Bug: 21705571
Change-Id: I8afb0725d6af59bdeac97f4aec58d0f4a2406905

9 years agoam c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements...
George Mount [Mon, 15 Jun 2015 20:07:45 +0000 (20:07 +0000)]
am c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev

* commit 'c28834f7786bbbd1452bf7b33b21b5e7438365e5':
  Limit shared element transition to shared elements and children.

9 years agoam a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the...
Vladislav Kaznacheev [Mon, 15 Jun 2015 20:07:41 +0000 (20:07 +0000)]
am a31cda89: am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev

* commit 'a31cda89957cc1f29ae1b97a7fadf0266b7ae7b1':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."

9 years agoam 8af78483: Merge "Limit shared element transition to shared elements and children...
George Mount [Mon, 15 Jun 2015 19:55:28 +0000 (19:55 +0000)]
am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev

* commit '8af7848355ef3d8f6042bde1454a478456f6b7fe':
  Limit shared element transition to shared elements and children.

9 years agoam 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator...
Vladislav Kaznacheev [Mon, 15 Jun 2015 19:55:23 +0000 (19:55 +0000)]
am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev

* commit '0021d3fa13f6e3b4574f857623136a474ee033ec':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."

9 years agoam b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targe...
Adam Powell [Mon, 15 Jun 2015 19:49:41 +0000 (19:49 +0000)]
am b05ef5e4: am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev

* commit 'b05ef5e4ef992998894b3b6b644f1ca405889bfc':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M

9 years agoam 3f37869c: am 02b0a574: Merge "Only re-register callbacks if tuning changed" into...
Jason Monk [Mon, 15 Jun 2015 19:49:37 +0000 (19:49 +0000)]
am 3f37869c: am 02b0a574: Merge "Only re-register callbacks if tuning changed" into mnc-dev

* commit '3f37869c89a583f03fef532d8e1ed3fe71bb5292':
  Only re-register callbacks if tuning changed

9 years agoQS icon sizes should be 24dp.
John Spurlock [Mon, 15 Jun 2015 19:45:38 +0000 (15:45 -0400)]
QS icon sizes should be 24dp.

Not 28dp.

Bug: 21118976
Change-Id: I9cc326d1333d85b783b85e3238a2a506bf3b55c0

9 years agoMerge "Limit shared element transition to shared elements and children." into mnc-dev
George Mount [Mon, 15 Jun 2015 19:43:55 +0000 (19:43 +0000)]
Merge "Limit shared element transition to shared elements and children." into mnc-dev

9 years agoMerge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev
Vladislav Kaznacheev [Mon, 15 Jun 2015 19:43:10 +0000 (19:43 +0000)]
Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev