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

124628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
eb17f6ab69 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-02 18:55:10 +00:00
Baligh Uddin
0a73f6f8b1 Import translations. DO NOT MERGE 
Change-Id: I1765b9912ea2356677a927edb34166ea5cab43d9
Auto-generated-cl: translation import
 2014-07-05 15:25:24 -07:00
Baligh Uddin
562d8cc7bc Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-02 18:55:10 +00:00
Baligh Uddin
4ff58ecbbd Import translations. DO NOT MERGE 
Change-Id: I1fd2ea26acb4d0e1c46c887c94d25e0ea1407e81
Auto-generated-cl: translation import
 2014-07-05 15:30:27 -07:00
Baligh Uddin
3d9659c680 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-02 18:50:12 +00:00
Baligh Uddin
6935fe40e7 Import translations. DO NOT MERGE 
Change-Id: Ic92e03292351a4163522907fd285ad41d4877039
Auto-generated-cl: translation import
 2014-07-05 15:18:31 -07:00
Baligh Uddin
b84a800c17 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-02 18:50:12 +00:00
Baligh Uddin
b65ac75ec2 Import translations. DO NOT MERGE 
Change-Id: I986812a228a7207cb203a4c0862d96dbd0f1e868
Auto-generated-cl: translation import
 2014-07-05 15:12:04 -07:00
Baligh Uddin
ed61958a25 am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e1ef888eac66c247710833746f7e8e2fc1f45c1b':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:10 +00:00
Baligh Uddin
0bd94e4b7a am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:06 +00:00
Baligh Uddin
066fb41fc7 am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'caaf4aed05163df62365d351e592083ba95102cd':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:02 +00:00
Narayan Kamath
dbbc070670 am e2840977: am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened." 
* commit 'e2840977d37e4d19425d448b54895536e43a2989':
  Fix native crashes when APKs can't be opened.
 2014-07-02 12:18:45 +00:00
Narayan Kamath
e2840977d3 am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened." 
* commit '6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
  Fix native crashes when APKs can't be opened.
 2014-07-02 12:12:18 +00:00
Narayan Kamath
a8dbd7b433 am 39e4f590: am f56399f6: Merge "Fall back to "tl" if "fil" is absent." 
* commit '39e4f590787246ce35b995c0c0ce37b676a05e0c':
  Fall back to "tl" if "fil" is absent.
 2014-07-02 10:09:45 +00:00
Narayan Kamath
39e4f59078 am f56399f6: Merge "Fall back to "tl" if "fil" is absent." 
* commit 'f56399f6ab492c8c32b7ff9a8deeb2547f17f6da':
  Fall back to "tl" if "fil" is absent.
 2014-07-02 10:00:09 +00:00
Narayan Kamath
4161316f25 am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker." 
* commit '94171212431a45346e40fd97bbe72422e71f04be':
  Fix broken assumptions in LocalePicker.
 2014-07-02 09:54:22 +00:00
Narayan Kamath
c61a7575eb am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries." 
* commit 'd62196cfeffe5e4d725b5388fca57a18c154a44b':
  Remove bogus 2 char limit for locales and countries.
 2014-07-02 09:51:54 +00:00
Narayan Kamath
9417121243 am 104da1e4: Merge "Fix broken assumptions in LocalePicker." 
* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.
 2014-07-02 08:49:08 +00:00
Narayan Kamath
d62196cfef am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries." 
* commit '3fa99ec77ee52164575375c7709923c94d9693a6':
  Remove bogus 2 char limit for locales and countries.
 2014-07-02 08:49:04 +00:00
Robert Ly
2e3b9d30d4 am 9b3bfb10: docs: updated expandedtext_combo 
* commit '9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
  docs: updated expandedtext_combo
 2014-07-02 00:22:10 +00:00
Robert Ly
9b3bfb1085 docs: updated expandedtext_combo 
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
 2014-07-01 17:03:40 -07:00
Robert Ly
024d08ec12 am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev 
* commit 'f077e7b719419271b5fd666c22b7d19177d6c325':
  docs: add more notification images
 2014-07-02 00:00:59 +00:00
Baligh Uddin
48f89343d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 23:33:37 +00:00
Baligh Uddin
e1ef888eac Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 23:17:33 +00:00
Baligh Uddin
caaf4aed05 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 23:17:33 +00:00
Brian Carlstrom
bd71bf1814 am 8922ddba: am a6e06889: Merge "Add profiler type options" 
* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options
 2014-07-01 22:37:18 +00:00
Brian Carlstrom
8922ddbab1 am a6e06889: Merge "Add profiler type options" 
* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options
 2014-07-01 22:32:01 +00:00
Chris Craik
86b55c52c7 Fix klp-modular-dev-plus-aosp build 
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
 2014-07-01 15:24:37 -07:00
Nick Kralevich
db32fb646d am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 
* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
  Allow different SELinux policies for third party apps.
 2014-07-01 21:16:14 +00:00
Nick Kralevich
d172419e9a am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 
* commit '9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
  Allow different SELinux policies for third party apps.
 2014-07-01 21:13:12 +00:00