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

199955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
333839d813 am 36748a43: am d648975f: am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an activity. 
* commit '36748a43ae0ab6eeb36f15a3576876a96573e510':
  Recompute focus stack if cleared while starting an activity.
 2015-06-09 23:27:54 +00:00
Luan Nguyen
a3bfa3908f am 7bfd2d9e: 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 '7bfd2d9e7487a5c68025d9abee00aa138e9702b4':
  docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs.
 2015-06-09 23:27:49 +00:00
Wale Ogunwale
a70c0d7aa1 am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev 
* commit 'd43ee1260e5cd9fb7cd56d38557b494bc475612f':
  Fixed issue with using wrong display id when creating context for displays
 2015-06-09 23:27:44 +00:00
John Reck
ecfa74e256 am 6fb3b3c9: am 8693fc6f: am 475c545f: Merge "Upload bitmaps in SkShader* safely" into mnc-dev 
* commit '6fb3b3c97221057d5758df7abc69362719adfc29':
  Upload bitmaps in SkShader* safely
 2015-06-09 23:23:27 +00:00
Jim Miller
142bd48866 am dfe46032: am 2fb726fe: am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit 'dfe46032e7f8dfb66f088a09142024b9e1e9c4a2':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 23:23:21 +00:00
Chris Craik
d55dee2018 am 64606735: am 57998147: am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '646067359634a7f2a6e42096b09329127c0dc225':
  Dont ignore layer paint alpha in software path
 2015-06-09 23:23:16 +00:00
Phil Burk
abc7a28e84 am c01a9a72: am bce8f4d9: am bcdf0dc1: Merge "MIDI docs: use getPorts()" into mnc-dev 
* commit 'c01a9a729429e038dac2499e72868fef5b7223f7':
  MIDI docs: use getPorts()
 2015-06-09 23:23:10 +00:00
Erik Kline
64d6ce8a66 Merge "initial revision of NetworkDiagnostics" into mnc-dev 2015-06-09 23:23:03 +00:00
Tyler Gunn
196ca8b14b am dbd0700f: am f9118d03: am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit 'dbd0700f8e35b3c4ece8320290cf01a6c3fb0946':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 23:23:02 +00:00
Xiyuan Xia
d880c4bc1e am c7a1d5d6: am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit 'c7a1d5d6e23f1cc0fbe2fb277395792cd6ee1657':
  Add setting for assistant
 2015-06-09 23:22:57 +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
Yao Chen
597ad3fb51 Copy lockTaskLaunchMode from target activity to its alias. 
Bug: 21675800
Change-Id: I518f71d57b0a113797fb3879b776cc7142351218
 2015-06-09 16:00:14 -07:00
John Reck
6fb3b3c972 am 8693fc6f: am 475c545f: Merge "Upload bitmaps in SkShader* safely" into mnc-dev 
* commit '8693fc6f6170305d1bb1959f6c99d270bf88af9f':
  Upload bitmaps in SkShader* safely
 2015-06-09 22:55:19 +00:00
Jim Miller
dfe46032e7 am 2fb726fe: am 31ed2044: Merge "Add documentation for possible AndroidKeyStore exceptions to authenticate() call" into mnc-dev 
* commit '2fb726fe203dd7b0e554ebc3f03593593793c3b6':
  Add documentation for possible AndroidKeyStore exceptions to authenticate() call
 2015-06-09 22:55:14 +00:00
Chris Craik
6460673596 am 57998147: am 751afe20: Merge "Dont ignore layer paint alpha in software path" into mnc-dev 
* commit '5799814745c2e98bf6a721b01dff019d022d4a78':
  Dont ignore layer paint alpha in software path
 2015-06-09 22:55:06 +00:00
Phil Burk
c01a9a7294 am bce8f4d9: am bcdf0dc1: Merge "MIDI docs: use getPorts()" into mnc-dev 
* commit 'bce8f4d9c1f8529eb4832873de6545800fd15f6f':
  MIDI docs: use getPorts()
 2015-06-09 22:55:00 +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
Tyler Gunn
dbd0700f8e am f9118d03: am 69c4e2c5: Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev 
* commit 'f9118d0347a2c6058de42f7ef09c595e83c34074':
  Remove use of STATE_AUDIO_ONLY in a comparison.
 2015-06-09 22:25:54 +00:00
Xiyuan Xia
c7a1d5d6e2 am 000d5339: am 12149b69: Merge "Add setting for assistant" into mnc-dev 
* commit '000d53395983774c0feb5da3f73719d9956678d7':
  Add setting for assistant
 2015-06-09 22:25:47 +00:00
Chris Craik
751afe2040 Merge "Dont ignore layer paint alpha in software path" into mnc-dev 2015-06-09 22:23:36 +00:00
Casper Bonde
56e46424fd am 63ddfba1: am 27850204: am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '63ddfba1eaad7f8eee8b7e31af5bbd79b542ad32':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 22:19:50 +00:00
James Cook
ad35855037 Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation 
They both need to be 56dp for the buttons to line up properly.

This ports If24608d9f8dbf912025967bf3adef13df105ddaa from
frameworks/support in lmp-mr1-ub-dev

Bug: 19317317
Change-Id: Ie1f77b8cfada45bb9f8b2d14e68c364ae4ebf579
 2015-06-09 15:16:44 -07: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
Casper Bonde
63ddfba1ea am 27850204: am 3b3d1fea: SAP: Make it possible to enforce a 16-digit pin code (4/5) 
* commit '278502040d77f1dfa4fe7f9f724095ba49fba218':
  SAP: Make it possible to enforce a 16-digit pin code (4/5)
 2015-06-09 22:05:09 +00: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
Tao Bao
f2a91ee148 Improve the reboot-to-recovery dialogs 
To address the UX comments, this CL modifies the dialogs when the
device is rebooted to install an update or to perform factory data
reset.

Bug: 20949086
(cherry picked from commit 81dce6631396012e8b722bbed6d003f584800ae1)
Change-Id: I6d0cbbbaf184806366c6581c1c2e7dbcc5d89a17
 2015-06-09 14:59:15 -07:00
Tao Bao
fa861429f7 Wait for uncrypt to finish before rebooting 
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. For larger packages, uncrypt may be
killed before it finishes the work after the timeout. Change to monitor
the uncrypt status and show the progress to user.

Needs matching changes in bootable/recovery/uncrypt, system/core and
external/sepolicy.

Also pick up the two NPE fixes in commits
9bb765448df43d41e0a3edb7de1d1641c9251c35 and
da3f63ffb87397943546a7c5c893ce98f2489df2.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 90237f7beb55dae79cdcba5271f96be778573737)
Change-Id: Ibf2fc80032967e5f6cda3cd469005dd29665c87c
 2015-06-09 14:58:13 -07:00
Winson Chung
5a8ba72de9 am 99eb2d70: am b89ed4b9: am 6f024937: Merge "Skip recents preloading when there is no task to animate to." into mnc-dev 
* commit '99eb2d7006c80bd150a367130ff8582e094f37e2':
  Skip recents preloading when there is no task to animate to.
 2015-06-09 21:54:08 +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