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

141620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
4430714771 Import translations. DO NOT MERGE 
Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import
 2014-07-05 14:00:41 -07:00
Baligh Uddin
add3fb664a Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
bc3bd6c3e4 Import translations. DO NOT MERGE 
Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import
 2014-07-05 14:10:06 -07:00
Narayan Kamath
2d067babdb am 29a9d27d: am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" 
* commit '29a9d27d3c9224a7709a41096d7a958c8177ac19':
  fix AudioTrack and AudioRecord JNI
 2014-07-04 09:23:55 +00:00
Narayan Kamath
0cf2e65dc0 am 5ae312fb: am 759e0d6a: Merge "Fix LocalePicker locale filtering." 
* commit '5ae312fb5b601d2c60e197f94c6a292700776140':
  Fix LocalePicker locale filtering.
 2014-07-04 09:22:57 +00:00
Narayan Kamath
29a9d27d3c am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" 
* commit '358a3f716850e96716b766c63d50d3425a4c9ed7':
  fix AudioTrack and AudioRecord JNI
 2014-07-04 08:49:02 +00:00
Narayan Kamath
5ae312fb5b am 759e0d6a: Merge "Fix LocalePicker locale filtering." 
* commit '759e0d6a7a258dbc34a38a7db320827eb9144487':
  Fix LocalePicker locale filtering.
 2014-07-04 08:48:58 +00:00
Narayan Kamath
501bb0a5e4 Merge "Fix issue when converting fil->tl." 2014-07-04 08:02:36 +00:00
Narayan Kamath
fec5106c8e Fix issue when converting fil->tl. 
We should call ResourceTable::getLocales directly,
and not AssetManager::getLocales. The latter will convert
"tl" to "fil" so we'll end up thinking we have resources
for "fil" when we don't really have any.

bug: 15873165

Change-Id: I9753e4608aaecede328a40ee1f3ee6b016d0dedc
 2014-07-07 09:51:01 +01:00
Narayan Kamath
759e0d6a7a Merge "Fix LocalePicker locale filtering." 2014-07-04 08:02:36 +00:00
Narayan Kamath
80b574199c Fix LocalePicker locale filtering. 
This was broken by commit b27c137087ee92674 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.

This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.

bug: 16038949

Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
 2014-07-03 13:31:42 +01:00
Brian Duff
51d70ce9b8 am c542745e: am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'c542745e23fe9d2e71c1f607d66f5570f585133d':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 09:43:56 +00:00
Brian Duff
c542745e23 am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 06:45:04 +00:00
Nick Kralevich
a347ece5a7 Merge "Fix typo in comment of FragmentTransaction" 2014-07-03 01:32:01 +00:00
Nick Kralevich
ce25948325 Merge "Added missing brace." 2014-07-03 01:32:01 +00:00
Nick Kralevich
a2e4ce2b7c Merge "Fix typo - issue 56671" 2014-07-03 01:32:01 +00:00
Nick Kralevich
8b333467fe Merge "fix trivial typo: s/meansure/measure" 2014-07-03 01:32:01 +00:00
Nick Kralevich
c9eff23b44 Merge "Fix typo in DevicePolicyManager documentation" 2014-07-03 01:32:01 +00:00
Nick Kralevich
eb822cecdb Merge "Typo fix in permission string" 2014-07-03 01:32:01 +00:00
Jason Sams
24bea6a3ef Resolve conflicts with AOSP. 
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
 2014-07-02 14:32:24 -07:00
Narayan Kamath
358a3f7168 Merge "fix AudioTrack and AudioRecord JNI" 2014-07-02 20:52:49 +00:00
Eric Laurent
90d0b9e1bb fix AudioTrack and AudioRecord JNI 
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.

(cherry picked from commit 9d02848e902d04417df616354db3a18c03e639b7)

Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
 2014-07-04 09:37:28 +01:00
Nick Kralevich
ca2df28678 Merge "Fix typo in the exception message." 2014-07-02 20:52:43 +00:00
Nick Kralevich
77491ac00c Merge "Correct typo in doc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
a6336747a4 Merge "Fix a copy/paste typo in ViewPropertyAnimator" 2014-07-02 20:52:43 +00:00
Nick Kralevich
63af727b4b Merge "Fix Issue 59989" 2014-07-02 20:52:43 +00:00
Nick Kralevich
b70888d455 Merge "Fix a typo in a javadoc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
42b74e231d Merge "Typo in method name: Clone" 2014-07-02 20:51:20 +00:00
Nick Kralevich
3b345a6f91 Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 2014-07-02 20:51:20 +00:00
Brian Duff
a6e9dd3f9a Merge "Fix a typo in NumberPicker javadoc." 2014-07-02 20:51:20 +00:00
Wonsik Kim
e8e61e0935 Merge "TIF: Let TvInputHal handle multiple streams" 2014-07-02 20:35:42 +00:00
Wonsik Kim
839ae5f460 TIF: Let TvInputHal handle multiple streams 
Bug: 15579918
Change-Id: Iad972c36d675fb99b5950bcecf5925e660272cb4
 2014-07-07 14:36:26 +09:00
Jinsuk Kim
fca826de37 Merge "Update HdmiControlService.deviceSelect()" 2014-07-02 20:35:42 +00:00
Jinsuk Kim
b38cd68b24 Update HdmiControlService.deviceSelect() 
The device selection action should have stopped if
TV's own power goes to standby in the middle. This CL
implements the right behavior.

Some TODO's about OSD banner were removed as they
can be handled in caller (TV app) when invoking the API
or upon receiving the callback based on the result. One
more callback result constant was added accordingly.

Bug: 15843137
Bug: 15844312
Bug: 15845651

Change-Id: Ib118fd6e80e9abdfb531e3f321d8db1c9cec45bd
 2014-07-07 16:03:40 +09:00
Jinsuk Kim
96aacd2a2c Merge "Remove the usage of TX_STATUS in HdmiControlService" 2014-07-02 20:35:42 +00:00
Jinsuk Kim
cae6627702 Obtain TV power status correctly in HdmiControlService 
Bug: 15845654

Change-Id: I28b97e7ecb462b4fbaf6ac573e4d0fc9fcf724da
 2014-07-04 05:00:48 +00:00
Jinsuk Kim
5344cd98e6 Launch routing control in HdmiControlService at boot up 
Change-Id: I918c2a0da26a7cda20ee703dfeeacae276ec8373
 2014-07-04 13:57:17 +09:00
Jinsuk Kim
ba147582b1 Remove the usage of TX_STATUS in HdmiControlService 
Reflects the change to come in CEC HAL

Change-Id: I3a64e19bbdd8067855911ef11653fe64049b8880
 2014-07-03 08:26:44 +00:00
Sailesh Nepal
2bed9563ed Remove handoff APIs 
This CL removes the old handoff APIs and renames
handoffCall() to phoneAccountClicked().

Change-Id: Iab1595faaadcdfe428d97891d314babea21e9633
 2014-07-02 21:33:21 -07:00
Jungshik Jang
bfc857b2d2 Merge "Fix send key action bug." 2014-07-02 20:35:42 +00:00
Jungshik Jang
18563b1e97 Fix send key action bug. 
Change-Id: Ia6d552cda91db02847e5c0334274258df936bf64
 2014-07-07 10:39:44 +09:00
Jungshik Jang
a1a086a2fe Fix bug on SendKeyAction 
Change-Id: I7815986bda39dcc828b1da5cfdb64e0669fe4a49
 2014-07-07 09:30:58 +09:00
Jinsuk Kim
a0a999d8d7 Merge "Fix a bug in KeyAction in HdmiControlService" 2014-07-02 20:35:42 +00:00
Jinsuk Kim
708b974f0a Fix a bug in KeyAction in HdmiControlService 
Send KeyDown command for a new non-repeatable key press event

Change-Id: Ide25709f0954ecc7e8c15ae3e0f715b05e7cbf6f
 2014-07-07 09:06:41 +09:00
Robert Ly
993a3e4977 am 048d1076: am 8f0f930d: Merge "Fix incorrect link in Android Wear documentation." into klp-modular-dev 
* commit '048d1076aeb96adea969ad95996d3df931557241':
  Fix incorrect link in Android Wear documentation.
 2014-07-06 22:35:44 +00:00
Baligh Uddin
bd66e55b10 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:06:33 +00:00
Baligh Uddin
2e2090c5a2 am b33e23ea: (-s ours) am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b33e23ead7e9b9a1327168ffcca48a3cbe668398':
  Import translations. DO NOT MERGE
 2014-07-06 19:56:15 +00:00
Baligh Uddin
f4bf64bd2f am 660630f2: (-s ours) am 11281de7: (-s ours) am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '660630f24251d62d13d13ce0301f5d2762414833':
  Import translations. DO NOT MERGE
 2014-07-06 19:56:09 +00:00
Baligh Uddin
442dbe962e Import translations. DO NOT MERGE 
Change-Id: I05f000d23e0e1e8d32c1d00e024c8d67b0a684f8
Auto-generated-cl: translation import
 2014-07-06 04:48:17 -07:00
Baligh Uddin
c8bd930ef7 Merge "Import translations. DO NOT MERGE" 2014-07-05 02:59:43 +00:00