Commit Graph

222827 Commits

Author SHA1 Message Date
Adam Lesinski
07dfd2d864 Implement AAPT Bundle format
AAPT will scan XML files looking for the <aapt:attr> XML tag.

<!-- @layout/bundle.xml -->
<ImageView xmlns:aapt="http://schemas.android.com/aapt">
  <aapt:attr name="android:src">
    <vector android:pathData="..." ...>
    </vector>
  </aapt:attr>
</ImageView>

The SINGLE child element of the <aapt:attr> tag is extracted into its own top
level resource. It is given a generated name.

The parent element of <aapt:attr> is then given the resource attribute that was assigned
to the `name' attribute. The value is set to a reference to the generated resource.

<!-- @layout/bundle.xml -->
<ImageView android:src="@drawable/bundle_1.xml">
</ImageView>

<!-- @layout/bundle_1.xml -->
<vector android:pathData="..." ...>
</vector>

Bug:22627686
Change-Id: I8575fc4f739011402662fbf6b3db96df0012f598
2015-11-30 14:43:43 -08:00
Phil Weaver
14ed6cf3e7 Ignore feedbackType in AccessibilityEvent dispatch
Send AccessibilityEvents to all accessibility services
that request them. No longer refuse to send them to
services with the same feedback type.

Change-Id: I137905c24fc75c075ab938175ecb6ea5f39112cf
2015-11-30 14:36:34 -08:00
Chien-Yu Chen
2829e99660 Merge "Add and copy video stop sound" 2015-11-30 21:47:54 +00:00
Adam Lesinski
ebb3a76396 Merge "Revert "Implement AAPT Bundle format"" 2015-11-30 21:08:00 +00:00
Adam Lesinski
5b9847ca3f Revert "Implement AAPT Bundle format"
This reverts commit 9d0f7d44d5.

Caused a build breakage when parsing some attributes.

Change-Id: I89ca958b2f2e820d353648df8aadd90bbe8d8339
2015-11-30 21:07:44 +00:00
Raph Levien
f9b40659e6 Merge "Always invalidate TextView on checkForRelayout" 2015-11-30 21:07:07 +00:00
Alan Viverette
5ac42c92fa Always invalidate TextView on checkForRelayout
Previously we would check whether relayout was required and optionally
invalidate; however, with partial layout we leave this work for the
makeNewLayout() method. We still need to manually invalidate, though,
since makeNewLayout() does not handle invalidation.

Bug: 25857300
Change-Id: I81ef9062c9fb4964d5e42a3562e6c782492ad65f
2015-11-30 13:03:00 -08:00
Jason Monk
dfcd4c141b Merge "Guard against monkey crash" 2015-11-30 20:11:00 +00:00
Jason Monk
3175a6e395 Guard against monkey crash
Bug: 25795998
Change-Id: I351faae1e29d09b7577435207ec466a1ff5ed237
2015-11-30 15:07:40 -05:00
Adam Lesinski
be107f46cf Merge "Implement AAPT Bundle format" 2015-11-30 19:51:53 +00:00
Adam Lesinski
2a0dd0e1e3 Merge "AAPT2: Support compiling a res/ directory and output to zip" 2015-11-30 19:30:48 +00:00
Bryce Lee
842ec9c407 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583 am: b241487c16 am: 64e41590d2
am: 0ca7de9031

* commit '0ca7de90310034d118f21343a69a38ebc02dd0bc':
  Add callback for connections to be notified when the ringer is silenced.
2015-11-30 19:17:53 +00:00
Adam Lesinski
a40e972fda AAPT2: Support compiling a res/ directory and output to zip
This allows us to compile an entire directory and output to a single
file. This is important to support generated resources in the make
build, since we may not know what resources get generated.

The link step will accept the zip and read the contents of it as if they
were passed in on the command line.

Change-Id: If1a51b0abe772350c24074353eb4989953c2e0cb
2015-11-30 11:14:01 -08:00
Bryce Lee
0ca7de9031 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583 am: b241487c16
am: 64e41590d2

* commit '64e41590d246cf1fc548b72d40436bcd2fca7b06':
  Add callback for connections to be notified when the ringer is silenced.
2015-11-30 19:09:17 +00:00
Chong Zhang
fc19f14ecc Merge "Show all windows with FLAG_SHOW_WHEN_LOCKED over lock screen if" 2015-11-30 19:03:47 +00:00
Bryce Lee
64e41590d2 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev am: 52bdf11583
am: b241487c16

* commit 'b241487c16976a3f0aa6592740bba15f489eab17':
  Add callback for connections to be notified when the ringer is silenced.
2015-11-30 19:02:38 +00:00
Bryce Lee
b241487c16 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
am: 52bdf11583

* commit '52bdf11583366322ca14d69b895ac451a71245db':
  Add callback for connections to be notified when the ringer is silenced.
2015-11-30 18:56:27 +00:00
Bryce Lee
52bdf11583 Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev 2015-11-30 18:51:39 +00:00
Filip Gruszczynski
1223c198e4 Merge "Remove unnecessary field from AppWindowToken." 2015-11-30 18:38:44 +00:00
Erik Wolsheimer
98fe08fec1 fix data race condition BUG: 25819358 am: 2242b4d2bd am: 1dbb0355dc am: 1d92c4538f
am: 48543000e0

* commit '48543000e0417213b227b1047a83eb7d8528ff35':
  fix data race condition BUG: 25819358
2015-11-30 17:43:39 +00:00
Geoff Mendal
96f0cb679e Merge "Import translations. DO NOT MERGE" 2015-11-30 17:36:56 +00:00
Erik Wolsheimer
48543000e0 fix data race condition BUG: 25819358 am: 2242b4d2bd am: 1dbb0355dc
am: 1d92c4538f

* commit '1d92c4538f8ed43a2e9c1e6d4694ddb3fb058741':
  fix data race condition BUG: 25819358
2015-11-30 17:35:20 +00:00
Erik Wolsheimer
1d92c4538f fix data race condition BUG: 25819358 am: 2242b4d2bd
am: 1dbb0355dc

* commit '1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
  fix data race condition BUG: 25819358
2015-11-30 17:28:44 +00:00
Erik Wolsheimer
1dbb0355dc fix data race condition BUG: 25819358
am: 2242b4d2bd

* commit '2242b4d2bda7f83cf7813103ff95d9b4e244126f':
  fix data race condition BUG: 25819358
2015-11-30 17:22:56 +00:00
Geoff Mendal
8e3b4dc748 Import translations. DO NOT MERGE
Change-Id: Ib74fe15ebdef92bece862bc5ffa0dd908838fe02
Auto-generated-cl: translation import
2015-11-30 17:52:28 +01:00
Alan Treadway
28860b7570 Fix for being able to setup Managed User from system user.
Also move feature flag check to ensure it is used in all cases.

Change-Id: If42787c5bc9ab824449c70f90fb827cf2da7507f
2015-11-30 16:48:26 +00:00
Alan Viverette
8b40491bc2 Merge "Avoid concurrent modification for pending partial layout views" 2015-11-30 14:59:23 +00:00
Niels Egberts
26d17d6ea9 Merge "Small refactoring for FileSynthesisCallback." 2015-11-30 14:05:36 +00:00
Geoff Mendal
00851b1d64 Merge "Import translations. DO NOT MERGE" 2015-11-30 14:02:17 +00:00
Niels Egberts
453c13f771 Small refactoring for FileSynthesisCallback.
Removed unused callerIdentity member and removed null checks
for the dispatcher.

Change-Id: I2983f5d48a7a593bc998ba4e033f1e815fa61819
2015-11-30 14:02:08 +00:00
Geoff Mendal
6b1fb585aa Merge "Import translations. DO NOT MERGE" 2015-11-30 14:01:01 +00:00
Geoff Mendal
7358fea3f9 Merge "Import translations. DO NOT MERGE" 2015-11-30 14:00:02 +00:00
Geoff Mendal
696953ca25 Import translations. DO NOT MERGE
Change-Id: I4247a09a0c94930c560bf92822248a4fc59903ac
Auto-generated-cl: translation import
2015-11-30 05:57:50 -08:00
Geoff Mendal
d52416b771 Import translations. DO NOT MERGE
Change-Id: Ie068d54293b15d002ed53fd82761723a7085c6d9
Auto-generated-cl: translation import
2015-11-30 05:53:19 -08:00
Geoff Mendal
4da1c1e6a5 Import translations. DO NOT MERGE
Change-Id: Ida232117d56cfc78ecf7daadb2f6642a6341b3bc
Auto-generated-cl: translation import
2015-11-30 05:51:51 -08:00
Geoff Mendal
5b0efb551e Import translations. DO NOT MERGE
Change-Id: I155086153a515040b16b3643b4bf40400fcbd922
Auto-generated-cl: translation import
2015-11-30 05:23:55 -08:00
Daichi Hirono
0899812456 Merge "Reopen MTP devices when the provider is created." 2015-11-30 01:08:06 +00:00
Daichi Hirono
e0282dd7d4 Reopen MTP devices when the provider is created.
When the provider is created, it reopens MTP devices that are recorded
in the database. It enables the provider to resume MTP session after the
provider process is killed by the system.

BUG=25704854
Change-Id: I58ae80fdb2e02cb0f045c63c4ade8943e2baae06
2015-11-30 10:06:56 +09:00
Chad Brubaker
291a136a96 Merge "Remove isCertificateEntry check" am: 7d72975c5b am: 59919babe0
am: 19c7afab62

* commit '19c7afab6244303e78bbc6b5ab04520bbd4172d7':
  Remove isCertificateEntry check
2015-11-30 00:00:44 +00:00
Chad Brubaker
19c7afab62 Merge "Remove isCertificateEntry check" am: 7d72975c5b
am: 59919babe0

* commit '59919babe0763980ae0a3977e2701ad2d81a6cbe':
  Remove isCertificateEntry check
2015-11-29 23:56:01 +00:00
Chad Brubaker
59919babe0 Merge "Remove isCertificateEntry check"
am: 7d72975c5b

* commit '7d72975c5b3e6f18710f078199e7a9e3f9376c60':
  Remove isCertificateEntry check
2015-11-29 23:50:33 +00:00
Chad Brubaker
7d72975c5b Merge "Remove isCertificateEntry check" 2015-11-29 23:45:47 +00:00
Zhijun He
53373658a7 Camera2: fix build break
Change-Id: I1641c012eb34fee15b1f4ffa3206de7631014440
2015-11-27 12:58:34 -08:00
Zhijun He
69bd9144b6 Merge "Camera2: update dynamic black level type" 2015-11-27 20:40:10 +00:00
Lorenzo Colitti
355a74f284 Merge "Don't match network requests to legacy API requests." 2015-11-27 03:09:33 +00:00
Lorenzo Colitti
55233b9f2e Merge "Fix one of the breakages of ConnectivityServiceTest in master." 2015-11-27 03:04:31 +00:00
Lorenzo Colitti
def4cb0c7d Don't match network requests to legacy API requests.
Currently, we look at network requests that are created by the
current requestNetwork API to see if they look like requests
that could have been created using the legacy
startUsingNetworkFeature API.

This causes those networks to be added to LegacyTypeTracker,
and so cause CONNECTIVITY_ACTION broadcasts, be accessible
using getNetworkInfo(int type), etc. This was done in the L
timeframe so that apps could request networks using the
then-new requestNetwork APIs and still use them using legacy
APIs such as requestRouteToHost.

However, the resulting CONNECTIVITY_ACTION broadcasts are
expensive. requestRouteToHost has been deprecated since L, and
mixing the old and new APIs was never recommended, so it's time
to delete this hack.

Bug: 22513439
Bug: 23350688
Bug: 25295964
Change-Id: Id867058446e5ee44396743d126d26fa57da0c990
2015-11-27 11:46:19 +09:00
Lorenzo Colitti
2c1a253f22 Fix one of the breakages of ConnectivityServiceTest in master.
Change-Id: I31c7a019383fa589beb1572486700e54edfb97e8
2015-11-27 11:46:18 +09:00
Chad Brubaker
9a0130865e Remove isCertificateEntry check
This was returning false on some test keystores even when
getCertificate would correct return a certificate. Remove the check to
be consistent with how conscrypt loads trust anchors from the keystore.

Bug: 25897324
Change-Id: Ie87658a261ee7ba1cca6896e34b6c53b8abfba85
2015-11-26 14:00:50 -08:00
Erik Kline
764e7960cd Merge "Stop using startUsingNetworkFeature" 2015-11-26 08:57:18 +00:00