drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,000 Commits 1 Branch 0 Tags
Commit Graph

197000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junda Liu
b7f9e8a44d 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.
 2015-06-16 00:00:50 +00:00
Adrian Roos
ffb09270aa am 6ecdcf2a: Merge "Add AssistUtils" into mnc-dev 
* commit '6ecdcf2aa01b2510bf6d506b92172dbc32beeec9':
  Add AssistUtils
 2015-06-16 00:00:45 +00:00
Junda Liu
73d0432324 Merge "Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager." into mnc-dev 2015-06-15 23:54:38 +00:00
Adrian Roos
6ecdcf2aa0 Merge "Add AssistUtils" into mnc-dev 2015-06-15 23:49:22 +00:00
Quddus Chong
79ae28ec5f 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
 2015-06-15 23:16:43 +00:00
Adrian Roos
86e34ca902 am 9f33d6cb: Fix stuck orientation in SetupWizard 
* commit '9f33d6cb2ed90e2fff3d99cfcf90f6074b1b9f04':
  Fix stuck orientation in SetupWizard
 2015-06-15 23:16:39 +00:00
Junda Liu
e478649373 Add KEY_DEFAULT_SIM_CALL_MANAGER_STRING to carrierconfigmanager. 
Bug: b/21499566
Change-Id: I9fa33f124e0f617782709597761be75a20797d4b
 2015-06-15 16:12:02 -07:00
Quddus Chong
0e5dc780f0 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
 2015-06-15 23:11:02 +00:00
Adrian Roos
e91750804a Add AssistUtils 
Enables code sharing with Settings for consistent
default value handling.

Bug: 21780590
Change-Id: I669b673f90fab503ae0c2179f09ebac9592bd33a
 2015-06-15 16:07:48 -07:00
Zhijun He
5e83c9080c am fa4b7fb8: Merge "Camera2: fix Surface cast issue" into mnc-dev 
* commit 'fa4b7fb856a0f978529626fabcddf45fd57ecc3e':
  Camera2: fix Surface cast issue
 2015-06-15 23:06:18 +00:00
John Spurlock
1e17afa76a am 9f206bec: am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '9f206bec2d58e5edcebb134013e2d9a23659a4d4':
  Fix typo in TtsSpan.
 2015-06-15 23:06:13 +00:00
Adrian Roos
9f33d6cb2e Fix stuck orientation in SetupWizard 
Bug: 21755092
Change-Id: I3144a81523ce2ef4bf6dc457c0ea4b9723dae489
 2015-06-15 23:02:41 +00:00
Quddus Chong
418ff64748 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
 2015-06-15 22:59:13 +00:00
Zhijun He
fa4b7fb856 Merge "Camera2: fix Surface cast issue" into mnc-dev 2015-06-15 22:58:50 +00:00
John Spurlock
9f206bec2d am 4393a7d2: am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '4393a7d2645cfb9097e616016c58887b9929be55':
  Fix typo in TtsSpan.
 2015-06-15 22:50:51 +00:00
Alex Klyubin
24244c4431 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.
 2015-06-15 22:50:40 +00:00
Ruben Brunk
0e250edbfd am 9f6d39f8: Merge "Add addional scale component for radialDistortion." into mnc-dev 
* commit '9f6d39f84423d59705c0c7a8746d40cc610caee7':
  Add addional scale component for radialDistortion.
 2015-06-15 22:46:09 +00:00
Selim Cinek
1a95a5c720 am 4fef43dc: Merge "Fixed a bug when resolving theme attributes" into mnc-dev 
* commit '4fef43dcf81d479d55bd642646c66e5153f73dcc':
  Fixed a bug when resolving theme attributes
 2015-06-15 22:46:05 +00:00
Quddus Chong
79b30681bb Merge "docs: Fixed broken links in TV publishing checklist. bug: 19298571" into mnc-preview-docs 2015-06-15 22:42:43 +00:00
Alex Klyubin
a8232452b6 Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-dev 2015-06-15 22:42:04 +00:00
Quddus Chong
e08a39c0cf docs: Fixed broken links in TV publishing checklist. 
bug: 19298571

Change-Id: I5a4d6df6e7c8dd0e1f9ffb652375fa265b677013
 2015-06-15 15:39:46 -07:00
John Spurlock
4393a7d264 am c0d84934: am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit 'c0d849348ae9fb36e725d0644a4927e2e5146295':
  Fix typo in TtsSpan.
 2015-06-15 22:39:12 +00:00
Ruben Brunk
9f6d39f844 Merge "Add addional scale component for radialDistortion." into mnc-dev 2015-06-15 22:34:20 +00:00
Amit Mahajan
6f084e4b08 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.
 2015-06-15 22:33:16 +00:00
Ruben Brunk
02cd8cbc9d Add addional scale component for radialDistortion. 
Bug: 20491394
Change-Id: Ibbaf8bbfe60e1e0c17ac5ba8c641b8616b1148b7
 2015-06-15 15:33:09 -07:00
Selim Cinek
4fef43dcf8 Merge "Fixed a bug when resolving theme attributes" into mnc-dev 2015-06-15 22:30:52 +00:00
John Spurlock
c0d849348a am 076c599f: am 1ad5c813: Fix typo in TtsSpan. 
* commit '076c599feb9a18b250de7020c2f1c01561c509f9':
  Fix typo in TtsSpan.
 2015-06-15 22:23:24 +00:00
Alex Klyubin
f78dd677e9 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
 2015-06-15 15:22:19 -07:00
Amit Mahajan
28a8cf6883 Merge "Adding config variables for triggering CI action on System update." into mnc-dev 2015-06-15 22:16:41 +00:00
John Spurlock
076c599feb am 1ad5c813: Fix typo in TtsSpan. 
* commit '1ad5c813211d4d855a0d5396855c80653480aaa4':
  Fix typo in TtsSpan.
 2015-06-15 22:11:30 +00:00
Raph Levien
61744be86a 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.
 2015-06-15 21:36:12 +00:00
Yorke Lee
8d308309e0 am a5f59258: Merge "Send broadcast when default dialer changes" into mnc-dev 
* commit 'a5f592582b36130c75483a3631dccf8df8b1d011':
  Send broadcast when default dialer changes
 2015-06-15 21:36:08 +00:00
Raph Levien
e1debb754b Merge "Fix ascent and descent of Droid Sans Mono to match Roboto." into mnc-dev 2015-06-15 21:29:47 +00:00
Yorke Lee
a5f592582b Merge "Send broadcast when default dialer changes" into mnc-dev 2015-06-15 21:23:28 +00:00
George Mount
1c8ff1dd32 am 727a6cf6: Fix blink in Explode transition. 
* commit '727a6cf6ad06bbb43c0c309c33776394a0012895':
  Fix blink in Explode transition.
 2015-06-15 21:21:49 +00:00
John Spurlock
a7d98a05cc am 23a6262f: Merge "QS: Add disable animations for the DND tile." into mnc-dev 
* commit '23a6262fe9d2e23cfb49cbfbf6595485bb329438':
  QS: Add disable animations for the DND tile.
 2015-06-15 21:14:21 +00:00
George Mount
727a6cf6ad Fix blink in Explode transition. 
Bug 21785708

Change-Id: I1250d8e084601a6267906fdb2f3df46cbb8161fc
 2015-06-15 14:12:26 -07:00
John Spurlock
23a6262fe9 Merge "QS: Add disable animations for the DND tile." into mnc-dev 2015-06-15 21:03:55 +00:00
John Spurlock
036e7cbbfa 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
 2015-06-15 16:33:44 -04:00
John Spurlock
59e7029e1f am ab051ef8: Merge "QS icon sizes should be 24dp." into mnc-dev 
* commit 'ab051ef8050a7ca2fa7c03616b39dd35f3c12b54':
  QS icon sizes should be 24dp.
 2015-06-15 20:25:40 +00:00
John Spurlock
ab051ef805 Merge "QS icon sizes should be 24dp." into mnc-dev 2015-06-15 20:14:49 +00:00
Selim Cinek
ad98f7bc76 Fixed a bug when resolving theme attributes 
This could lead to a crash.

Bug: 21705571
Change-Id: I8afb0725d6af59bdeac97f4aec58d0f4a2406905
 2015-06-15 13:10:01 -07:00
George Mount
c28834f778 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.
 2015-06-15 19:55:28 +00:00
Vladislav Kaznacheev
a31cda8995 am 0021d3fa: Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 
* commit '0021d3fa13f6e3b4574f857623136a474ee033ec':
  Revert "Make VPA.setInterpolator(null) unset the interpolator."
 2015-06-15 19:55:23 +00:00
John Spurlock
c97010c088 QS icon sizes should be 24dp. 
Not 28dp.

Bug: 21118976
Change-Id: I9cc326d1333d85b783b85e3238a2a506bf3b55c0
 2015-06-15 15:45:38 -04:00
George Mount
8af7848355 Merge "Limit shared element transition to shared elements and children." into mnc-dev 2015-06-15 19:43:57 +00:00
Vladislav Kaznacheev
0021d3fa13 Merge "Revert "Make VPA.setInterpolator(null) unset the interpolator."" into mnc-dev 2015-06-15 19:43:13 +00:00
Adam Powell
b05ef5e4ef am 417018f2: Merge "Only read foreground attr for FrameLayouts for targetSdkVersion < M" into mnc-dev 
* commit '417018f21b85426eb787a462377d83feadc816e9':
  Only read foreground attr for FrameLayouts for targetSdkVersion < M
 2015-06-15 19:38:03 +00:00
Jason Monk
3f37869c89 am 02b0a574: Merge "Only re-register callbacks if tuning changed" into mnc-dev 
* commit '02b0a574dbcfb804306c6d010f610c241cf66e09':
  Only re-register callbacks if tuning changed
 2015-06-15 19:38:00 +00:00
Yorke Lee
107c4ce2ac Send broadcast when default dialer changes 
Add hidden TelecomManager.setDefaultDialer for system apps
to set the default dialer and trigger the broadcast

Bug: 21846308
Change-Id: Ifdd30cd1323ab0157edf7fd966173b6c52df6ba0
 2015-06-15 12:36:09 -07:00