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
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
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
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
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
George Mount
68cfdad20d
Allow Path approximation to work with a single point Path.
...
Bug 17452965
A single point Path (move-to only) was not returning any
verbs in the verb list. This forces an approximation for
single move-to and empty paths by giving the same value
for fraction 0 and fraction 1.
Change-Id: Icb1b932d730457680cf422377a83fe669f0a7687
2014-09-11 10:25:31 -07: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
ztenghui
25e5a02d1c
Finer tessellation can draw better looking shadows for circles.
...
b/14976551
Change-Id: I4b9e320b025dbee37cd1893881ddbaad62e3a6e2
2014-09-11 10:10:25 -07: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
Jing Zhao
ad6f28202a
Send empty flash for some CDMA carriers for 3way call
...
Some carrier need a empty flash before the normal one to connect the 3way call
Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
2014-09-11 09:49:45 -07:00
Amith Yamasani
f58e532e01
Merge "Apply cross-user restrictions to Shell" into lmp-dev
2014-09-11 16:46:34 +00:00
Jon Larimer
9d8da659ce
am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit 'd65ab587052934c42769b2d4cf8ec5fa70ef13f8':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:44:26 +00:00
ztenghui
987c7e0967
am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev
...
* commit '8738c8db905dd7c471a06e0496040f46d7a48d5b':
Bring back the fillAlpha and strokeAlpha.
2014-09-11 16:44:17 +00:00
ztenghui
3b7191b8f0
am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev
...
* commit 'e1264a884e41d46828688edc226208e4dacaa047':
Re-triangulate the spot shadow.
2014-09-11 16:44:12 +00:00
Jon Larimer
d65ab58705
am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit 'e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:33:07 +00:00
ztenghui
c96e392765
Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev
2014-09-11 16:32:37 +00:00
ztenghui
ca517b97e0
Merge "Re-triangulate the spot shadow." into lmp-dev
2014-09-11 16:32:05 +00:00
Jon Larimer
e2b12b1fbc
am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:23:39 +00:00
Jean-Michel Trivi
aaed97c369
am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev
...
* commit '8c57b9e97676180a6da299165a2f6f445c84cfd4':
More android.media.AudioFormat.Builder javadoc
2014-09-11 16:22:21 +00:00
Alexandra Gherghina
fd913eca07
am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
...
* commit 'e667e41bb60cbe5e6bde545ecaf1c7d9c8b36af1':
Bugfix: use the correct user for ContentResolver calls
2014-09-11 16:22:14 +00:00
Jean-Michel Trivi
698286847c
Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev
2014-09-11 16:16:22 +00:00
Jon Larimer
61c6ff7b70
Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
2014-09-11 16:15:25 +00:00
Alexandra Gherghina
ffb6343938
Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev
2014-09-11 16:12:59 +00:00
Przemyslaw Szczepaniak
7dddf9fc11
am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev
...
* commit 'b0a86a068abf500f1ee2292cfac79af7f6830dfa':
Replace TreeSet with HashSet.
2014-09-11 16:06:16 +00:00
George Mount
70c2c0e7b1
am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
...
* commit '1ca196bb7db9105b3ede380ce259a1c45b30a964':
Omit appearing views that have a parent that is also appearing.
2014-09-11 16:06:11 +00:00
Przemyslaw Szczepaniak
6931cc9f41
Merge "Replace TreeSet with HashSet." into lmp-dev
2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498
Replace TreeSet with HashSet.
...
Both Locale and Voice do not implement Comparable.
Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8
Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev
2014-09-11 15:53:36 +00:00
Julia Reynolds
5da068b027
am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
...
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
Allow device owners to update LOCATION_MODE.
2014-09-11 15:53:21 +00:00