drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,110 Commits 1 Branch 0 Tags
Commit Graph

196110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
8aa14b59d3 am dbcf0a9e: Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 
* commit 'dbcf0a9e7d36545b73225ba2c164beb4b0ad9a06':
  ImageWallpaper: Atomically fetch display info
 2015-06-10 01:16:32 +00:00
Adrian Roos
dbcf0a9e7d Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev 2015-06-10 01:02:48 +00:00
Christopher Ferris
0a77826257 am 1a4b8288: Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 
* commit '1a4b8288ad525ec9e951010151e4ed91bd514043':
  Change wtf errors from ASSERT to ERROR.
 2015-06-10 00:38:44 +00:00
Stefan Kuhne
e6581b11a9 am 011c133e: Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 
* commit '011c133e3c98ccf95fe4626d30c739c5a35d986e':
  Dont create a dummy animation for a transferred animation
 2015-06-10 00:26:11 +00:00
Fyodor Kupolov
1f6cbb5d76 am c2ae0090: Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 
* commit 'c2ae0090d2f6b9f36b4027e79f0430d29853a193':
  Do not create profile if FEATURE_MANAGED_USERS is not available
 2015-06-10 00:26:07 +00:00
Christopher Ferris
1a4b8288ad Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev 2015-06-10 00:25:32 +00:00
Stefan Kuhne
011c133e3c Merge "Dont create a dummy animation for a transferred animation" into mnc-dev 2015-06-10 00:21:49 +00:00
Fyodor Kupolov
c2ae0090d2 Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into mnc-dev 2015-06-10 00:16:14 +00:00
Fyodor Kupolov
b615799504 Do not create profile if FEATURE_MANAGED_USERS is not available 
Bug: 21629701
Change-Id: Ia0f720eee0faa0d565701064a268948f6dea82e4
 2015-06-09 16:51:13 -07:00
Adrian Roos
9b9947de5d ImageWallpaper: Atomically fetch display info 
Previously we fetched rotation and dimens separately
which had the potential to cause inconsistencies.

Bug: 21440533
Change-Id: Ic537dbc01fc27af14124b1d97d4babafb6bc15f8
 2015-06-09 16:48:57 -07:00
Dianne Hackborn
549aacfe9a am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 
* commit '476695227393b6c35c6777754b0e3b6448ceb7d2':
  Fix issue #21621920: VI: need mechanism to get current request
 2015-06-09 23:47:23 +00:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Erik Kline
69b0dcab4f am 64d6ce8a: Merge "initial revision of NetworkDiagnostics" into mnc-dev 
* commit '64d6ce8a661fd63b90b4c9f3f7d400208cb2430a':
  initial revision of NetworkDiagnostics
 2015-06-09 23:32:50 +00:00
Erik Kline
64d6ce8a66 Merge "initial revision of NetworkDiagnostics" into mnc-dev 2015-06-09 23:23:03 +00:00
Robin Lee
9e46757d85 am 63cc6458: Merge "Switch over to updated VPN warning strings" into mnc-dev 
* commit '63cc6458ace9da6a064f254323fe493618a6c518':
  Switch over to updated VPN warning strings
 2015-06-09 23:21:27 +00:00
Filip Gruszczynski
24ebdf9c28 am 2bad67b1: am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '2bad67b16fbfbfa56081bfbd6a43c0b1793ce8a3':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:21:22 +00:00
Wale Ogunwale
36748a43ae am d648975f: am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit 'd648975f514dfbe694a905fabc554ed267b1bfb3':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 23:21:18 +00:00
Luan Nguyen
7bfd2d9e74 am e44643b1: am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit 'e44643b15cbe4a5ba9a77bbdcffba1622bd5a03d':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:21:12 +00:00
Wale Ogunwale
d43ee1260e am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit '2c4643dd802d18ca0088fa860076fe917c69335f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:13:54 +00:00
Robin Lee
63cc6458ac Merge "Switch over to updated VPN warning strings" into mnc-dev 2015-06-09 23:13:38 +00:00
Filip Gruszczynski
2bad67b16f am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." 
* commit '6974f22d1148f0140b4abc76cc58e6bd6ad7842a':
  Revert "Recompute focus stack if cleared while starting an activity."
 2015-06-09 23:10:32 +00:00
Wale Ogunwale
d648975f51 am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit '64b586e19f3cd4069d57424ddc21c5213c94a767':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 23:10:27 +00:00
Luan Nguyen
e44643b15c am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs 
* commit '33677f0c1050ae73447136ec3e88d1140a53da4b':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:10:21 +00:00
Wale Ogunwale
2c4643dd80 Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 2015-06-09 23:01:05 +00:00
John Reck
8693fc6f61 am 475c545f: Merge "Upload bitmaps in SkShader* safely" into mnc-dev 
* commit '475c545fa8ea0d87bc3704ae3c0bf73bb060dcb8':
  Upload bitmaps in SkShader* safely
 2015-06-09 22:39:27 +00:00
Jim Miller
2fb726fe20 am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit '31ed2044e2907954b32148c06b131d3069b1c8ca':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 22:39:22 +00:00
Wale Ogunwale
cac3dc636d Fixed issue with using wrong display id when creating context for displays 
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
 2015-06-09 15:35:02 -07:00
John Reck
475c545fa8 Merge "Upload bitmaps in SkShader* safely" into mnc-dev 2015-06-09 22:32:33 +00:00
Chris Craik
5799814745 am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '751afe2040a1954826f550c0fdc2c1f148fe21eb':
  Dont ignore layer paint alpha in software path
 2015-06-09 22:28:59 +00:00
Phil Burk
bce8f4d9c1 am bcdf0dc1: Merge "MIDI docs: use getPorts()" into mnc-dev 
* commit 'bcdf0dc1992b97579c4d5e0822dd58c597bb45a5':
  MIDI docs: use getPorts()
 2015-06-09 22:28:54 +00:00
John Reck
37b0824a46 Upload bitmaps in SkShader* safely 
Bug: 19412589
Change-Id: Id50c08ff523d5540f60c39b435c0ab1b4c685655
 2015-06-09 15:27:52 -07:00
Jim Miller
31ed2044e2 Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 2015-06-09 22:27:40 +00:00
Jim Miller
e4c58e4641 Add documentation for possible AndroidKeyStore exceptions to authenticate() call 
Fixes bug 20864436

Change-Id: Ic3f7406a8a6f41283ccd63018787a20353510024
 2015-06-09 15:26:43 -07:00
Chris Craik
751afe2040 Merge "Dont ignore layer paint alpha in software path" into mnc-dev 2015-06-09 22:23:36 +00:00
Phil Burk
bcdf0dc199 Merge "MIDI docs: use getPorts()" into mnc-dev 2015-06-09 22:16:44 +00:00
Tyler Gunn
f9118d0347 am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit '69c4e2c57eb587709452d3319136da19db5e465b':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 22:14:08 +00:00
Xiyuan Xia
000d533959 am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit '12149b699e21a6c11285391c1fcef25a07fcf066':
  Add setting for assistant
 2015-06-09 22:14:03 +00:00
Stefan Kuhne
7dcf08c6b2 Dont create a dummy animation for a transferred animation 
When multiple windows get created at once, multiple starting windows
will be created as well. The first window will get an animation and a
dummy animation. If another window will get shown shortly after, it
will receive the animation of the first starting window. However, no
new dummy animation should be created for it since otherwise it might
never get an animation end notification.

This CL also reverts previously added changes to ignore dummy animations.

reverted change: Ie907d31f51e130e245a70249a983d490f3d42b21

Bug: 21643278
Bug: 21403998
Change-Id: I228d77a2d9c3597df0eb9c340a65c0c592c35ce6
 2015-06-09 12:10:58 -10:00
Tyler Gunn
69c4e2c57e Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 2015-06-09 22:04:10 +00:00
Xiyuan Xia
12149b699e Merge "Add setting for assistant" into mnc-dev 2015-06-09 22:00:32 +00:00
Casper Bonde
278502040d am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '3b3d1fea94318a4892fbd4353269749af417a81a':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 21:52:19 +00:00
Casper Bonde
3b3d1fea94 SAP: Make it possible to enforce a 16-digit pin code (4/5) 
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I3205013f9e758c353381442a86845dab467780f8
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-09 21:42:22 +00:00
Tyler Gunn
bc6f12ee42 Remove use of STATE_AUDIO_ONLY in a comparison. 
- Cleanup javadoc to make it more explicit how to use STATE_AUDIO_ONLY.
- Use VideoProfile.isAudioOnly() instead of doing == comparison.

Bug: 21645094
Change-Id: I5a67290a996f8f338aebab72a4d3cb57f1b1993b
 2015-06-09 14:34:11 -07:00
Winson Chung
b89ed4b980 am 6f024937: Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 
* commit '6f024937c11bd9e1ad0aa2ab9ae05e14eae5063a':
  Skip recents preloading when there is no task to animate to.
 2015-06-09 21:24:55 +00:00
Xiyuan Xia
e6de8b9ad4 Add setting for assistant 
- Add assistant setting in Settings.Secure;
- If the assistant setting is missing, start assistant as current behavior;
- If the setting is present, start assistant use the setting value;

Bug:20210110
Change-Id: I946fbb504452e445879ad688130a1570b857b9c5
 2015-06-09 14:21:38 -07:00
Winson Chung
6f024937c1 Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 2015-06-09 21:18:18 +00:00
Dianne Hackborn
a3acdb33df Fix issue #21621920: VI: need mechanism to get current request 
Add new APIs to associate a Request with a name, get all active
requests, and get active request by name.

Also add a new Activity.onProvideReferrer() which will allow
applications to propagate referrer information to the assistant
(and other apps they launch) in a consistent way.

Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
 2015-06-09 14:15:49 -07:00
Dianne Hackborn
1a18d087d7 am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 
* commit 'ea7438e4a698945b3e3a7786cff726c337291a68':
  Fix issue #21571700: Need to be smarter about how foreground...
 2015-06-09 21:12:33 +00:00
Paul Miller
057491d65d am 87a19e25: Merge "Deprecate WebView scrollbar overlay API" into mnc-dev 
* commit '87a19e25fe736a0fe92a0b4e8490136350519393':
  Deprecate WebView scrollbar overlay API
 2015-06-09 21:12:28 +00:00
Dianne Hackborn
ea7438e4a6 Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 2015-06-09 21:08:17 +00:00