228806 Commits

Author SHA1 Message Date
Daichi Hirono
52da3ad906 Add getPartialObject to Java MtpDevice class.
BUG=26284424

Change-Id: Id05dc6297a1682999eee4e72972fb883fa49a5d1
2016-01-07 12:41:17 +09:00
Yohei Yukawa
44b3c451bf Merge "Fix IMM#showInputMethodAndSubtypeEnabler()." 2016-01-07 01:29:05 +00:00
Daichi Hirono
fff12cd70a Merge "Implement FUSE operations in AppFuse JNI." 2016-01-07 01:21:07 +00:00
Daichi Hirono
1830c2aa55 Merge "Leave from the current root when the root is removed." 2016-01-07 01:18:34 +00:00
Jeff Sharkey
873b382cfa Merge "Add some TestApis to fix build." 2016-01-07 00:41:45 +00:00
Filip Gruszczynski
e5b386d2bb Merge "Don't depend on mContentParent to determine if content was set." 2016-01-07 00:40:55 +00:00
Adam Lesinski
29474f9ed2 Merge "AAPT2: Fix product support" 2016-01-07 00:40:36 +00:00
Jeff Sharkey
a73b8fd1f4 Add some TestApis to fix build.
Change-Id: Icf0d8d63f3a41d99e46ebe96003863bae637bd9d
2016-01-06 17:37:32 -07:00
Wale Ogunwale
557467b82d Merge "Improved output for 'dumpsys window displays'" 2016-01-07 00:32:40 +00:00
Adam Lesinski
7751afc796 AAPT2: Fix product support
Previously the default product wasn't tried if 'default' wasn't specified on the command line.
Also adds support for multiple products.

Change-Id: I1e4872b34bb8d609b6444841a4e7e4dbb3bbb76b
2016-01-06 16:18:40 -08:00
Siyamed Sinir
f744b0793b Merge "New regular expression to autolink URLs" 2016-01-07 00:14:26 +00:00
Adam Lesinski
198ce1a5e6 Merge "AAPT2: Port AAPT pseudolocalization to AAPT2" 2016-01-06 23:55:06 +00:00
Adam Lesinski
f68f066cdf Merge "AAPT2: Fix references to private parent" 2016-01-06 23:50:50 +00:00
Adam Lesinski
457a7e74be Merge "AAPT2: Respect format attribute of <item> tag" 2016-01-06 23:50:10 +00:00
Chris Craik
5ea212c9a0 Merge "Rework op macros" 2016-01-06 22:42:31 +00:00
Philip P. Moltmann
092ec82dc1 Merge "Fix wrong annotation for PrintInfo.Builder.setStatus" 2016-01-06 22:35:35 +00:00
Filip Gruszczynski
f4bdaeb38d Don't depend on mContentParent to determine if content was set.
mContentParent might be set due to window preservation, rather than due
to client setting the content view. We should mark the content view as
set only when it's explicitly done.

Bug: 26345798
Change-Id: I749de9def8ff708592fa20abdb7da366ec52f24d
2016-01-06 14:34:00 -08:00
Jeff Sharkey
51f3908c6a Merge "Consistent naming for PackageManager methods." 2016-01-06 22:26:16 +00:00
Jeff Sharkey
e06b4d1d9f Consistent naming for PackageManager methods.
When hidden PackageManager methods take a userId argument, they
should be named explicitly with the "AsUser" suffix.  This fixes
several lagging examples so that we can pave the way to safely
start passing flags to new methods without scary overloading.

Also fix spacing issues in various logging statements.

Change-Id: I1e42f7f66427410275df713bea04f6e0445fba28
2016-01-06 15:21:06 -07:00
Chris Craik
7cbf63da4f Rework op macros
Makes it simpler to add defer-only or render-only opps.

Change-Id: I6c8ec64e76d419635429055cff6d96360d21706d
2016-01-06 14:04:22 -08:00
Wale Ogunwale
bc98c55db4 Merge "[WindowManagerService] fix starting window issue" 2016-01-06 22:02:24 +00:00
Jeremy Joslin
904bfb5fc4 Exit getAllValidScorers early if not the primary. am: 5b294b45d0 am: 2a5f880c9e
am: 0807537ac2

* commit '0807537ac25bb0557a009e64eb1e399296c7531b':
  Exit getAllValidScorers early if not the primary.
2016-01-06 21:52:43 +00:00
Jeff Sharkey
81cf69a3b4 Merge "Update logic for resolving verifiers." 2016-01-06 21:50:06 +00:00
Jeremy Joslin
0807537ac2 Exit getAllValidScorers early if not the primary. am: 5b294b45d0
am: 2a5f880c9e

* commit '2a5f880c9e3c14c5e3421259f7904d9c352f79dc':
  Exit getAllValidScorers early if not the primary.
2016-01-06 21:48:30 +00:00
Ben Kwa
4788b3392c Merge "Switch to smooth scrolling when zooming to home/end." 2016-01-06 21:44:43 +00:00
Jeremy Joslin
2a5f880c9e Exit getAllValidScorers early if not the primary.
am: 5b294b45d0

* commit '5b294b45d0d7afbed71fd2e59342c5ad7b8b7d76':
  Exit getAllValidScorers early if not the primary.
2016-01-06 21:43:24 +00:00
Jason Monk
cd90a54e12 Merge "QS Customize panel cleanup" 2016-01-06 21:43:13 +00:00
Philip P. Moltmann
b8c1a02adb Fix wrong annotation for PrintInfo.Builder.setStatus
Change-Id: I11fd68497c6229d16c0827f4753f485e9095649d
2016-01-06 21:42:31 +00:00
Ben Kwa
8d7bf9487b Switch to smooth scrolling when zooming to home/end.
Smooth scrolling fires off a full complement of scroll state changes,
which enables the code to more accurately detect when a scroll is
finished.

BUG=24865658,25632648

Change-Id: Ib902836fdb4a76612d3bbfc4d30d5b0b249301a5
2016-01-06 13:41:58 -08:00
Chong Zhang
587c19c939 Merge "Some fixes for docking from navigation bar use case" 2016-01-06 21:36:29 +00:00
Jason Monk
51c444be14 QS Customize panel cleanup
- Use better service management to ensure onTileAdded and onTileRemoved
   are sent.
 - Fix not always registered as tunable bug.

Bug: 26423350
Change-Id: I56156de8e0edf903509dac594b471700068ebe3e
2016-01-06 16:32:29 -05:00
Chong Zhang
f596cd519a Some fixes for docking from navigation bar use case
- Do not set replace window if we are keeping the window.

- After we received the app's addWindow request, do a reset of the
timeout timer to give the app more time to finish drawing. This
reduces the chance of the flash due to the old window being removed
before new window is drawn.

- If we really hit timeout limit, make sure the replaced window
is removed by using removeWindowInnerLocked(), not removeWindowLocked().
The latter does not actually remove the window if it's exiting,
and this leaves the window in the stack and marked not for
for replacing, then it can never be removed.

bug: 26324082

Change-Id: I59594798079481cba9490c4754de1b16533e72fe
2016-01-06 13:15:32 -08:00
Ben Kwa
f01d85c353 Merge "Reinstate mime icons on grid tiles." 2016-01-06 21:13:29 +00:00
Wale Ogunwale
b429e6826d Improved output for 'dumpsys window displays'
New format makes it easier to parse during CTS testing.

Bug: 19225708
Change-Id: Ia9a75ca92b6c10eefcb07cabea9852e514807b08
2016-01-06 13:01:29 -08:00
Jeff Sharkey
2a90f673f5 Update logic for resolving verifiers.
Verifiers or installers may not be encryption-aware, or the user may
have disabled them, so we probe pretty deeply during system boot to
resolve them.  Use the new MATCH_SYSTEM_ONLY flag to limit results to
packages on the system image.

When there are multiple matches, pick the one with highest priority
instead of crashing the system.

Switch to updated MATCH_ constants in more places.

Bug: 26250295
Change-Id: Ia7a3b1fb74da6c3b9d2c2edbf1deaa9fb52fc40a
2016-01-06 13:49:55 -07:00
Alan Viverette
946502f50a Merge "Cache XML blocks against file name rather than resource ID" 2016-01-06 20:36:05 +00:00
Tyler Gunn
5096151b99 [DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
am: ae85bc3c65  -s ours

* commit 'ae85bc3c65b33b8b00b610246e41e282d16605b9':
  [DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
2016-01-06 20:31:00 +00:00
Alan Viverette
b7e3363359 Merge "Clean up asset manager package-private methods" 2016-01-06 20:29:49 +00:00
Alan Viverette
ec76b2a1d8 Merge "Skip the cache when loading drawables from a foreign density" 2016-01-06 20:29:19 +00:00
Alan Viverette
1097961389 Cache XML blocks against file name rather than resource ID
Caching against resource ID leads to incorrect cache hits, since multiple
files (ex. within drawable-mdpi, drawable-ldpi) may map to the same ID.

Also adds nullability annotations.

Bug: 26400880
Change-Id: I4d83caf3c44dc9b546511753e9e72171e8850eb2
2016-01-06 15:27:35 -05:00
Wale Ogunwale
acfcddcda2 Merge "[WindowManagerService] fix starting window issue" am: 8683f1b160
am: a7582b55e7  -s ours

* commit 'a7582b55e789f76fa18364950a93193ba7c0b2dd':
  [WindowManagerService] fix starting window issue
2016-01-06 20:27:04 +00:00
Ben Kwa
91430f1adf Reinstate mime icons on grid tiles.
- Add code to restore the mime icon on grid tiles (previously removed
  while tile layouts were being worked on).

- Switch mime icons from pngs to vector drawables.

BUG=24326989

Change-Id: I38b54256c6eca79052decadb6d138f658d03b951
2016-01-06 12:15:49 -08:00
Adam Lesinski
393b5f0d61 AAPT2: Port AAPT pseudolocalization to AAPT2
Pseudolocalization happens at the compile phase. Pseudolocalized
values are weak, such that manually specified values will take precedence.

Change-Id: I5e064ce0d270c9f4f9022f75aecedab9d45bc980
2016-01-06 12:05:41 -08:00
Rob Carr
f1cc31f6a5 Merge "More logging for ANR track-down" 2016-01-06 19:36:13 +00:00
Fyodor Kupolov
28b939c538 Merge "Collect user creation metrics" 2016-01-06 19:10:19 +00:00
Aurimas Liutikas
3a70807125 Merge "Change fragment removal order for fragment replacement." 2016-01-06 19:05:36 +00:00
Robert Carr
fbfd7f90cf More logging for ANR track-down
More logging for ANR track-down. Seems to relate
to starting windows hanging around during app
transitions.

Bug: 26157153
Change-Id: Ie88d0c97f11bbc6fae029cf28b07b329188e5f86
2016-01-06 11:01:43 -08:00
Ronnie Leng
abc2180090 [WindowManagerService] fix starting window issue
Symptom:
1. Acitivity A and B belong to same task.
2. A is started and start B in its code
3. B is opened with blank screen

If starting icon has been display, both startingWindow and
startingView should not be null.
Current logic only uses judgement on startWindow. In above
case, it leads startingView set to null as A and B shares
the same starting window due to same task. Then system will
not get chance to remove startingView as it is null.

It needs add judgement on startingView.

Based on https://android-review.googlesource.com/#/c/194370/

Change-Id: I6cfa1a3ebce93ce435cc2d9ada239b1e808988de
2016-01-06 10:47:00 -08:00
Chris Craik
7ee860c416 Merge "Add missing @deprecated comments to canvas methods" 2016-01-06 18:32:50 +00:00
Felipe Leme
6d6f0a1c97 Merge "Fixed corner-case scenario where a screenshot is finished after the share notification is sent." 2016-01-06 18:28:38 +00:00