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

222198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
46f92eafe6 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab 
am: 053f241cc7

* commit '053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:51:53 +00:00
Deepanshu Gupta
66840955d8 LayoutLib: IntelliJ changed project files. 
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 19:51:52 +00:00
Michael Wright
526c98cb7f Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 am: e2af036719 
am: cd00ba1a71

* commit 'cd00ba1a71bbb9edf92a0cc5def975be86207e4e':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:51:50 +00:00
Winson Chung
e73f6141c5 Merge "Fixing some Recents landscape issues." 2015-11-17 19:51:02 +00:00
Alan Viverette
3f7191962d Merge "Update the TimePicker hour format when toggling 24-hour mode" 2015-11-17 19:47:31 +00:00
Deepanshu Gupta
22931224d9 LayoutLib: IntelliJ changed project files. 
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
 2015-11-17 11:37:35 -08:00
Deepanshu Gupta
99b54b364b AppCompatActionBar: use findClass to test presence 
To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.

Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
 2015-11-17 11:34:32 -08:00
Colin Cross
5603eca33c Merge "Vibra: Add loading of the vibrator hardware module." 2015-11-17 19:31:19 +00:00
Winson
a2236f11c6 Fixing some Recents landscape issues. 
- Tasks were drawing under the navigation in landscape since we did 
  not account for the nav bar space
- Fixing issue with tiny tasks in landscape
- Fixing issue where pooled views were not being measured or laid out
  after resizing.
- Fixing issue where the stack scroll would have out of bounds when 
  tasks were resized (we animate them into bounds)

Change-Id: Id301dc6891e7ff2692cb040a7df1a5a854ac84a3
 2015-11-17 19:30:23 +00:00
Winson
c742f973b1 Adding tuner param to enable fast-toggling. 
- Moving constants to a more explicit flags class, which also handles
  tuner changes.
- Removing some unused flags

Change-Id: If370581d431784f606c4b8d0c0face5b9a4b9fad
 2015-11-17 19:26:46 +00:00
Michael Wright
cd00ba1a71 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 
am: e2af036719

* commit 'e2af0367193332e340a759eae7dc37c5342fbc01':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:14:01 +00:00
Dianne Hackborn
8958c1effb Merge "Initial stab at background check." 2015-11-17 19:13:32 +00:00
Svetoslav Ganov
fc1a1bad33 Merge "Don't grant runtime permissions on install to legacy apps" 2015-11-17 19:08:34 +00:00
Michael Wright
e2af036719 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab 
am: 053f241cc7

* commit '053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:05:20 +00:00
Chad Brubaker
d2347a89fb Merge "Dedupe trust anchors" am: 690b5f6c0a 
am: e2caaea951

* commit 'e2caaea951e62a21bb1d30450e8085f3286ea538':
  Dedupe trust anchors
 2015-11-17 19:05:17 +00:00
Chad Brubaker
e2caaea951 Merge "Dedupe trust anchors" 
am: 690b5f6c0a

* commit '690b5f6c0a0820411d72235b11f75e1c87b24031':
  Dedupe trust anchors
 2015-11-17 18:57:06 +00:00
Michael Wright
053f241cc7 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 
am: c73255d8ab

* commit 'c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:57:03 +00:00
Chad Brubaker
690b5f6c0a Merge "Dedupe trust anchors" 2015-11-17 18:51:38 +00:00
Michael Wright
c73255d8ab Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 
am: 313c7b2ee0

* commit '313c7b2ee07ea74ac184294e4a6133a813bfcabf':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:49:32 +00:00
Wale Ogunwale
0d7e912b00 Moved management of NonClientDecorView from PhoneWindow to DecorView 
Bug: 24810450
Change-Id: I682afe1b15cb8ec1f98b38b88a499243d4c6c8a3
 2015-11-17 10:45:06 -08:00
Michael Wright
313c7b2ee0 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 
am: 4aa1e48a71

* commit '4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:40:21 +00:00
Michael Wright
4aa1e48a71 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 2015-11-17 18:33:38 +00:00
Alan Treadway
0e563f00b5 Merge "Fix edge-cases for split-user provisioning cases." 2015-11-17 18:32:42 +00:00
Filip Gruszczynski
198b6dcca4 Merge "Synchronize recents to freeform transition." 2015-11-17 18:19:15 +00:00
Svet Ganov
505184bf45 Don't grant runtime permissions on install to legacy apps 
bug:25329324

Change-Id: Ia020b96eaef8895f0c2a13bddacfa7a053c56d32
 2015-11-17 18:17:14 +00:00
Mitchell Wills
48241ddc58 Merge "Expose gscan exponential backoff API" 2015-11-17 18:05:58 +00:00
Filip Gruszczynski
1a4dfe593a Synchronize recents to freeform transition. 
Recents to freeform animation must hang on the first frame and inform
Recents to hide its views. This mirrors the transition from freeform
to Recents, where the animation needs to hang on the last frame.

We need a special window flag for recents to force a redraw after the
animation launches. At this point Recents will become not visible
from the perspective of the activity manager, which would prevent
further drawing. We make recents ignore that and instead depend on
window visibility which will change after recents exit animation
finishes.

Bug: 24913782
Change-Id: Ief743b7e6fcebb3d8789d4745fb122ac607c1cf0
 2015-11-17 10:03:19 -08:00
Alan Treadway
0c9ce28c12 Fix edge-cases for split-user provisioning cases. 
Split-user systems will allow for combinations of management modes,
specifically managed-{user,profile} on systems with a device-owner.

Bug: 25671630
Bug: 25680065
Change-Id: I5716f55eb6c8318129b4614adc22897d53901bee
 2015-11-17 17:41:41 +00:00
Wale Ogunwale
ff814adfdd Merge "Move DecorView out of PhoneWindow into its own class file." 2015-11-17 17:35:34 +00:00
Wale Ogunwale
8804af2b63 Move DecorView out of PhoneWindow into its own class file. 
Bug: 24810450
Change-Id: Ifa4e01517c80cec6d9a5b1051e5ccb7bab94a470
 2015-11-17 09:18:15 -08:00
Paul Stewart
734d399382 Merge "WifiEnterpriseConfiguration: Do not print credentials in toString" 2015-11-17 17:13:23 +00:00
Bryce Lee
cdde7c8868 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 am: e2861471b9 am: 52d93db91d 
am: 17ffebf8c8

* commit '17ffebf8c802ccc5ee6db36aad88e560297d6c33':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:41:39 +00:00
Bryce Lee
17ffebf8c8 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 am: e2861471b9 
am: 52d93db91d

* commit '52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:35:14 +00:00
Bryce Lee
52d93db91d Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 
am: e2861471b9

* commit 'e2861471b906d94b1211beeee824ae43b7e931c3':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:28:47 +00:00
Bryce Lee
4b60d12ef9 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 
am: 0fa22022a3

* commit '0fa22022a378db8de881af397b73d28b0939e5ff':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:22:02 +00:00
Bryce Lee
e2861471b9 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 
am: 0fa22022a3

* commit '0fa22022a378db8de881af397b73d28b0939e5ff':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:21:59 +00:00
Bryce Lee
0fa22022a3 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev 
am: cb8749c903

* commit 'cb8749c903d29fd04944550b5f34cc6120b69232':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:14:55 +00:00
Bryce Lee
cb8749c903 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev 2015-11-17 16:08:44 +00:00
Alan Viverette
214fb68767 APIs for querying and controlling display magnification 
Also separates magnification state and touch event handling. Moves
callbacks for window manager changes and display state changes into
the magnification controller.

Bug: 22718911
Change-Id: I3a8ba060a07d8f1f51856855a5f85601766fd45d
 2015-11-17 09:48:25 -05:00
Nicolas Geoffray
0283d44c08 Merge "Remove DEBUG_JIT from Zygote flags." 2015-11-17 12:26:01 +00:00
Daichi Hirono
26398b91be Merge "Start using MtpDatabase in DocumentLoader." 2015-11-17 06:47:45 +00:00
Daichi Hirono
47eb192b27 Start using MtpDatabase in DocumentLoader. 
BUG=25704514

Change-Id: I4d9247c148679ee7e40a1a03443e4c0299b1e44d
 2015-11-17 15:46:40 +09:00
Sungsoo Lim
c09818e0d8 Merge "Make TvContentRating.contains() public" 2015-11-17 06:35:16 +00:00
Filip Gruszczynski
1d21988fe1 Merge "Don't animate move triggered by resizing using dock divider." 2015-11-17 05:07:56 +00:00
Filip Gruszczynski
f52dd205b9 Don't animate move triggered by resizing using dock divider. 
Also includes some small, nice refactoring:
* move code that sets the move animation into WindowStateAnimator;
* a few fields can be made private in WindowStateAnimator this way;
* one boolean flag in WindowStateAnimator popped out as unused after
being privatized, so could be deleted.

Bug: 25690109
Change-Id: I8144114244892c4f27aff21455e8e76eddbd039f
 2015-11-16 21:05:37 -08:00
Joe LaPenna
078d47c01f Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours am: 7f0a1556ec -s ours am: dbe1804f58 -s ours am: 9cb81aa210 -s ours 
am: 6412751108  -s ours

* commit '6412751108070a3e591546d4bc6e660fea52b49f':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 04:02:41 +00:00
Sanket Padawe
cf92718bb9 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 am: 32a190bd78 am: 7bb34d7517 am: fc8f7cee01 
am: 5c63189f4a

* commit '5c63189f4a83c71d6c7a8e705e5560cb353e4b69':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 04:01:10 +00:00
Deepanshu Gupta
efc90e4f60 Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7 am: 9f275ec3fd 
am: d00380a560

* commit 'd00380a560dff6a2237086f2f4c96313785ce93f':
  WindowDecorActionBar name change fix.
 2015-11-17 03:59:41 +00:00
Michael Kwan
5aac37c114 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours am: f23229f45f -s ours am: b0aae584ea -s ours am: 2c8f3734af -s ours 
am: 03f62d7af2  -s ours

* commit '03f62d7af2cd6618ed775b4183fa5cb3a274e01d':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-17 03:58:01 +00:00
Rom Lemarchand
9c5ac7bf5b resolve merge conflicts of 152d353e87 to master. 
Change-Id: Ida54b932d0a077d6eaeb2418a6cbf58f96035fff
 2015-11-16 19:48:50 -08:00