Marcin Kosiba
0bdcb84b55
am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev
...
* commit '972628dc8c63b02b75f9e976b3ab67e3913da1a8':
Don't use reflection when generating the onResourcesLoaded callback.
2014-09-11 18:49:07 +00:00
John Spurlock
a28bfe3b9c
am 33386490: am 5d77d533: Merge "Doze: Introduce a pulse period function." into lmp-dev
...
* commit '33386490d123a454f71ddce7fae1ab28ad9e38b0':
Doze: Introduce a pulse period function.
2014-09-11 18:49:02 +00:00
Nancy Chen
654abb8778
am 4d4b7ee6: am 63a12357: Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev
...
* commit '4d4b7ee6f8faec65c422948f6d2be5c7a50cec4a':
Make changes to Connection in Telecomm API (1/4)
2014-09-11 18:48:57 +00:00
Marcin Kosiba
48ce27b86d
am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev
...
* commit '5128e88e4ad39b407cb36bfd3d81f3f5108e5830':
Don't use reflection when generating the onResourcesLoaded callback.
2014-09-11 18:44:07 +00:00
Alan Viverette
8aea37efcc
am bff3a6cf: am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev
...
* commit 'bff3a6cfcc656d336f5d96a6bdc4045c63076924':
Enable adjustViewBounds on preference icon so that maxWidth is used
2014-09-11 18:39:59 +00:00
Robin Lee
ebf185a591
am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
...
* commit 'ac988bd9e45c5588cfffc6e67d04e54b86ecd519':
Add DevicePolicyManager PrivateKey mgmt
2014-09-11 18:39:54 +00:00
RoboErik
d45e61f14d
am d898ddba: am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev
...
* commit 'd898ddba1f86927b1ddf89e8e06386fb0eb4915b':
Update text appearance in leanback setup
2014-09-11 18:39:49 +00:00
Vinit Deshpande
4e62aad90d
am 81c30ffd: am 279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '81c30ffd140fb7d18cb8f0089770d3ecf33923c3':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-11 18:39:44 +00:00
John Spurlock
3cda1976f2
am 5d77d533: Merge "Doze: Introduce a pulse period function." into lmp-dev
...
* commit '5d77d533275690aa82a4713d75761ac03bb714bc':
Doze: Introduce a pulse period function.
2014-09-11 18:35:59 +00:00
Nancy Chen
2683d3bbd4
am 63a12357: Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev
...
* commit '63a123575734c9dd8cdbec38a45e4970d0c128c6':
Make changes to Connection in Telecomm API (1/4)
2014-09-11 18:35:53 +00:00
Marcin Kosiba
a0a9466476
Merge "Don't use reflection when generating the onResourcesLoaded callback." into lmp-dev
2014-09-11 18:34:33 +00:00
John Spurlock
3e42b33980
Merge "Doze: Introduce a pulse period function." into lmp-dev
2014-09-11 18:33:38 +00:00
Amith Yamasani
cf4f151df4
am 0ec5511e: am 4fa40b32: Fix build
...
* commit '0ec5511e7beba9c326ceb690553018d23305356f':
Fix build
2014-09-11 18:32:32 +00:00
Svetoslav
0b4bd46d4f
am ec8399cd: am dd18a7f7: Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev
...
* commit 'ec8399cdd3a36722544099099e9ae19c11ac31c0':
Windows for accessibility with wrong coords on rotation.
2014-09-11 18:32:20 +00:00
Vineeta Srivastava
74ff422b09
am 758fb0cb: am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev
...
* commit '758fb0cb37666a14ed8e198f95a482b8739537b3':
Send empty flash for some CDMA carriers for 3way call
2014-09-11 18:32:14 +00:00
Matthew Williams
146eccccbd
am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
...
* commit '04f538e80614567cb175e2021265d2b6cd727a99':
Add flag to JobParameters for job expired
2014-09-11 18:32:08 +00:00
Tyler Gunn
8dcbabfa7c
am a99279fe: am ba740d4f: Allowing enable/disable of phone accounts. (1/3)
...
* commit 'a99279feb966e96e783c740e55912765d53c3fc9':
Allowing enable/disable of phone accounts. (1/3)
2014-09-11 18:31:42 +00:00
Nancy Chen
402ff40179
am f05b8506: am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev
...
* commit 'f05b8506349bea3d555dc5cd693d2075b688c0b6':
API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
2014-09-11 18:31:37 +00:00
Jon Larimer
7c01389604
am 114423ee: am 92d7b9a6: am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit '114423ee669a18436ddc6c3f8ab7d4f3bddf82ee':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 18:31:29 +00:00
Amith Yamasani
5f0439d729
am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
...
* commit '3b18a0c5f8efdb915fb1304c959236d608eb8b79':
Apply cross-user restrictions to Shell
2014-09-11 18:31:06 +00:00
Alan Viverette
213b77fbe9
am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev
...
* commit 'f871566adb6a2a1bc5827405712a7ebeb180d9d4':
Enable adjustViewBounds on preference icon so that maxWidth is used
2014-09-11 18:30:41 +00:00
Robin Lee
c6bdbea420
am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
...
* commit '03d82225660ebed7bd14ad9cdab300eb0c4b0d18':
Add DevicePolicyManager PrivateKey mgmt
2014-09-11 18:30:34 +00:00
ztenghui
2a67fa92f0
am 548b9294: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev
...
* commit '548b92941c8cea5c3aa125c0fe6ea69748c18591':
Bring back the fillAlpha and strokeAlpha.
2014-09-11 18:30:30 +00:00
ztenghui
1fe740fcc8
am 8c371807: am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev
...
* commit '8c371807fff0553321f544a8e87eed76a853066c':
Re-triangulate the spot shadow.
2014-09-11 18:30:24 +00:00
Nancy Chen
f563e7ece6
Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev
2014-09-11 18:29:56 +00:00
Alan Viverette
cdea76488d
Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev
2014-09-11 18:27:43 +00:00
RoboErik
d746f70aec
am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev
...
* commit '6bd52db9dfc62f742a5bd6e2ac13b18a2f1ab859':
Update text appearance in leanback setup
2014-09-11 18:25:18 +00:00
Vinit Deshpande
68c8ef8976
am 279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
...
* commit '279e0cc445625ca9c1aecbd3163cb6c63a671a31':
Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
2014-09-11 18:25:11 +00:00
John Spurlock
d06aa57037
Doze: Introduce a pulse period function.
...
Instead of pulsing every 30 seconds to mimic the LED, use
a function that pulses more frequently for new notifications,
decaying to a slower pulse, and eventually stopping.
Specifically, the step function for the interval is:
- 10 seconds for the first minute
- then 30 seconds until the five minute mark
- then 60 seconds until the 30 minute mark
- then no pulsing at all
- Since we pulse more frequently on new notifications, remove
the "multi-pulse" concept.
- Move all doze-related duration parameters to a new helper,
backed by config, overridable by sysprops, include in dump.
- Wake up from dozing when hitting volume keys during a pulse.
-
Bug:17393939
Change-Id: Ica86f08b25c738338fced165c77faf3dfccd0343
2014-09-11 14:25:11 -04:00
Nancy Chen
354b2bd0fe
Make changes to Connection in Telecomm API (1/4)
...
* onPhoneAccountClicked removed
* onSetAudioState -> onAudioStateChanged
* onSetState -> onStateChanged
Bug: 17329632
Change-Id: Icbba67439317bf1d21f758d58da7c83c4373efa6
2014-09-11 11:25:03 -07:00
Robin Lee
484d8bd79a
Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev
2014-09-11 18:22:40 +00:00
RoboErik
1308c4b82b
Merge "Update text appearance in leanback setup" into lmp-dev
2014-09-11 18:21:33 +00:00
Bernhard Bauer
26408ccd8e
Add DevicePolicyManager PrivateKey mgmt
...
Additional device policy API to install keypairs to the keychain
silently.
Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
2014-09-11 19:17:00 +01:00
Vinit Deshpande
8a16eabfae
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
2014-09-11 18:16:39 +00:00
Amith Yamasani
0404113ec4
am 4fa40b32: Fix build
...
* commit '4fa40b3233c9ae84c088aef7bc5913b810f13ed2':
Fix build
2014-09-11 18:08:58 +00:00
Amith Yamasani
26f9ea38a5
Fix build
...
Import went missing between CLs
Change-Id: I8740b99dbce15b3f3508768ab3e02f551caf673d
2014-09-11 10:56:51 -07:00
Svetoslav
e189de20b1
am dd18a7f7: Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev
...
* commit 'dd18a7f7c2e6b6a12c448b14b5f5260a07660f86':
Windows for accessibility with wrong coords on rotation.
2014-09-11 17:51:48 +00:00
Vineeta Srivastava
7c90b84ba4
am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev
...
* commit 'bc067325de8197a38feec3782a64e02023c9170d':
Send empty flash for some CDMA carriers for 3way call
2014-09-11 17:51:41 +00:00
Svetoslav
2f67e23738
Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev
2014-09-11 17:42:44 +00:00
Vineeta Srivastava
e14a29ff3d
Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev
2014-09-11 17:41:02 +00:00
Matthew Williams
b82118fa1f
am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev
...
* commit '3812a38b496e011166ca9e23620965eaace03bdc':
Add flag to JobParameters for job expired
2014-09-11 17:40:11 +00:00
Matthew Williams
91911fd952
Merge "Add flag to JobParameters for job expired" into lmp-dev
2014-09-11 17:27:58 +00:00
Tyler Gunn
714dbc5bd7
am ba740d4f: Allowing enable/disable of phone accounts. (1/3)
...
* commit 'ba740d4f288c050687544491041af76140803d66':
Allowing enable/disable of phone accounts. (1/3)
2014-09-11 17:17:17 +00:00
Nancy Chen
26440158b9
am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev
...
* commit '48bc7ea4953a04f6b308171243487fd31208ec11':
API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
2014-09-11 17:17:12 +00:00
Tyler Gunn
a1ed7d1094
Allowing enable/disable of phone accounts. (1/3)
...
- added "hasCapabilities" method on PhoneAccount.
- added CAPABILITY_PLACE_EMERGENCY_CALLS.
- added isEnabled method builder constructor to initialize from an
existing PhoneAccount.
Bug: 17306514
Bug: 17408536
Change-Id: I57de508b4adcf207f3b29cab449bfc634db80153
2014-09-11 17:13:51 +00:00
Jon Larimer
d7b2f428d9
am 92d7b9a6: am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit '92d7b9a6b7d15af9298ed72f7d443607923a5930':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 17:06:41 +00:00
Nancy Chen
4823aecef3
Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev
2014-09-11 17:06:28 +00:00
RoboErik
7a058d4c5e
Update text appearance in leanback setup
...
Changes the size and inter-line spacing.
bug:16959057
Change-Id: Iaf3dcb6c60d071920d73ac2f86e01b6d4248ebf9
2014-09-11 10:03:27 -07:00
Jon Larimer
26a401987a
am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit '9d8da659ceb3989932e02b9342e5a6db06881030':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:54:33 +00:00
Amith Yamasani
d12c36d7b6
am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev
...
* commit '30a5e35bb2541f89f90b12d690085451c814a1dc':
Apply cross-user restrictions to Shell
2014-09-11 16:53:56 +00:00