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

119899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
1f762b3490 am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '9aa7c6e583ac18d6c338af8d478512c4ab5293b4':
  Revert Japanese special case fallback keys.
 2014-03-06 01:03:52 +00:00
Michael Wright
9aa7c6e583 am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'e4a7179278375f48171746ffe93ca4529a927ecb':
  Revert Japanese special case fallback keys.
 2014-03-06 01:00:43 +00:00
Jason Sams
24ea88a986 am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context." 
* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.
 2014-03-06 00:59:17 +00:00
Michael Wright
e4a7179278 am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.
 2014-03-06 00:56:59 +00:00
Jason Sams
9a9916b58f am 2383f220: Merge "Validate objects are from the correct context." 
* commit '2383f2200ab0c2dbd71708b5c1fb6af98db408fa':
  Validate objects are from the correct context.
 2014-03-05 16:56:02 -08:00
Michael Wright
4448f9d7ad am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.
 2014-03-06 00:53:22 +00:00
Jason Sams
2383f2200a Merge "Validate objects are from the correct context." 2014-03-06 00:50:24 +00:00
Michael Wright
c5dea68e98 Merge "Revert Japanese special case fallback keys." into klp-dev 2014-03-06 00:50:15 +00:00
Fabrice Di Meglio
db3e77825d am 71c3a3d9: am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '71c3a3d9474e1ce4210209bbd68055f3b780057d':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:42:36 +00:00
Fabrice Di Meglio
1eb5c0551f am cf33fe68: am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit 'cf33fe683d2cd9ea25fa83f5354c682a788ec074':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:42:33 +00:00
Fabrice Di Meglio
71c3a3d947 am 6c3a45d7: am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '6c3a45d7df0dc708e3981c79df32b5bb3fb1758a':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:38:57 +00:00
Fabrice Di Meglio
cf33fe683d am e1190a99: am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit 'e1190a994e7d86ae7ad6f4680b7cd58d50d4a770':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:38:52 +00:00
Fabrice Di Meglio
6c3a45d7df am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '57f8a4b4ed48ae3e2488bb3bafcd40137c71ec18':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:35:40 +00:00
Fabrice Di Meglio
e1190a994e am cb6dcd7a: am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit 'cb6dcd7af2d015b7a3d49f1224936241747bcb43':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:35:36 +00:00
Fabrice Di Meglio
57f8a4b4ed am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 
* commit '1ff2df6194148f487ccb014a7c5302fa8ffe2571':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
 2014-03-06 00:32:30 +00:00
Fabrice Di Meglio
cb6dcd7af2 am 2b58a29f: Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 
* commit '2b58a29f825e6442d8767a36adaf1770b86d5725':
  Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE
 2014-03-06 00:32:27 +00:00
Filip Gruszczyński
d54530e9ce am 1ae480a2: Merge changes I2104037d,I125c4a00 into klp-modular-dev 
* commit '1ae480a24deed18cb1ca95344995150f3a3f5c98':
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
 2014-03-06 00:30:17 +00:00
Fabrice Di Meglio
1ff2df6194 Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev 2014-03-06 00:29:35 +00:00
Fabrice Di Meglio
2b58a29f82 Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev 2014-03-06 00:29:20 +00:00
Filip Gruszczyński
1ae480a24d Merge changes I2104037d,I125c4a00 into klp-modular-dev 
* changes:
  Passing and using defStyle in ViewGroup initFromAttributes.
  Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork.
 2014-03-06 00:27:40 +00:00
Jason Sams
678cc7fe9f Validate objects are from the correct context. 
Change-Id: I7d87b0e253b8d2e36d1aed790cfe3a7dd23e158f
 2014-03-05 16:09:02 -08:00
David 'Digit' Turner
a05e752615 am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot." 
* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.
 2014-03-05 23:18:20 +00:00
Dianne Hackborn
75870cf391 am 75374879: am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '75374879938c1767b0266132672361487f2f58d4':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:17:40 +00:00
David 'Digit' Turner
9c6f41e3eb am be7b8f4f: Merge "aidl: Support building with updated host sysroot." 
* commit 'be7b8f4f4c62239ad20202e4bbe8120d5e3dcf82':
  aidl: Support building with updated host sysroot.
 2014-03-05 15:14:31 -08:00
Dianne Hackborn
7537487993 am ea391750: am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit 'ea391750fbf78b395b414147dba6426ad907431d':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:14:04 +00:00
Dianne Hackborn
ea391750fb am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '5e578e17f4392d1baf41772ab45347bc8bcccc38':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:11:07 +00:00
David 'Digit' Turner
be7b8f4f4c Merge "aidl: Support building with updated host sysroot." 2014-03-05 23:10:45 +00:00
Dianne Hackborn
5e578e17f4 am 40a26004: Issue #13308712: Add --checkin to package manager dump. 
* commit '40a26004810623f02546a31cb0ce49a0502bdff7':
  Issue #13308712: Add --checkin to package manager dump.
 2014-03-05 23:07:45 +00:00
David 'Digit' Turner
ea6d2197ba aidl: Support building with updated host sysroot. 
This patch fixes tools/aidl/Type.cpp to compile with
a more recent SDK host toolchain sysroot (that has not
been submitted yet).

The main issue is that the code uses ssize_t which is
defined in <sys/types.h>, but didn't include the header
directly.

Apparently, this no longer compiles when using the Ubuntu
10.04 libc6-dev headers (the current SDK toolchain is
based on Ubuntu 8.04), so perform an explicit include
to fix this.

NOTE: This doesn't break the Windows SDK build.

Change-Id: Idcacf8f8d1c606b39bf8aa75ab409aa0c2a3cd5a
 2014-03-05 23:57:46 +01:00
Svetoslav
8c6ed03c8f am 1caa092f: Allow click listener registration in NumberPicker. 
* commit '1caa092f94aaa4b9b7b382263dfd13581d92d2de':
  Allow click listener registration in NumberPicker.
 2014-03-05 22:55:58 +00:00
Filip Gruszczyński
c16ba8cda7 Passing and using defStyle in ViewGroup initFromAttributes. 
Change-Id: I2104037d6f701aa3a27bf09226aca171ec77495d
 2014-03-05 14:43:49 -08:00
Svetoslav
1caa092f94 Allow click listener registration in NumberPicker. 
NumberPicker is composed of three areas, increment, decrement, and value,
which take the entire space. Hence, adding a click listener was a no-op.
Clicking on the value brings up the IME but for devices with very small
screens a developer may want to override this default behavior to say
confirm the selection.

This change allows adding a click listener to NumberPicker to override the
behavior of clicking on the current value. This is applicable only to the
new look and feel of the NumberPicker, i.e. the holo themes. This change
is safe as previously setting a click listener had no effect.

bug:13287234

Change-Id: I34e12a2e2bd64344a4797153fa6c820001a4722e
(cherry picked from commit 46a27efe9528ac3c5b37726707844e7c868815ac)
 2014-03-05 22:37:34 +00:00
Robert Greenwalt
c1ca3bac5d am bf9eec4c: am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bf9eec4c3bbbacd0954d819c18709962a81338bf':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:17:24 +00:00
Christopher Tate
777b8a808e am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev 
* commit '422b2656741520448815b230f7c73ad67a4c4e95':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 22:17:21 +00:00
Robert Greenwalt
bf9eec4c3b am 1c8ba7e5: am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '1c8ba7e551274782f3f61b90807711a056cc9730':
  Only apply tcp buffer sizes for default net
 2014-03-05 22:14:46 +00:00
Filip Gruszczyński
b971b89c78 Set android:descendantFocusability to blocksDescendants for all NumberPicker in clockwork. 
Change-Id: I125c4a00f4061ef6756e719e7f6b9e5f4dd72d81
 2014-03-05 12:59:58 -08:00
Christopher Tate
422b265674 resolved conflicts for merge of c45ff35f to klp-modular-dev 
Change-Id: Id1799e49891dc72e2e9c55fd9f418ceee94a7875
 2014-03-05 12:28:04 -08:00
Brian Carlstrom
a258b4a9e8 am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 19:29:40 +00:00
Brian Carlstrom
485e3b4594 am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '5c126c3d1703d8bef9a55dcc01f1fabf17811f60':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-05 11:26:44 -08:00
Brian Carlstrom
5c126c3d17 Merge "Add dex2oat-flags plumbing to AndroidRuntime" 2014-03-05 19:23:48 +00:00
Dianne Hackborn
40a2600481 Issue #13308712: Add --checkin to package manager dump. 
Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233
 2014-03-05 11:00:54 -08:00
Fabrice Di Meglio
25d9ce4058 Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE 
- fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)

Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783
 2014-03-05 18:42:56 +00:00
Fabrice Di Meglio
b3670c54e6 Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE 
- force TextView internal layout recreation when its TextDirection is changed

Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
(cherry picked from commit 22228fec05129af9684f95d7a13aeff92144bd90)
 2014-03-05 18:41:36 +00:00
Robert Greenwalt
1c8ba7e551 am bad3a9e6: am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit 'bad3a9e66fb103ec96ea89ce9eff7270333d5926':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:31:18 +00:00
Robert Greenwalt
bad3a9e66f am 2d1e8c49: Merge "Only apply tcp buffer sizes for default net" into klp-dev 
* commit '2d1e8c49582fb91df0a05a778c228fc1cd89e026':
  Only apply tcp buffer sizes for default net
 2014-03-05 18:27:03 +00:00
Robert Greenwalt
2d1e8c4958 Merge "Only apply tcp buffer sizes for default net" into klp-dev 2014-03-05 18:23:56 +00:00
Christopher Tate
7a4e519eda am 8106dce7: am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit '8106dce705ba69d5bc0ccafa8e21068216f42a5f':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:05:31 +00:00
Christopher Tate
8106dce705 am a6c59158: am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'a6c59158761423551941f6ed338a117658e581ad':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 01:00:50 +00:00
Christopher Tate
c45ff35f21 am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev 
* commit '1efc6e52d65389463ad52c32df02d68493df0f48':
  Adapt to underlying changes in the PBKDF2 implementation
 2014-03-05 00:57:22 +00:00
Christopher Tate
a6c5915876 am f63ae644: am 1e995c76: Merge "Update PackageMonitor to recognize new \'replacing\' semantics" into klp-dev 
* commit 'f63ae644a80ef2d0bd7bfb448eebb19691e4b6ec':
  Update PackageMonitor to recognize new 'replacing' semantics
 2014-03-05 00:57:18 +00:00