152887 Commits

Author SHA1 Message Date
George Mount
5b966ef557 am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev
* commit '67f38b35c6e2141a15ed11c5e36b69e9607c1b84':
  Fixed empty TransitionSet not notifying listeners.
2014-09-12 05:04:26 +00:00
Amith Yamasani
eb17a5730e am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev
* commit '7c8557085241581d571ff22b3954fa20f99e6772':
  Annotate bindServiceAsUser with SystemApi
2014-09-12 05:04:21 +00:00
Brian Carlstrom
cfe4d09b93 am 93468f7c: Merge "Add zygote preloading of shared libraries" into lmp-dev
* commit '93468f7c9d2d30ad0ee9e3549e76d38f044101db':
  Add zygote preloading of shared libraries
2014-09-12 05:04:17 +00:00
Yigit Boyar
54a4256d8f am 62bd62e4: Merge "Add support for default content description in DecorToolbar" into lmp-dev
* commit '62bd62e48f934d62bd70ec5728f4ee0db1df1f65':
  Add support for default content description in DecorToolbar
2014-09-12 05:04:12 +00:00
Alan Viverette
ae1a488be2 am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev
* commit '8c7810a451cc28e67a8565fd1c63ee9fb0fc9c2d':
  Vertically align toolbar child views with similar gravities
2014-09-12 05:04:08 +00:00
Svetoslav
8c3297ece1 am 59d0713d: Merge "Fix back button behavior and clean up in print preview activity." into lmp-dev
* commit '59d0713d816dd8e9a04885b1907384ba4de6cf19':
  Fix back button behavior and clean up in print preview activity.
2014-09-12 05:04:03 +00:00
Ihab Awad
866daf9a8e am 0bf3d66d: Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev
* commit '0bf3d66deb849bf8eaba2ef613beaba0b96479b9':
  Change UI to represent conferenced IMS connections (1/3)
2014-09-12 05:03:58 +00:00
Adam Powell
4c9e64c79e am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev
* commit '51eee88c3355973ef648cef822f4a737c5b0a6b9':
  Remove View methods that can't be used safely from the SDK
2014-09-12 05:03:53 +00:00
Craig Mautner
0c9505b316 am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev
* commit '790a059b487646bd6aae1cdc866261a57375bb01':
  If activity is an alias get maxRecents from target
2014-09-12 05:03:47 +00:00
Jeff Davidson
fbe9263a98 am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
* commit '1e3977964e1cb0c14a7b3bc6f34e8f15583b93a3':
  Update VpnService Javadoc to reflect new UX.
2014-09-12 05:03:42 +00:00
Craig Mautner
4bc2c64f8e am 7f97f2c3: Merge "Add null check to TaskPersister file list." into lmp-dev
* commit '7f97f2c371b45540c313e72b2bd087162d91d666':
  Add null check to TaskPersister file list.
2014-09-12 05:03:37 +00:00
Prerepa Viswanadham
44c8dfa2a1 am 041299e3: Remove onConnectionCongested callback
* commit '041299e377de125746800f5d4644d9fd4b793cf8':
  Remove onConnectionCongested callback
2014-09-12 05:03:31 +00:00
Jeff Brown
0836f2f08b am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev
* commit '683872afea36e40fa8c962cd82b6e4753994f9d4':
  Clean entire arg block when setting process name.
2014-09-12 05:03:26 +00:00
Svet Ganov
34e67af34f am 60d4306b: Merge "Fix edit text error state in the print UI." into lmp-dev
* commit '60d4306bfd3125543b1a207c82b78e0bfbe7a8d4':
  Fix edit text error state in the print UI.
2014-09-12 05:03:21 +00:00
George Mount
2b02b4e267 am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
* commit '4041d8edb771af9a96940def096637f6d8884fb9':
  Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 05:03:17 +00:00
George Mount
fbb6299907 am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
* commit '3081e3601760871fea78d878e752b556974cb55b':
  Have Activity Transitions activited by a new window attribute.
2014-09-12 05:03:12 +00:00
George Mount
8da635c9b1 am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev
* commit '51d20c877a7c23e273983146188f379fd2b52a6c':
  Allow Path approximation to work with a single point Path.
2014-09-12 05:03:07 +00:00
Igor Murashkin
e77a5a5f2c am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev
* commit '6bb75a48f2b1fac3acb10b79f9172f1bbbabc2a6':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
2014-09-12 05:03:03 +00:00
Sreeram Ramachandran
04e33e9a5b am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev
* commit '8ab9b4c765b7a05223e4013f6e1d8b810a0b272c':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
2014-09-12 05:02:58 +00:00
Andrew Lee
cd79d78db1 am a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev
* commit 'a523c405c9aeefcb7512d049adf76dcc6b247d42':
  API cleanup for RemoteConnection.
2014-09-12 05:02:54 +00:00
Eric Rowe
a5bf3e25c4 am 92168d44: Merge "Fix wifi association tests" into lmp-dev
* commit '92168d4464f2a3b8e503db58ebf1a7c40f6c277e':
  Fix wifi association tests
2014-09-12 05:02:48 +00:00
Anthony Lee
ed0d651338 am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev
* commit '12c83b93b13a7e6d37b385c1270c29d8a959bc78':
  isValidSlotId() and isValidPhoneId() updated to handle negatives.
2014-09-12 05:02:43 +00:00
ztenghui
525c65441e am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev
* commit '0a64dc71677c93909445b92f2c5a04659289941b':
  Finer tessellation can draw better looking shadows for circles.
2014-09-12 05:02:39 +00:00
vandwalle
b12e0178bc am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev
* commit 'c7fd0da2d924ac2b3f60288c777349020220fd33':
  add option to link only same credential configurations
2014-09-12 05:02:34 +00:00
Christopher Tate
7febfee44f am e32b2a5d: Merge "Write new wallpaper files from scratch..." into lmp-dev
* commit 'e32b2a5d2bdc3c8fd4caa00437d5616e3535d601':
  Write new wallpaper files from scratch...
2014-09-12 05:02:30 +00:00
Nancy Chen
4a634a8c7b am 03ee9f82: Merge "Update TelecommManager per API requirements. (1/3)" into lmp-dev
* commit '03ee9f825ac4c4f629e6afd5993f3bc46adb6266':
  Update TelecommManager per API requirements. (1/3)
2014-09-12 05:02:26 +00:00
Chris Craik
4cb524f81f am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev
* commit 'e4c0e03bb23ae4ed64d91f8ba1c8976092252fff':
  Update HWUI paint filter to understand new location of skia bitmap filter preference
2014-09-12 05:02:21 +00:00
Michael Wright
fd243b6cf2 am 54bc6182: Change callback methods from add to register.
* commit '54bc61826b7df0d1c466432c13b4f9782ffd4fad':
  Change callback methods from add to register.
2014-09-12 05:02:16 +00:00
Chet Haase
6d942c8b7f am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
* commit '05cafed09b5dbc2642ac5a93e580ad732f5b7e8d':
  Make starting window hw-accelerated
2014-09-12 05:02:11 +00:00
Xin Guan
dcfc7f6996 am 314712e9: Temp enable the log to identify the wake up cause.
* commit '314712e95987acf944dbf7d1788fdcd6a14511a5':
  Temp enable the log to identify the wake up cause.
2014-09-12 05:02:06 +00:00
Paul Lawrence
d189d67af2 am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev
* commit '5f3e819f368f309472a8dfb6a40f733d3d8d5915':
  Create correct files in dropbox on encrypted boot
2014-09-12 05:02:01 +00:00
Robin Lee
58d21fafee am 7ac7a7d8: Update API
* commit '7ac7a7d875fb54a6d63a8918107bfb752cc56aba':
  Update API
2014-09-12 05:01:55 +00:00
George Mount
a374bc049c Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 2014-09-11 23:56:36 +00:00
Amith Yamasani
e1e98741ff Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 2014-09-11 23:48:37 +00:00
Amith Yamasani
c85029f7d9 Annotate bindServiceAsUser with SystemApi
Bug: 17470388
Change-Id: I0961e6ebabaffd91e3d152074b2f64ca4f9ba8fb
2014-09-11 16:47:17 -07:00
Brian Carlstrom
38c29ca3c7 Merge "Add zygote preloading of shared libraries" into lmp-dev 2014-09-11 23:40:33 +00:00
Brian Carlstrom
6c9af96de5 Add zygote preloading of shared libraries
Bug: 17459019
Change-Id: I7cb4ecd0ec9542aa9079420fe158cedca7fca028
2014-09-11 16:36:45 -07:00
Yigit Boyar
dba92d416d Merge "Add support for default content description in DecorToolbar" into lmp-dev 2014-09-11 23:30:47 +00:00
Alan Viverette
34e53ab66e Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 2014-09-11 23:24:48 +00:00
Svetoslav
36f6951e32 Merge "Fix back button behavior and clean up in print preview activity." into lmp-dev 2014-09-11 23:24:20 +00:00
Alan Viverette
e3cb7baeb9 Vertically align toolbar child views with similar gravities
Also fixes Body1 text size, action bar title size on sw600dp-land.

BUG: 17266152
Change-Id: Ib686dd6e80dfcdad920c922a532f4f5d6252fa19
2014-09-11 16:23:29 -07:00
Ihab Awad
d27a3870f6 Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev 2014-09-11 23:18:04 +00:00
Adam Powell
fb008d6ac3 Merge "Remove View methods that can't be used safely from the SDK" into lmp-dev 2014-09-11 23:12:27 +00:00
Craig Mautner
3969cabf59 Merge "If activity is an alias get maxRecents from target" into lmp-dev 2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c If activity is an alias get maxRecents from target
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.

Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).

Fixes bug 17391328.

Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
2014-09-11 15:53:44 -07:00
Jeff Davidson
8afddbe7e9 Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 2014-09-11 22:41:24 +00:00
Adam Powell
5eb3ffc24c Remove View methods that can't be used safely from the SDK
View methods that previously accepted a TypedArray to initialize
parameters parsed from xml cannot be used correctly by apps. The
TypedArray passed must always be obtained from a context using the
filter array com.android.internal.R.styleable.View, which is not
visible to the SDK.

A previous change already made this safe for existing apps already
using it so that they don't crash, this change removes these methods
from the SDK entirely.

Change-Id: I62099087ad6fd5bf8363e863b04fd0434b8cdfca
2014-09-11 15:38:55 -07:00
Craig Mautner
532e551e68 Merge "Add null check to TaskPersister file list." into lmp-dev 2014-09-11 22:36:18 +00:00
Prerepa Viswanadham
ba4f57a1c6 Remove onConnectionCongested callback
Bug:17289507

Change-Id: I49fd99d320084c618dcec756b832fb3b6a6aec51
2014-09-11 22:29:27 +00:00
Jeff Brown
c46cd62b5c Merge "Clean entire arg block when setting process name." into lmp-dev 2014-09-11 22:28:43 +00:00