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

181382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sailesh Nepal
1ed8561ac6 Update setNextPostDialWaitChar API 
This CL does the following:
  - make the API public
  - rename it from setNextPostDialWaitChar to setNextPostDialChar
  - remove reference to "wait" from the API documentation

BUG: 19216940, 19216942
Change-Id: Ic4c7f44a900fd79875318d8c565c3aacaa42b962
 2015-01-31 15:25:51 -08:00
Soonil Nagarkar
16bce33af6 Merge "Update Location.convert() javadocs to reflect their inconsistency with locales." 2015-01-30 21:29:38 +00:00
Zheng Fu
6e7c2c7ca5 Merge "Add backup_id column to raw_contacts, and hash_id column to data" 2015-01-30 21:16:52 +00:00
Elliott Hughes
39f273b92d Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-30 19:32:21 +00:00
Jason Monk
c4980829e5 am b5083a7d: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb automerge: d2f15ec 
* commit 'b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:32:01 +00:00
Jason Monk
6574cd8842 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb automerge: d2f15ec 
automerge: b5083a7

* commit 'b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:30:56 +00:00
Soonil Nagarkar
71f0cd45ef Update Location.convert() javadocs to reflect their inconsistency with locales. 
The Location.convert() methods do not invert each other as might be
expected. Changing this would introduce breaking changes, so I've
updated the javadocs to make this clearer.

Bug: 13280976
Change-Id: If4bd3c83d5fb67915450849ca471aabc27544dac
 2015-01-30 11:29:42 -08:00
Jason Monk
84183103f4 Fix expandSettingsPanel status bar call automerge: 3c68ca2 automerge: f388249 
automerge: 734219d

* commit '734219d9c22cbab2549d1d43d077e9e8e089730c':
  Fix expandSettingsPanel status bar call
 2015-01-30 19:29:31 +00:00
Jason Monk
b5083a7d54 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb 
automerge: d2f15ec

* commit 'd2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:27:06 +00:00
Jason Monk
734219d9c2 Fix expandSettingsPanel status bar call automerge: 3c68ca2 
automerge: f388249

* commit 'f38824928cf586124ffc6dc7a85c7f8603f77c5a':
  Fix expandSettingsPanel status bar call
 2015-01-30 19:25:20 +00:00
Fyodor Kupolov
babdb0dc36 Merge "Removed userHandle from setXXX methods" 2015-01-30 19:21:10 +00:00
RoboErik
ddce02f3b9 Merge "Move mute/unmute handling to adjust volume paths" 2015-01-30 18:55:10 +00:00
Alan Viverette
447590524a Merge "Add accessors for switch thumb and track tinting" 2015-01-30 18:53:14 +00:00
Chris Craik
d7328ae790 Merge "Refactor blending and texture gl state" 2015-01-30 18:53:01 +00:00
Chris Craik
44eb2c0086 Refactor blending and texture gl state 
Change-Id: Ia6b3c8b2afd3dfcee7f3ce401d846b789612054a
 2015-01-30 10:49:05 -08:00
Jason Monk
d2f15ecb08 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 
automerge: b2dd5cb

* commit 'b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 18:48:15 +00:00
Jason Monk
f38824928c Fix expandSettingsPanel status bar call 
automerge: 3c68ca2

* commit '3c68ca2feab6d3cd09c297ddc2e77af67694feec':
  Fix expandSettingsPanel status bar call
 2015-01-30 18:46:31 +00:00
Winson Chung
0e0b7310a8 Merge "Adding some debug controls to test multi-window." 2015-01-30 18:43:19 +00:00
Mike Lockwood
5569aa5011 Merge "MidiManager: minor Javadoc tweaks" 2015-01-30 18:33:02 +00:00
Jason Monk
b2dd5cb900 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 2015-01-30 18:27:53 +00:00
Derek Sollenberger
8bc2d056e1 Merge "Create proxy between Skia's SkCanvas and the framework Canvas." 2015-01-30 18:23:01 +00:00
Mike Lockwood
c9adb14afd Merge "MidiManager: fix output port close" 2015-01-30 18:19:49 +00:00
Chris Craik
de11d28710 Merge "Fix double create of Caches" 2015-01-30 18:15:07 +00:00
Mike Lockwood
a7e348eb4d MidiManager: minor Javadoc tweaks 
Change-Id: I8b8f93907b2f456267dee153122d46c6b6e25b80
 2015-01-30 10:14:23 -08:00
Alan Viverette
e7eee640f8 Add accessors for switch thumb and track tinting 
Bug: 19196145
Change-Id: I5c426bc8c624c75fd27faaf6e0cbef5a0594175a
 2015-01-30 10:05:24 -08:00
Alan Viverette
b59041595b Merge "Add transition support to PopupWindow" 2015-01-30 18:04:48 +00:00
Jason Monk
8ba572a327 Fix QS bluetooth tile accessibility issue 
Bluetooth tile was not announcing its state when the top half was
clicked.  This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information.  So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.

Bug: 19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
 2015-01-30 13:02:27 -05:00
Todd Kennedy
14dc3c900f Merge "Don't get extras from the Intent" 2015-01-30 17:59:19 +00:00
Derek Sollenberger
1db141f93c Create proxy between Skia's SkCanvas and the framework Canvas. 
This enables Picture.java to be replayed into HWUI in addition
to extending the Skia testing suite to HWUI.

Bug: 19011232
Change-Id: Id27ac03eec817b0784763e62ab8413a07b3b8cb2
 2015-01-30 12:56:37 -05:00
Chris Craik
ff5c8e8097 Fix double create of Caches 
bug:19208182
Change-Id: I91ac591cecc207da1b102013ca4985dd075cca80
 2015-01-30 09:46:18 -08:00
Todd Kennedy
aab56dbc1e Show stacks underneath a resized stack 
When a stack is resized, make sure any non-fullscreen stack beneath it
becomes visible. This may mean additional activities are resumed in the
process.

Bug: 19083171
Change-Id: I5e7a3f82d76932ea2b9dbf0324ea183c42ee5496
 2015-01-30 09:39:53 -08:00
Jason Monk
3c68ca2fea Fix expandSettingsPanel status bar call 
Use the same mechanism as the two finger gesture to get it to open
correctly.

Bug: 19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
 2015-01-30 12:10:15 -05:00
Lorenzo Colitti
728dace14d Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 automerge: 5b392ee 
automerge: a0057ad

* commit 'a0057ad69083dc09c0c853fd20119f5a9ea877d9':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 15:59:49 +00:00
Lorenzo Colitti
c519b8042f Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d automerge: 786deba 
automerge: b6088a8

* commit 'b6088a80b4c3309cd18f5eb46ecf0614af8339ec':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 15:58:39 +00:00
Lorenzo Colitti
a0057ad690 Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c565a56 
automerge: 5b392ee

* commit '5b392ee7584688d6929ca40760d0df2a12bd0b16':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 15:56:00 +00:00
Lorenzo Colitti
b6088a80b4 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: fba459d 
automerge: 786deba

* commit '786deba636618fcf530e42340b0e5d683c5af74c':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 15:54:45 +00:00
Baligh Uddin
50d23adfe2 Fix plurals variable to unblock Translations Pipeline. 
Bug: 19067882
 2015-01-30 07:09:16 -08:00
Derek Sollenberger
c4e4eef64a Merge "Rename Canvas::getSkCanvas to Canvas::asSkCanvas" 2015-01-30 14:25:24 +00:00
Leon Scroggins III
9a1eefe174 Merge "AvoidXferMode -> AvoidXfermode." 2015-01-30 14:12:27 +00:00
Leon Scroggins III
ed1ce37759 AvoidXferMode -> AvoidXfermode. 
When I moved this code here from external/skia, I accidentally changed
the lowercase 'm' to uppercase 'M'. Change back, to keep consistent
with SkXfermode and Xfermode.cpp.

Change-Id: I9694d29a22aaed7fcc8708f5962e3d2032297d08
 2015-01-30 09:05:11 -05:00
Leon Scroggins III
9bf106f156 Merge "Move SkAvoidXferMode into frameworks/base." 2015-01-30 13:55:23 +00:00
Leon Scroggins III
626647c3f6 Move SkAvoidXferMode into frameworks/base. 
We are removing it from Skia, so we need it here to support Android.

Add some small cleanups (remove comment that doesn't apply, convert
SK_OVERRIDE to override, remove 'virtual' keyword from methods with
'override' on them).

BUG:skbug.com/3329
Change-Id: I1f883082d6fb9d49b9c9ba9e1f50bd713eabf915
 2015-01-30 08:32:49 -05:00
Narayan Kamath
12ca74e2a0 Revert "Remove deprecated Telecom APIs" 
This reverts commit a7c9046973260aa71837410ffc8df8c296a2826f.

Change-Id: I66d3d961988ff8dd330c9482c070bfca055f6cb8
 2015-01-30 13:07:32 +00:00
Lorenzo Colitti
5b392ee758 Merge "Also include the domain when parceling StaticIpConfiguration." 
automerge: c565a56

* commit 'c565a5675ac33d97d5c1caed7a5629412997fb4a':
  Also include the domain when parceling StaticIpConfiguration.
 2015-01-30 12:15:39 +00:00
Lorenzo Colitti
786deba636 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 
automerge: fba459d

* commit 'fba459d3457a0cb61bcb657c9fafadf0ccea27a9':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
 2015-01-30 12:13:38 +00:00
Lorenzo Colitti
c565a5675a Merge "Also include the domain when parceling StaticIpConfiguration." 2015-01-30 07:07:49 +00:00
Lorenzo Colitti
fba459d345 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 2015-01-30 07:00:38 +00:00
Sailesh Nepal
a7c9046973 Remove deprecated Telecom APIs 
This APIs are no longer used and are safe to delete.

Bug: 18607657
Change-Id: I94dad196db9f8be544f05b12b7b71de124fc9328
 2015-01-30 06:18:48 +00:00
Alan Viverette
87d2169b74 am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 
automerge: c89cdf2

* commit 'c89cdf2ad435b3b5da16405a0eceb600e93b7a3e':
  Avoid bug in LinearLayout measurement
 2015-01-30 03:34:25 +00:00
Alan Viverette
c89cdf2ad4 am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 
* commit 'f607fa6b73019998588e613aa2ae8ee97958cee7':
  Avoid bug in LinearLayout measurement
 2015-01-30 03:32:33 +00:00