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

314652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
900f022984 Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am: 59c124b755" into oc-dev-plus-aosp 2017-04-14 04:28:11 +00:00
Mady Mellor
65aed22863 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 
am: 59c124b755

Change-Id: I38781516da59f84f829699e2ef9c1db27e7578b6
 2017-04-14 04:27:08 +00:00
Android Build Merger (Role)
37933ae25b Merge "Check for non-null parent before delegating to it am: 3a74243ae4" into oc-dev-plus-aosp 2017-04-14 04:26:48 +00:00
Svet Ganov
162a93ca1c Check for non-null parent before delegating to it 
am: 3a74243ae4

Change-Id: I294345cde604bf61175297ceb5ab11d23dbf6eb7
 2017-04-14 04:26:02 +00:00
Rebecca Silberstein
01d3ad5cf2 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613 
am: 2f7a169618

Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
 2017-04-14 04:25:57 +00:00
Rebecca Silberstein
2f7a169618 Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 
am: 6fc5051613

Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
 2017-04-14 04:19:02 +00:00
Andreas Huber
71a840befa Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 
am: 9b2ed2b7c4

Change-Id: Ibc670da31571add92a312b7673be376be67f9072
 2017-04-14 04:17:37 +00:00
Roozbeh Pournader
b9e8d31eca Merge "Add Adlam font to fonts.xml" into oc-dev 
am: 1ad7ff32b1

Change-Id: Ic5244c47a1d31e75df484decc65195fd381bf8b5
 2017-04-14 04:14:25 +00:00
Yifan Hong
38bf613c0f Merge "Add Java API for libvintf." into oc-dev 
am: c223d70e64

Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
 2017-04-14 04:13:04 +00:00
Rebecca Silberstein
6fc5051613 Merge "Add a default SSID prefix for local only hotspot" 
am: e98a2942a4

Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
 2017-04-14 04:12:34 +00:00
Ta-wei Yen
63668e4396 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 
am: ad989b1711

Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
 2017-04-14 04:11:29 +00:00
Rebecca Silberstein
e98a2942a4 Merge "Add a default SSID prefix for local only hotspot" 2017-04-14 04:03:50 +00:00
TreeHugger Robot
59c124b755 Merge "Visual changes to PIP drag to dismiss UI" into oc-dev 2017-04-14 02:40:01 +00:00
Lorenzo Colitti
d6af00f5e4 resolve merge conflicts of 4db137b0599a to oc-dev-plus-aosp 
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
 2017-04-14 11:37:12 +09:00
Svet Ganov
3a74243ae4 Check for non-null parent before delegating to it 
Test: manual

bug:37289681

Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
 2017-04-14 02:31:53 +00:00
TreeHugger Robot
9b2ed2b7c4 Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev 2017-04-14 02:13:27 +00:00
TreeHugger Robot
1ad7ff32b1 Merge "Add Adlam font to fonts.xml" into oc-dev 2017-04-14 02:04:36 +00:00
TreeHugger Robot
c223d70e64 Merge "Add Java API for libvintf." into oc-dev 2017-04-14 02:02:08 +00:00
TreeHugger Robot
ad989b1711 Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev 2017-04-14 01:44:06 +00:00
Jorim Jaggi
054a99d029 Merge "Don't consider app as top app if alpha = 0" into oc-dev 
am: 4a2be133d4

Change-Id: Ibd7f89a49154bbf0bf89a5baa301e7912cf8db89
 2017-04-14 01:14:18 +00:00
Jesse Hall
e20f42b8a9 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev 
am: 8cafe5d9b4

Change-Id: I024b5cf450aa2832bdd2638bd83b6d5048b80a7f
 2017-04-14 01:10:49 +00:00
Adam Lesinski
48d5b68815 Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev 
am: b97d51a0d2

Change-Id: I25ee394a6950ca6cc85d66727847c32041a8a65b
 2017-04-14 01:09:40 +00:00
TreeHugger Robot
4db137b059 Merge "Connectivity metrics: add transports pretty printing" into oc-dev 2017-04-14 01:08:54 +00:00
Dianne Hackborn
9596d71664 Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev 
am: 676bd21542

Change-Id: I0e806e12b361b90eb4f349a7624d5f5ce4c91a9b
 2017-04-14 01:08:26 +00:00
Daniel Nishi
f110127aef Merge "Don't crash in background after app uninstall." into oc-dev 
am: 74037d1287

Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931
 2017-04-14 01:07:18 +00:00
TreeHugger Robot
4a2be133d4 Merge "Don't consider app as top app if alpha = 0" into oc-dev 2017-04-14 01:06:52 +00:00
Yifan Hong
becc56d7ea Add Java API for libvintf. 
android.os.VintfObject has two methods:

- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
          compatible.

Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Bug: 36814503

Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
 2017-04-13 18:04:05 -07:00
TreeHugger Robot
8cafe5d9b4 Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev 2017-04-14 01:00:46 +00:00
TreeHugger Robot
b97d51a0d2 Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev 2017-04-14 00:58:08 +00:00
Dianne Hackborn
676bd21542 Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev 2017-04-14 00:56:39 +00:00
Daniel Nishi
74037d1287 Merge "Don't crash in background after app uninstall." into oc-dev 2017-04-14 00:56:19 +00:00
Mady Mellor
b91efb8b36 Visual changes to PIP drag to dismiss UI 
Updated gradient asset, spacing, and added shadow to text

Test: Manual: have a PIP, move it around, observe drag to dismiss UI
Bug: 35358628
Change-Id: I8614468edfc14d0337d69184a7bbab5419f22ec3
 2017-04-13 17:20:15 -07:00
Jeff Tinker
a29ecc1a1c Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev 
am: 92fc8bdd51

Change-Id: I14d1dae73008df0244c1435c1ab634d573208d50
 2017-04-14 00:18:41 +00:00
TreeHugger Robot
92fc8bdd51 Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev 2017-04-14 00:09:42 +00:00
jiabin
4f499a0a17 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev 
am: 2ec7decaa5

Change-Id: Ic648086244bcc0df6b35cf8b8439d0bc200917d7
 2017-04-13 23:48:18 +00:00
Romain Guy
1f1667122a Merge "Range check transfer params in float domain" into oc-dev 
am: 819740cc73

Change-Id: I51c15e9a81e8af04c2a4061ed0ac3b98272c1c44
 2017-04-13 23:45:32 +00:00
TreeHugger Robot
2ec7decaa5 Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev 2017-04-13 23:39:13 +00:00
Romain Guy
819740cc73 Merge "Range check transfer params in float domain" into oc-dev 2017-04-13 23:35:27 +00:00
Peng Xu
70004dd19c Merge "Address review suggestions for sensor direct report related APIs" into oc-dev 
am: 5ebb159a92

Change-Id: I39838189ba70cd74e726d4332e1c2adfb5b269d6
 2017-04-13 23:33:43 +00:00
TreeHugger Robot
5ebb159a92 Merge "Address review suggestions for sensor direct report related APIs" into oc-dev 2017-04-13 23:24:42 +00:00
Makoto Onuki
efda6390c9 Merge "Actually remove the chooser APIs" into oc-dev 
am: fbadd6dac9

Change-Id: Ibb59269e2da0698ebc7140c08de8265059be8033
 2017-04-13 23:17:21 +00:00
Evan Rosky
d6072f2900 Merge "Improve rect-level focus ordering" into oc-dev 
am: 197052d6cb

Change-Id: I3e155776f9ccffb6f0a2d19b73ec73f0b8bf829b
 2017-04-13 23:14:53 +00:00
TreeHugger Robot
fbadd6dac9 Merge "Actually remove the chooser APIs" into oc-dev 2017-04-13 23:08:55 +00:00
Adam Lesinski
2fc8adc5fc Merge "AAPT2: Fix order-of-destruction crash" into oc-dev 
am: 62b713ed73

Change-Id: I1e32861bec801645e11e36663d57d3e36bf3f133
 2017-04-13 23:08:34 +00:00
Adam Lesinski
db091577ff AAPT2: Allow the ';' separator on Windows for split args 
Bug: 36870463
Test: manual (wine)
Change-Id: I8a38545a3cac9354b41858e1840b197b60925c03
 2017-04-13 16:07:35 -07:00
Evan Rosky
197052d6cb Merge "Improve rect-level focus ordering" into oc-dev 2017-04-13 23:06:18 +00:00
Roozbeh Pournader
d6e9a6028a Add Adlam font to fonts.xml 
Change-Id: If6b4b9138b9b761360cfdd3c1ba9659739af6402
Fixes: 37156487
Test: not needed
 2017-04-13 16:04:47 -07:00
Selim Cinek
f1f29ca50b Merge changes Icc9c36f7,I723474e2 into oc-dev 
am: 07525d4f25

Change-Id: I84d476d21e920fdd28e8e1f7c18d54d3eaf1e23b
 2017-04-13 23:02:41 +00:00
Adam Lesinski
62b713ed73 Merge "AAPT2: Fix order-of-destruction crash" into oc-dev 2017-04-13 22:54:02 +00:00
Jesse Hall
5d911fe6bb Allow disabling GL preload even if gfxdriver isn't updatable 
Bug: 34611670
Test: set ro.zygote.disable_gl_preload=1, shell start,
      confirm GL driver isn't loaded in zygote process
      by checking /proc/<pid>/maps

Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf
 2017-04-13 15:53:28 -07:00