Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
319,461 Commits 3 Branches 0 Tags
2be3ba49733df585bcfbf63d3b299d15dbfb0f13
Commit Graph

8055 Commits

Author SHA1 Message Date
Steve Elliott
77c1f60801 DO NOT MERGE: Add configurable default setting for assistant componentname 
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.

Test: manual
Bug: 111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
 2018-10-19 20:11:08 +00:00
Alan Viverette
77edd5fabe Merge changes from topic "viewpager_state" into oc-dev 
* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version
 2018-03-09 18:43:02 +00:00
Android Build Merger (Role)
286944d5c9 [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 am: 3a295c1c7f 
Change-Id: I720535127956baa76dc6dbad42b9ec92a819916f
 2018-02-21 20:27:16 +00:00
Android Build Merger (Role)
3a295c1c7f [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e am: fa32631c63 
Change-Id: I1d42aa3bea943a1564741443fb7db3ec98583fe3
 2018-02-21 20:27:11 +00:00
Android Build Merger (Role)
fa32631c63 [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb am: e0b5c2d25e 
Change-Id: Ib60d63bcc8769f10a64753f7fccf07c103b35c09
 2018-02-21 20:27:06 +00:00
Android Build Merger (Role)
e0b5c2d25e [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 am: 71478241eb 
Change-Id: I5fb0625286289c43644612528d25fb3f90f6ec7b
 2018-02-21 20:27:01 +00:00
Android Build Merger (Role)
71478241eb [automerger] Verify last array's length in readFromParcel am: 3b8bc2e450 
Change-Id: If09aad1fa86dbc5c6223d06f67b81d45660ca2d3
 2018-02-21 20:26:56 +00:00
Fyodor Kupolov
3b8bc2e450 Verify last array's length in readFromParcel 
Length of the last array in readFromParcel should be the same as
value of mNextIndex.

Test: PoC app in the bug
Bug: 73252178
Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5
 2018-02-21 20:26:52 +00:00
Android Build Merger (Role)
705e28e26b [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 am: b3e984c412 
Change-Id: I5217e675455809ee18c9a0b06bb3b740d01c09f8
 2018-02-16 19:46:21 +00:00
Android Build Merger (Role)
b3e984c412 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df am: d04ccc6608 
Change-Id: I65d895c9ea8506227ad5ba7c77d44827b0cd80fe
 2018-02-16 19:46:15 +00:00
Android Build Merger (Role)
d04ccc6608 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c am: aebf5c06df 
Change-Id: Iedd1e0502ac237920b24cac81a2540cfcf4c8d87
 2018-02-16 19:46:09 +00:00
Android Build Merger (Role)
aebf5c06df [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 am: c42091667c 
Change-Id: Ia150bf95186b1a7acdec0d723d44f33040951f56
 2018-02-16 19:46:03 +00:00
Android Build Merger (Role)
c42091667c [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941 
Change-Id: Id69b35c6cc53b6cea1666d724813ae21634c0b4c
 2018-02-16 19:45:57 +00:00
Android Build Merger (Role)
bc42f76941 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 
Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93
 2018-02-16 19:45:41 +00:00
Android Build Merger (Role)
cb362192e8 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 
Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef
 2018-02-16 19:45:36 +00:00
Android Build Merger (Role)
fece305de0 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 
Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348
 2018-02-16 19:45:30 +00:00
Android Build Merger (Role)
4c24e4d831 [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 
Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8
 2018-02-16 19:45:24 +00:00
Alan Viverette
187964aca1 Update internal ViewPager's SavedState to match Support Library version 
Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes: 71992105
Test: manual
 2018-02-16 14:45:05 -05:00
Android Build Merger (Role)
bf1ecab901 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 am: 469065ccb7 
Change-Id: I9af74b6a8fd17dbc9c8c1edebc0db81a07d2e8dc
 2018-02-07 08:19:03 +00:00
Android Build Merger (Role)
469065ccb7 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 am: f097744926 
Change-Id: Ic3e36a94f5c7b3cf33b8c7972fc1bd254be9a31c
 2018-02-07 08:18:57 +00:00
Android Build Merger (Role)
f097744926 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 am: 4af59f1c97 
Change-Id: Ic3b71eb297425e9ff6d40c542aa67027317dffea
 2018-02-07 08:18:50 +00:00
Android Build Merger (Role)
4af59f1c97 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 am: ab36ba8483 
Change-Id: Ie3d39f4c402d3385f45aca01059f03ef4025855f
 2018-02-07 08:18:44 +00:00
Android Build Merger (Role)
ab36ba8483 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 am: b3012285e2 
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
 2018-02-07 08:18:37 +00:00
Android Build Merger (Role)
b3012285e2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f am: 4405b0ced2 
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
 2018-02-07 08:18:22 +00:00
Android Build Merger (Role)
4405b0ced2 [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f 
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
 2018-02-07 08:18:15 +00:00
Android Build Merger (Role)
83cb35453f [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d 
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
 2018-02-07 08:18:09 +00:00
Android Build Merger (Role)
0231bc4d6d [automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
 2018-02-07 08:18:02 +00:00
Rubin Xu
54813e9888 Fix VerifyCredentialResponse parcelling code 
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
 2018-02-07 08:17:06 +00:00
Michael Plass
02d802e71e DO NOT MERGE ANYWHERE: [AsyncChannel] Fix race in handling of sync result 
Bug: 62866191
Bug: 63074860
Bug: 65267749
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
(cherry picked from commit 9c1d56576e)
 2017-09-01 09:42:27 -07:00
Baligh Uddin
230c78cec5 DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" 
Bug: 64864568

This reverts commit fd35d7c0a2, reversing
changes made to 07a21754f4.
 2017-08-19 15:49:05 -07:00
Michael Plass
9c1d56576e [AsyncChannel] Fix race in handling of sync result 
Bug: 62866191
Bug: 63074860
Test: wifi unit tests
Change-Id: I1d59eb8d599de9d9041e0b9b7d731363675a40c9
(cherry picked from commit 56e46134d3)
 2017-07-26 21:44:31 +00:00
Andrew Solovay
9a1cdbd2a8 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev 
am: 040b774928

Change-Id: I62888852d4bec175188560748fb76bca70472af3
 2017-07-06 18:58:11 +00:00
Andrew Solovay
7bd357143e docs: Removing com.android.internal.* packages from Javadoc build 
Several com.android.internal packages were being included in the
Javadoc build, even though they have no public APIs. Added a
package.html with the @hide tag to each of those packages, to
exclude them from the doc build.

Updated doc is staged to: http://go/dac-stage/reference/ ; verified
that the packages are now *not* in
http://go/dac-stage/reference/packages.html , and that package
summary files are not being generated for those packages.

Test: make ds-docs
Bug: 63166900
Change-Id: I7f96abb3e57d005c290cce6eda58f9368159a34e
 2017-06-30 17:11:52 -07:00
Sujith Ramakrishnan
89f7afbf27 Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 
am: 564d0bf1be

Change-Id: Ibb1e4d6ab641f6f500e60967e611cd08e55abf60
 2017-06-29 18:59:05 +00:00
TreeHugger Robot
564d0bf1be Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 2017-06-29 18:50:08 +00:00
Sujith Ramakrishnan
0390fff82c Prevent unwanted keypress actions during TV Setup. 
- Prevent Search or long-press Home actions
      while TV setup is being completed based
      on flag TV_USER_SETUP_COMPLETE.

Test: Manual - Reset device, ran Setup, tried keys.
Test: Manual - Rebooted device after Setup, tried keys.

Bug: 62419382
Change-Id: Ic8fb0f10943ab7c39a7d9857f62e6ab292231b40
 2017-06-28 14:38:30 -07:00
Selim Cinek
0124a4f90c Merge "Fixed an issue in the contrast calculation" into oc-dev 
am: 9bf5c0c3e1

Change-Id: I0989afc46b82f5dad45ee3f2fa8c32ab55f9cb71
 2017-06-24 00:55:44 +00:00
Selim Cinek
9bf5c0c3e1 Merge "Fixed an issue in the contrast calculation" into oc-dev 2017-06-24 00:44:13 +00:00
Selim Cinek
4c80791919 Fixed an issue in the contrast calculation 
The parameters were passed the wrong way around.

Test: manual inspection
Fixes: 62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
 2017-06-23 17:29:50 -07:00
Michael Kwan
10efdc0abf Add isSmallBatteryDevice flag to ActivityManager. 
Bug: 37351903
Change-Id: I6fed08c35474b10987388070eafb7b16e6944638
(cherry picked from commit 15eb998e65)
 2017-06-22 00:12:23 +00:00
Vladislav Kaznacheev
dd469d171d Do not update currently open tooltip. 
Currently if View.setTooltipText is called while
the tooltip is being shown for that view, it will
update the displayed text. The tooltip then will
resize to wrap around the new text, but not change
its position. This looks confusing if the new text
is significantly shorter or longer.

Removing this functionality until proper
re-positioning is implemented.

Bug: 38491655
Test: android.view.cts.TooltipTest passes
Change-Id: I79689288185888854b992b89e19fe381d3ac50e4
 2017-06-16 11:31:23 -07:00
TreeHugger Robot
c041c7a34e Merge "Support associating with an already-paired device" into oc-dev 2017-06-14 00:03:53 +00:00
Wale Ogunwale
e1e0db8ca9 Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev 2017-06-12 23:51:19 +00:00
Eugene Susla
0c4a926626 Support associating with an already-paired device 
This is required for migration scenario, where device(s) are already
paired(and thus no longer discoverable) but didn't go through companion
flow.
This also fixes a bug with filtering by mac address, which is also relevant to
the use-case of associating a specific device

Test: Pair with a device first, and call associate with a filter with its MAC
address and single device requested. Ensure the device is found.
Ensure only that device is ever returned when filtering by MAC address.
Bug: 62487084
Change-Id: Ic7cc6affc0648ad85b15620e8c3aba4b9fc91aa1
 2017-06-12 16:21:51 -07:00
Vladislav Kaznacheev
d85915f786 Pass window token when creating a tooltip popup 
This allows using tooltips in System UI.

Bug: 62065980
Test: android.view.cts.TooltipTest passes
Change-Id: If0a76d0806aa92efa4be57204c4517242b0ebb99
 2017-06-12 12:10:49 -07:00
Vladislav Kaznacheev
7410170ddc Revert "Use a PopupWindow to show tooltips" 
This reverts commit 77e539775b.

Change-Id: Ic4054e0d507ce95ab93282d4da002dd804aeb26d
 2017-06-12 12:02:11 -07:00
Winson Chung
4a526c1245 Ensure that we use SF Vsync Choreographer for the PiP transition. 
- Move the bounds animation onto the animation thread
- Remove existing code referencing the old sf-vsync choreographer
- Add ability for ValueAnimator subclasses to reference a different
  AnimationHandler, which uses a different FrameCallbackProvider with the
  sf-vsync choreographer in the animations that require it
- Ensure that PiP touch events are batched and sent aligned with the
  sf-vsync
- Move GC onto its own thread to not block other BackgroundThread calls

Bug: 36371375
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: go/wm-smoke

Change-Id: I6a41b35a4e4d4d6dbea82c2673452825fe3ffa58
 2017-06-12 10:08:58 -07:00
Siyamed Sinir
bc626c6358 Merge "Force Autofill in FloatingToolbar overflow menu" into oc-dev 2017-06-09 20:58:36 +00:00
Lei Yu
883db32859 Merge changes from topic 'battery_smear_move' into oc-dev 
* changes:
  Batterystats logs smeared power model values
  Copy smearing method to BatteryStatsHelper
 2017-06-09 20:50:47 +00:00
Siyamed Sinir
484c2e2fbe Force Autofill in FloatingToolbar overflow menu 
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
bit CtsWidgetTestCases:android.widget.cts.EditTextTest

Bug: 62271937
Change-Id: Ib3447281f3bd1abc811a25fc55ad55e34e155bbb
 2017-06-08 17:16:26 -07:00