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

143986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
b8e4e8e1f4 am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]
 2014-07-18 21:38:39 +00:00
Sailesh Nepal
9fd4ad318e am 0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 
* commit '0587043fcc353d7a9d374c346fa1445f2e57e6da':
  Use main thread for RemoteConnection callbacks
 2014-07-18 21:38:20 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:35:21 +00:00
Jean-Michel Trivi
a3ee6642d8 Unhide Virtualizer.getVirtualizationMode() 
Unhide Virtualizer.getVirtualizationMode() method.
Added note in javadoc about the returned value.
Declared exceptions that can be thrown by the checkStatus(int)
  helper function.

Change-Id: I4da82d1db1e39ca9dae489559bf1fb5de112c26a
 2014-07-18 21:34:39 +00:00
Jim Miller
c61c067042 am 0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev 
* commit '0f6db1e823a96d14ea831ec2bccc435dd321da28':
  Add DevicePolicyManager flag for fingerprint.
 2014-07-18 21:34:07 +00:00
Ye Wen
892d049fa5 am 2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev 
* commit '2c960085d2780d8c2fc66d6e3b0233ef6d1fbe42':
  Unhide MMS APIs for MSIM (1/2)
 2014-07-18 21:34:03 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE] 
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
 2014-07-18 21:31:26 +00:00
Dan Sandler
65d3c1ea3b am 5239e4d2: Don\'t crash if user profile bitmap is null. 
* commit '5239e4d2f5098cfb97b6f94c155e4aa4943f9d87':
  Don't crash if user profile bitmap is null.
 2014-07-18 21:24:59 +00:00
Jesse Hall
7f51706265 Add FEATURE_OPENGLES_EXTENSION_PACK_ES31A 
Bug: 15593761
Change-Id: Id1865cbf27c98a611cc6414fe47ee979c1d7cee2
 2014-07-18 14:24:36 -07:00
Robert Greenwalt
a58b59b08c am 721252c0: Quit NetworkMonitors at end of life. 
* commit '721252c084d74f0755b4f093fefa5ff13c6f896d':
  Quit NetworkMonitors at end of life.
 2014-07-18 21:20:34 +00:00
Dan Sandler
03dd983bad Don't crash if user profile bitmap is null. 
Bug: 16398850
Change-Id: Ie8ddb0841af255bbde098a213cb0ec1690d14c4c
 2014-07-18 21:18:52 +00:00
Robert Greenwalt
1fd9aeef08 Quit NetworkMonitors at end of life. 
We were creating and orphaning a thread for each network.
Cleanup after ourselves.

bug:16119890
Change-Id: I8c8a9fe471e43f31f712844915992084074e8047
 2014-07-18 21:14:04 +00:00
Makoto Onuki
a3d816886f am 38bfa1ba: Merge "Use "current" cp2 from telephony" into lmp-dev 
* commit '38bfa1ba0bedde690d6e3d8c8dd5ed4b91e1e647':
  Use "current" cp2 from telephony
 2014-07-18 21:03:41 +00:00
ztenghui
4be2d3d6d5 am f101ebb0: Fix FIT_XY scaleType issue on VectorDrawable 
* commit 'f101ebb0f4c88053a8b1ca2295b7a6afe8540127':
  Fix FIT_XY scaleType issue on VectorDrawable
 2014-07-18 20:45:07 +00:00
ztenghui
9d59a76dd0 Fix FIT_XY scaleType issue on VectorDrawable 
bug:16019658

Change-Id: I8b6ac23bf14de5427d3029436acf76bd1161f0ea
 2014-07-18 20:39:35 +00:00
ztenghui
2b8b2a84c9 am 22fd0f85: Fix caching in VectorDrawable to pass the CTS test 
* commit '22fd0f851e46cd8292553f96d93a7ebfaf537186':
  Fix caching in VectorDrawable to pass the CTS test
 2014-07-18 20:12:13 +00:00
ztenghui
670689af43 Fix caching in VectorDrawable to pass the CTS test 
bug:16380401

Change-Id: I573f4cc782707c6ef3484597ddc621a7a6353898
 2014-07-18 20:07:21 +00:00
Andrew Lee
056ef84d63 am 5ff4ea7c: am f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev 
* commit '5ff4ea7cc55dd46decb1f57753c4126e5d7ad24c':
  Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.
 2014-07-18 19:46:23 +00:00
Andrew Lee
bd463b2c25 am f72fa887: Merge "Add comments for RemoteCallVideoClient and RemoteCallVideoProvider." into lmp-dev 
* commit 'f72fa88707287317d42510090e927f212cdcbb23':
  Add comments for RemoteCallVideoClient and RemoteCallVideoProvider.
 2014-07-18 19:42:57 +00:00
Andre Eisenbach
49ddceef7e am 92adbade: am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit '92adbade49f741888b69691981e9367aef357b45':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:38:28 +00:00
Andre Eisenbach
8831dfe6ec am 99e79902: LE: Add connection parameter update request API (4/4) 
* commit '99e79902fbf036d2a69ce99ed4f4f51b62b419f3':
  LE: Add connection parameter update request API (4/4)
 2014-07-18 19:35:11 +00:00
Christopher Tate
4e6d105b0e am 0f5b9306: am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev 
* commit '0f5b9306328af0c476bb71eed78e63a65e0898ac':
  Tear down agents properly at EOD in full restore
 2014-07-18 19:23:09 +00:00
Christopher Tate
657439d52c am 74ec3d59: Merge "Tear down agents properly at EOD in full restore" into lmp-dev 
* commit '74ec3d599b4a2d7dcf0d723af0366af73b87eda0':
  Tear down agents properly at EOD in full restore
 2014-07-18 19:16:47 +00:00
Andre Eisenbach
6ce4db0acf LE: Add connection parameter update request API (4/4) 
Change-Id: Ifb531a1b7ab05888817b96fcc89f85e17df7ffe2
 2014-07-18 12:13:46 -07:00
Winson Chung
c489b66b4d am 4fb60be9: am 61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '4fb60be98d2e43bb4dc745321865c219aef96984':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-18 19:05:59 +00:00
Youngsang Cho
5bebd95959 am 2ec6fb80: am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev 
* commit '2ec6fb8085f78dceda26d1f1634f6e27b630166a':
  TIF: Add unblock content
 2014-07-18 19:00:10 +00:00
Youngsang Cho
e670d86ff9 am 7c8bbd53: am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 
* commit '7c8bbd53c6622248377794a7ea6289b1c952a2f6':
  TIF: Add onInputAdded and onInputRemoved
 2014-07-18 19:00:05 +00:00
Dan Sandler
cfa9259a62 am f9845011: am 7aabcfa3: Merge "Deprecate and stop generating tickerViews." into lmp-dev 
* commit 'f984501170f7449a38c6785675dd9f460f5bffa4':
  Deprecate and stop generating tickerViews.
 2014-07-18 18:59:38 +00:00
Dan Sandler
e9381b5e9b am e7dc5140: am 9b557a25: Merge "Actually show secret notifications sometimes." into lmp-dev 
* commit 'e7dc51401bb6a0341c34ccc4b5b04902f0ba997d':
  Actually show secret notifications sometimes.
 2014-07-18 18:59:31 +00:00
Brian Attwell
a683b2a29c am a08e00c7: am fa15c729: Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 
* commit 'a08e00c7026c6b093fc927a03c168d2ed3b11986':
  Mark social APIs stream APIs as deprecated
 2014-07-18 18:59:27 +00:00
Winson Chung
f1d15dd2ff am 61d52679: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug 16322100) 
* commit '61d5267986f21ae7b657d9ba1cf6bff9344aa6e1':
  Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100)
 2014-07-18 18:54:55 +00:00
Winson Chung
3e3365babd Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug 16322100) 2014-07-18 18:49:53 +00:00
Youngsang Cho
8cc5a4b0bb am e94cfccd: Merge "TIF: Add unblock content" into lmp-dev 
* commit 'e94cfccd48ac07ec718b280e7793623da46c61e9':
  TIF: Add unblock content
 2014-07-18 18:46:15 +00:00
Youngsang Cho
159b768b83 am c28a86ff: Merge "TIF: Add onInputAdded and onInputRemoved" into lmp-dev 
* commit 'c28a86ff8054bd5be6adaaff4a51609bcda76211':
  TIF: Add onInputAdded and onInputRemoved
 2014-07-18 18:46:11 +00:00
Jean-Michel Trivi
dfa871620c Merge "Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition" into lmp-dev 2014-07-18 18:24:25 +00:00
Jean-Michel Trivi
9b9d72fd11 Remove obsolete USAGE_NOTIFICATION_TELEPHONY_RINGTONE definition 
Bug 16401631

Change-Id: I522e7c7030a71b528a484d4d8ae517b4b09460bf
 2014-07-20 16:53:27 -07:00
Evan Charlton
e954426494 Merge "Rename PhoneAccountMetadata to PhoneAccount" into lmp-dev 2014-07-18 18:24:25 +00:00
Evan Charlton
8c8a062f52 Rename PhoneAccountMetadata to PhoneAccount 
Change-Id: I4597b14110c1cee7f637ec125b839852ef0f34c4
 2014-07-20 15:12:16 -07:00
Baligh Uddin
57103ba86d Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
a17d1d2733 Import translations. DO NOT MERGE 
Change-Id: I73983e44eec615f929d27351032fd1d532ee68a1
Auto-generated-cl: translation import
 2014-07-20 12:03:51 -07:00
Adam Powell
781104d874 Merge "Don't apply the ActionBar style to a Toolbar as a result of setActionBar" into lmp-dev 2014-07-18 18:24:25 +00:00
Adam Powell
2aa09a94dd Don't apply the ActionBar style to a Toolbar as a result of setActionBar 
While this is a convenient idea, it effectively means that any styling
directly applied to a Toolbar in a layout gets stomped by the
theme-global ActionBar style. Obey the more local, specific styling
from the Toolbar instead.

Change-Id: Ief6a7cb90052bdced87f1dc0925c1dfbc0df4792
 2014-07-19 16:01:12 -07:00
Baligh Uddin
cbaac81b70 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
4fc8c66cd4 Import translations. DO NOT MERGE 
Change-Id: I7b6175e9d105f252fd57427b2c15ec31905e6184
Auto-generated-cl: translation import
 2014-07-19 21:41:31 +00:00
Baligh Uddin
68cbf10b56 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00
Baligh Uddin
7bc83dc414 Import translations. DO NOT MERGE 
Change-Id: I179193c20f5362e2c1afb3ea15c623e63e15a688
Auto-generated-cl: translation import
 2014-07-19 21:41:49 +00:00
Baligh Uddin
6b1072e07a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-18 18:24:25 +00:00