Tom Hudson
64bb63f0ee
Merge "Remove direct dependency of external/skia on frameworks/native"
2015-10-23 14:17:11 +00:00
Tom Hudson
b2f5bd2d60
Remove direct dependency of external/skia on frameworks/native
...
Moves all code that needs to link with libgui or libui into
frameworks/native/hwui/utils/TestWindowContext. This allows us to
run Skia automated tests against a HWUI backend to watch for
performance or correctness regressions on Android.
BUG=23556017
TEST=After this change, we can remove libui and frameworks/native/include
from external/skia/Android.mk
R=djsollen@google.com
Change-Id: I6f02a5ff98101e448606a1e892686e2c648b6c8a
2015-10-23 10:07:03 -04:00
Andreas Gampe
342b89e2da
Merge "Revert "libs: add libpackagelistparser"" am: e3da6ba5dd am: 314e1e00d8
...
am: b61fd4fae2
* commit 'b61fd4fae2cefc441a75f7b695e671e84570006f':
Revert "libs: add libpackagelistparser"
2015-10-23 04:30:35 +00:00
Andreas Gampe
b61fd4fae2
Merge "Revert "libs: add libpackagelistparser"" am: e3da6ba5dd
...
am: 314e1e00d8
* commit '314e1e00d812e4edf426a46726a2127c563048a5':
Revert "libs: add libpackagelistparser"
2015-10-23 04:24:05 +00:00
Andreas Gampe
314e1e00d8
Merge "Revert "libs: add libpackagelistparser""
...
am: e3da6ba5dd
* commit 'e3da6ba5dd29002789a76dafdc14987c51d92ea5':
Revert "libs: add libpackagelistparser"
2015-10-23 04:16:20 +00:00
Andreas Gampe
e3da6ba5dd
Merge "Revert "libs: add libpackagelistparser""
2015-10-23 03:46:40 +00:00
Sungmin Choi
6243426e66
Remove tether_apndata for Sasktel am: a665ea7207 am: af745653d0 am: b932dc5253
...
am: 9bd6b23111
* commit '9bd6b231115ed273dd3eeed90a1f83f494a1ba72':
Remove tether_apndata for Sasktel
2015-10-23 03:44:29 +00:00
Sungmin Choi
9bd6b23111
Remove tether_apndata for Sasktel am: a665ea7207 am: af745653d0
...
am: b932dc5253
* commit 'b932dc5253fa27ec54e7aeeba12307adb3965df3':
Remove tether_apndata for Sasktel
2015-10-23 03:38:20 +00:00
Sungmin Choi
b932dc5253
Remove tether_apndata for Sasktel am: a665ea7207
...
am: af745653d0
* commit 'af745653d0809d7f9545cebf8727ea8c75990fd1':
Remove tether_apndata for Sasktel
2015-10-23 03:33:29 +00:00
Sungmin Choi
af745653d0
Remove tether_apndata for Sasktel
...
am: a665ea7207
* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
Remove tether_apndata for Sasktel
2015-10-23 03:26:18 +00:00
Andreas Gampe
ce969123b1
Revert "libs: add libpackagelistparser"
...
This reverts commit dc06bb0752c1bc3e87b04a097b308bca1bc86181.
This should go into system/core.
Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
2015-10-22 19:50:09 -07:00
Roozbeh Pournader
e1e654d09e
Merge "Pass the whole locale list down to Minikin."
2015-10-23 01:39:28 +00:00
Sungmin Choi
a665ea7207
Remove tether_apndata for Sasktel
...
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).
BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
2015-10-22 16:59:44 -07:00
Daniel Cashman
4c6b40ec81
Merge "libs: add libpackagelistparser" am: cc7373eafd am: 188e8875db
...
am: a2dbc1cea3
* commit 'a2dbc1cea3c60510f27bfeb39012ae2c2796503c':
libs: add libpackagelistparser
2015-10-22 23:47:40 +00:00
Daniel Cashman
a2dbc1cea3
Merge "libs: add libpackagelistparser" am: cc7373eafd
...
am: 188e8875db
* commit '188e8875db1a55a6bafc8e8ef741400baab6e6fb':
libs: add libpackagelistparser
2015-10-22 23:38:40 +00:00
Jason Monk
11ad7f2c22
Merge "Add way to add to prototype QS editing"
2015-10-22 23:26:32 +00:00
Daniel Cashman
188e8875db
Merge "libs: add libpackagelistparser"
...
am: cc7373eafd
* commit 'cc7373eafd0d5be7df8898748a700b47298ebf10':
libs: add libpackagelistparser
2015-10-22 23:12:49 +00:00
Maxim Bogatov
699ee64e20
Merge "Prevent AccessibilityInteractionClient.getWindows() returns partially cached windows list."
2015-10-22 23:09:20 +00:00
Daniel Cashman
cc7373eafd
Merge "libs: add libpackagelistparser"
2015-10-22 23:03:51 +00:00
Ian Pedowitz
ab49c51342
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 am: 07129d53b5
...
am: d3511518f9
* commit 'd3511518f927eead41fb33c56803104672dcffc2':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:53:24 +00:00
Ian Pedowitz
d3511518f9
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0
...
am: 07129d53b5
* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:46:06 +00:00
Hui Shu
0aea646d89
Merge "Add the APIs for customizing WebView action mode menu actions"
2015-10-22 22:41:31 +00:00
Ian Pedowitz
07129d53b5
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90
...
am: b402735fc0
* commit 'b402735fc0eb246233814bce76118fba99bb9f87':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:38:56 +00:00
Hui Shu
227a8c1df2
Add the APIs for customizing WebView action mode menu actions
...
We will allow apps to disable Share, Web Search, and text
processing related menu actions.
The default actions like cut, copy, paste cannot be disabled.
BUG: 22772178
Change-Id: I8429454f71f74a99298f412862cd32d8fba93784
2015-10-22 15:35:59 -07:00
Ian Pedowitz
b402735fc0
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
...
am: 09fd4ecf90
* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90
Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev
2015-10-22 22:26:32 +00:00
Ian Pedowitz
e2adb2cf0f
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.
Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22 22:09:04 +00:00
Winson Chung
64f26328aa
Merge "Additional refactoring interface between component and activity."
2015-10-22 21:26:18 +00:00
Nicolas Prévot
c982b407b9
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 am: f31628f58b am: d7688f5933
...
am: e1be56cdff
* commit 'e1be56cdfff431985ffd931bdd7c001e4c87478d':
Don't resolve cross-profile app links without intent picker.
2015-10-22 20:56:19 +00:00
Nicolas Prévot
e1be56cdff
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 am: f31628f58b
...
am: d7688f5933
* commit 'd7688f593327929e2bc42989236b62ddecf5e8b5':
Don't resolve cross-profile app links without intent picker.
2015-10-22 20:49:46 +00:00
Nicolas Prévot
d7688f5933
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7
...
am: f31628f58b
* commit 'f31628f58b97f99133b760b4c34d2ff6f4e456d0':
Don't resolve cross-profile app links without intent picker.
2015-10-22 20:43:32 +00:00
Nicolas Prévot
f31628f58b
Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev
...
am: 6666b29cf7
* commit '6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
Don't resolve cross-profile app links without intent picker.
2015-10-22 20:35:19 +00:00
Adam Lesinski
3b7acbb862
Merge "AAPT2: Process <java-symbols> and private symbol package"
2015-10-22 20:34:36 +00:00
Tenghui Zhu
1b43361767
Merge "Fix segment number for arcTo conversion"
2015-10-22 20:33:06 +00:00
Nicolas Prévot
6666b29cf7
Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev
2015-10-22 20:29:51 +00:00
John Reck
0cc90c36f3
Merge "Add assert for required EGL extensions"
2015-10-22 20:27:36 +00:00
John Reck
708b6687da
Add assert for required EGL extensions
...
Bug: 25149700
Change-Id: I535ead7c1f8ba8766dff85fcf26a9cfe76647fb8
2015-10-22 13:18:37 -07:00
Roozbeh Pournader
f036ead2a2
Pass the whole locale list down to Minikin.
...
Also, compute LocaleList's string representation at construction.
This is to further push the cost of doing costly operations related
to LocaleLists to construction time.
Change-Id: Ia55b8ce66b1088ff54cb42eb1e11149b5bd10f17
2015-10-22 13:14:13 -07:00
Adam Lesinski
9e10ac7015
AAPT2: Process <java-symbols> and private symbol package
...
Need to introduce the idea of multiple levels of visibility to support <java-symbol>.
Public, Private, Undefined.
Public means it is accessible from outside and requires an ID assigned.
Private means that we explicitly want this to be a symbol (show up in R.java), but not visible
to other packages. No ID required.
Undefined is any normal resource. When --private-symbols is specified in the link phase,
these resources will not show up in R.java.
Change-Id: Icba89221e08e685dee7683786aa7112baf28c856
2015-10-22 12:52:49 -07:00
Winson
412e18058d
Additional refactoring interface between component and activity.
...
- Removing broadcasts for communicating with the Recents activity from
the component in favor of using events.
Change-Id: I2ddfde911bd1fd1b2d63bb84a0e7f0338f955df6
2015-10-22 19:49:23 +00:00
Winson Chung
679b62edca
Merge "Refactoring secondary user recents logic."
2015-10-22 19:27:35 +00:00
Winson
190fe3bf88
Refactoring secondary user recents logic.
...
- Removing old broadcasts in favor of direct aidl interface between
system and secondary users. Also moving user specific implementation
into RecentsImpl, allowing Recents to handle proxying between users.
Change-Id: I4bd5ef1d1ee47309b7c754f50a5e8b2e2aab988f
2015-10-22 12:26:21 -07:00
Dmitry Torokhov
2890a282c3
SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f am: d3eee7c410 am: 5c6a3872cb
...
am: 3eba93f21c
* commit '3eba93f21c6cd7f3659e9c683c67cb3c19895677':
SystemUI: fix automatic pairing of BT keyboards
2015-10-22 18:30:56 +00:00
Dmitry Torokhov
3eba93f21c
SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f am: d3eee7c410
...
am: 5c6a3872cb
* commit '5c6a3872cb0df50e9a8d2aaa0b8f84e78cd4433f':
SystemUI: fix automatic pairing of BT keyboards
2015-10-22 18:24:35 +00:00
Dmitry Torokhov
5c6a3872cb
SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f
...
am: d3eee7c410
* commit 'd3eee7c410dbc6f8eb5133a347fb0a0ce7221893':
SystemUI: fix automatic pairing of BT keyboards
2015-10-22 18:18:46 +00:00
Dmitry Torokhov
d3eee7c410
SystemUI: fix automatic pairing of BT keyboards
...
am: 79f00cf06f
* commit '79f00cf06f5e70047d73b48d20910b967353b075':
SystemUI: fix automatic pairing of BT keyboards
2015-10-22 18:13:36 +00:00
Michael Wright
40311676d0
Merge "Fixup InputManager javadoc"
2015-10-22 17:54:31 +00:00
Michael Wright
4ecbdbb4fa
Merge "Add kernel keycode mapping for new cut / copy / paste keys"
2015-10-22 17:53:43 +00:00
Anthony Hugh
73e82d7857
Merge "Give watch Home app location permissions by default" into cw-e-dev am: 0a3270e00a am: 5f8ac21cac
...
am: a7882195a9
* commit 'a7882195a9888b2003c95d34a2d0aa5c53f61b62':
Give watch Home app location permissions by default
2015-10-22 17:42:07 +00:00
Anthony Hugh
a7882195a9
Merge "Give watch Home app location permissions by default" into cw-e-dev am: 0a3270e00a
...
am: 5f8ac21cac
* commit '5f8ac21cac89077edd50d547b43550296a506d4b':
Give watch Home app location permissions by default
2015-10-22 17:36:23 +00:00