Jessica Hummel
3b9593d82d
am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev
...
* commit '5a082a9e3a92e571d9b532d0aa994db1a9295cc4':
Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
2014-09-12 18:53:15 +00:00
Marcin Kosiba
e8add4dc6a
am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse.
...
* commit '46683a272ea5283a43d89a84bdab048994ca6a14':
Remove an @removed member of andorid.webkit.WebResourceResponse.
2014-09-12 18:52:44 +00:00
Sander Alewijnse
680a5b99cd
am 4d9fe6d1: Merge "Rename email extra." into lmp-dev
...
* commit '4d9fe6d15a4aa661eaea5b34a1810b4986732c4f':
Rename email extra.
2014-09-12 18:52:31 +00:00
Alexandra Gherghina
64a0adc47e
am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev
...
* commit '443a5766fa9b079c9612105cfe962d057fc98fe8':
Assign default icon to users at creation time and in SystemUI.
2014-09-12 18:52:27 +00:00
George Mount
fb2d6c4305
am 44673720: Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev
...
* commit '44673720ac0c4eb37f56f16d262cf5da68064fe2':
Fixed NPE in EnterTransitionCoordinator
2014-09-12 18:52:19 +00:00
Chris Wren
43211f0c6a
am c88b35aa: Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev
...
* commit 'c88b35aabaf2322721130e618667ba813c9b9fe4':
remove unused matchesCallFilter(Bundle, int)
2014-09-12 18:52:14 +00:00
Christoph Studer
dbf91fd819
am e31d13ea: Merge "Notification: Reset chronometer visibility" into lmp-dev
...
* commit 'e31d13eab55c0c8e7b9eee93ed9d06e5328614eb':
Notification: Reset chronometer visibility
2014-09-12 18:52:11 +00:00
Kenny Guy
08786c2b61
am b5153aba: Hide APIs renamed during API review of LauncherApps
...
* commit 'b5153aba264932068895228d3dde4e32a4ef271c':
Hide APIs renamed during API review of LauncherApps
2014-09-12 18:52:02 +00:00
Jessica Hummel
ba64bda79d
am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev
...
* commit 'a387dc16b436d9d76b247c8f623157acb6df88ad':
Use correct string for provisioning complete action.
2014-09-12 18:51:48 +00:00
Jinsuk Kim
abed2d9e65
am ead8ed86: CEC: Bug fixes for vendor-specific command handling
...
* commit 'ead8ed86e8ec1bd1812e31ce5325ca263c5e04d4':
CEC: Bug fixes for vendor-specific command handling
2014-09-12 18:51:36 +00:00
Jessica Hummel
b38e07572f
Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev
2014-09-12 18:39:22 +00:00
Marcin Kosiba
288e7de22e
Remove an @removed member of andorid.webkit.WebResourceResponse.
...
BUG: 17253647
Change-Id: I02f4f0600a09ceb3b68ba2698b80e413e7511663
2014-09-12 18:24:49 +01:00
Sander Alewijnse
098116854e
Merge "Rename email extra." into lmp-dev
2014-09-12 16:14:30 +00:00
Alexandra Gherghina
3e7115ed02
Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev
2014-09-12 16:03:39 +00:00
Jessica Hummel
d8b61f62cd
Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
...
Change-Id: I420797291fe141e295a6197c6d453d98e679ac9e
bug: 17390600
2014-09-12 16:25:30 +01:00
Alexandra Gherghina
64d4dca63f
Assign default icon to users at creation time and in SystemUI.
...
Right now different code in System UI, Settings app and other places replace the
user icon with their own default. This tries to make it consistent by moving the
mechanism used in Settings in a helper class.
Bug: 17311038
Change-Id: Ic858c65bf82a98b9806dbba029e7cdcf441f372e
2014-09-12 15:43:42 +01:00
George Mount
2418d7381f
Merge "Fixed NPE in EnterTransitionCoordinator" into lmp-dev
2014-09-12 14:09:23 +00:00
Chris Wren
135ce76a26
Merge "remove unused matchesCallFilter(Bundle, int)" into lmp-dev
2014-09-12 14:04:33 +00:00
Christoph Studer
c30afd1e74
Merge "Notification: Reset chronometer visibility" into lmp-dev
2014-09-12 13:57:37 +00:00
Kenny Guy
b6edee0dad
Hide APIs renamed during API review of LauncherApps
...
Bug: 17390765
Change-Id: I79a979365005b13a2268b1cfe455241ae4fecb51
2014-09-12 11:44:58 +00:00
Sander Alewijnse
2b338a27be
Rename email extra.
...
Bug:17389863
Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
2014-09-12 12:28:40 +01:00
Jessica Hummel
d4aaab99bb
Merge "Use correct string for provisioning complete action." into lmp-dev
2014-09-12 10:02:47 +00:00
Jessica Hummel
5669216e0d
Use correct string for provisioning complete action.
...
Change-Id: If7e0ca78a89f2cf4853ce01eb14e8a2913e3f85d
bug: 17390600
2014-09-12 09:27:30 +00:00
Yohei Yukawa
e26d921175
am b7dd9519: Merge "API Review: Clean up removed APIs" into lmp-dev
...
* commit 'b7dd9519c9e3566a7c857c5caf92a8a2a1a48401':
API Review: Clean up removed APIs
2014-09-12 07:29:06 +00:00
Jinsuk Kim
ee74a90305
am b3ac0ef8: Merge "Replace the MHL register name \'scratchpad\' with \'vendor\'" into lmp-dev
...
* commit 'b3ac0ef8cb20002004cb7af10f8edd095dc97565':
Replace the MHL register name 'scratchpad' with 'vendor'
2014-09-12 07:28:35 +00:00
Craig Mautner
26059959c9
am 31632435: Merge changes Ia6fe9724,I682b9acb into lmp-dev
...
* commit '31632435a5d994dc6e344186de31f19fdb08ca4e':
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
2014-09-12 07:26:32 +00:00
Alan Viverette
7b49bbc59d
am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev
...
* commit 'd843db67af2c88a55f14a4d54036843c1934323d':
Remove unsafe methods that take TypedArray
2014-09-12 07:23:07 +00:00
Michael Wright
4fceb254d2
am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
...
* commit '44c97df34f49908e1c9dce31813d2f3e39c20dc3':
Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
2014-09-12 07:22:27 +00:00
Jinsuk Kim
d4a94db1cd
CEC: Bug fixes for vendor-specific command handling
...
- Add sendStandby()
- Respond with <Feature Abort>[INCORRECT_MODE] when the listener
is not ready
Bug: 17379243
Bug: 17358887
Change-Id: I26a4157a70f11206978763fbbe69e4190e3e1d5c
2014-09-12 16:22:23 +09:00
George Mount
526373717f
am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev
...
* commit '67f38b35c6e2141a15ed11c5e36b69e9607c1b84':
Fixed empty TransitionSet not notifying listeners.
2014-09-12 07:22:23 +00:00
Amith Yamasani
b9c6ad4e21
am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev
...
* commit '7c8557085241581d571ff22b3954fa20f99e6772':
Annotate bindServiceAsUser with SystemApi
2014-09-12 07:22:20 +00:00
Brian Carlstrom
dd7bfe53b8
am 93468f7c: Merge "Add zygote preloading of shared libraries" into lmp-dev
...
* commit '93468f7c9d2d30ad0ee9e3549e76d38f044101db':
Add zygote preloading of shared libraries
2014-09-12 07:22:16 +00:00
Yigit Boyar
f9ac7c276f
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 07:22:12 +00:00
Alan Viverette
57d016cd0a
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 07:22:08 +00:00
Adam Powell
17b17e2be1
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 07:21:57 +00:00
Craig Mautner
56b3152d54
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 07:21:52 +00:00
Jeff Davidson
f731049f2e
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 07:21:49 +00:00
Prerepa Viswanadham
4d097ce830
am 041299e3: Remove onConnectionCongested callback
...
* commit '041299e377de125746800f5d4644d9fd4b793cf8':
Remove onConnectionCongested callback
2014-09-12 07:21:42 +00:00
George Mount
6316118f6f
am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev
...
* commit '4041d8edb771af9a96940def096637f6d8884fb9':
Fixed: TransitionSet setStartDelay did nothing.
2014-09-12 07:21:32 +00:00
George Mount
9a5e40fbe5
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 07:21:28 +00:00
Igor Murashkin
95d12fe87e
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 07:21:20 +00:00
Sreeram Ramachandran
bed5da12da
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 07:21:16 +00:00
Chet Haase
0b4d935e22
am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev
...
* commit '05cafed09b5dbc2642ac5a93e580ad732f5b7e8d':
Make starting window hw-accelerated
2014-09-12 07:20:34 +00:00
Paul Lawrence
046f9a6d51
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 07:20:25 +00:00
Yohei Yukawa
3fadee4791
API Review: Clean up removed APIs
...
This CL removes old API signatures marked as @removed
in the follow CLs.
- Ic8c6fab58c01206872a34e7ee604cdda1581364d
- Ia8cbb9f6b41cd9509fc0147fd68763dfde593ffc
- I772c48ff18918e48a81e807b48ff907614485c09
This is just a clean-up CL. No behavior change is intended.
BUG: 17200900
BUG: 17320996
BUG: 17365414
Change-Id: Ibfbd5cc1cdebb8851c73477cff55c9b2d631fdea
2014-09-12 11:32:31 +09:00
Jinsuk Kim
68ab6cf0ea
Merge "Replace the MHL register name 'scratchpad' with 'vendor'" into lmp-dev
2014-09-12 02:12:36 +00:00
Craig Mautner
cbc771f50e
Merge changes Ia6fe9724,I682b9acb into lmp-dev
...
* changes:
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
2014-09-12 01:45:29 +00:00
Jinsuk Kim
b3fbf9dbe8
Replace the MHL register name 'scratchpad' with 'vendor'
...
Bug: 17479050
Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421
2014-09-12 10:42:14 +09:00
Alan Viverette
e461d549bf
Merge "Remove unsafe methods that take TypedArray" into lmp-dev
2014-09-12 01:30:35 +00:00
Craig Mautner
7d7808fcf8
Show all windows from activity that hides keyguard
...
Popup windows from the activity hiding the keyguard weren't being
shown. This change retrieves that activity from PhoneWindowManager
and applies the show or hide call to the windows that match the
activity.
Fixes bug 16479813.
Change-Id: Ia6fe97240aec85c5233eee9038138f7d48095a6e
2014-09-11 18:02:38 -07:00