Commit Graph

36352 Commits

Author SHA1 Message Date
Chris Wren
70d5ed2692 Merge "use relative positioning for notification actions" into klp-dev 2014-03-07 15:08:29 +00:00
Narayan Kamath
27ad525c7e Inform libcore of time format pref. changes.
- Introduce a boolean extra for intent TIME_CHANGED that
  specifies if the user wants a 24 hour format or not.
- Have the ActivityManagerService inform running processes
  of changes to this preference.
- Add plumbing in ActivityThread to inform j.t.DateFormat

Change-Id: I05fafb903ae54e39c03a048b7a219dc5a93fd472
2014-03-07 13:48:04 +00:00
Jeff Brown
c969450acd am 840c8474: Merge "Add config_supportAutoRotation." into klp-modular-dev
* commit '840c84749a6066b436db4dc94c3e3929a8440575':
  Add config_supportAutoRotation.
2014-03-07 10:43:52 +00:00
Jeff Brown
840c84749a Merge "Add config_supportAutoRotation." into klp-modular-dev 2014-03-07 04:40:10 +00:00
Jeff Brown
bcdfc62ae3 Add config_supportAutoRotation.
On some products, it may not make sense to use the accelerometer
to perform auto-rotation.  In that case, the product's config.xml
framework resource overlay should set config_supportAutoRotation
to false.

Setting this to false also disables auto-rotation settings.

Bug: 13211999
Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
2014-03-06 19:57:59 -08:00
Dave Platt
9eca7f8fbc am 53c7608a: am a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '53c7608aefb0ed754394e571cac02e96ad6fcdb3':
  Finish fixing Zygote descriptor leakage problem
2014-03-07 02:29:30 +00:00
Paul Duffin
6b786e0012 am 75d67c6a: am d562a9b5: Merge "Improve Parcel\'s handling of non-primitive arrays"
* commit '75d67c6aa051392e711fde3b901a4f2c62f983db':
  Improve Parcel's handling of non-primitive arrays
2014-03-07 02:27:47 +00:00
Dianne Hackborn
c1349a9601 am 4ad93639: am 67754d93: Merge "Runtime resource overlay, iteration 2"
* commit '4ad93639d210297764db3ffcd870ff38464943de':
  Runtime resource overlay, iteration 2
2014-03-07 02:27:10 +00:00
Narayan Kamath
e898f14cd5 am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
  Use long for pointers in EmojiFactory and PdfDocument
2014-03-07 02:26:46 +00:00
Adam Powell
c9e5f540a9 Fix a bug where OnTouchListeners in action views could be removed
ActionMenuPresenter should only replace the touch listener when binding
a generated item view.

Bug 12470259

Change-Id: I8c4c6110065605225a20cb7ed872255282085661
2014-03-06 17:57:05 -08:00
Dianne Hackborn
cb15c7a83b More on issue #12031685 (DO NOT MERGE)
Integrate from master:

Fix issue #13065185: Frequent runtime restarts on launching...

..."Hill Climb Racing" app

A service is in use when it is in the restarting state.

Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8
2014-03-06 17:39:11 -08:00
Svetoslav
b28f87301f am 3cd04c99: am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '3cd04c99aca7d0c7d1a5edf8e0868c76b0725400':
  ProgressBar is important for accessibility by default.
2014-03-07 00:59:07 +00:00
Svetoslav
3cd04c99ac am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit 'd2a244f9767ee678d3971c9ad43a07100db4e8c9':
  ProgressBar is important for accessibility by default.
2014-03-07 00:47:17 +00:00
Svetoslav
d2a244f976 am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev
* commit '8cb232cb796718ad91e56672a2c8fdbf88633001':
  ProgressBar is important for accessibility by default.
2014-03-07 00:39:05 +00:00
Narayan Kamath
ad7c2c2d8d am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
  AArch64: Make AssetManager and related classes 64-bit compatible
2014-03-07 00:38:00 +00:00
Narayan Kamath
364d8180d5 am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly
2014-03-07 00:37:53 +00:00
Brian Carlstrom
ac3b177cc1 am 2cd0563c: am 3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '2cd0563cb8345747d3705d4f339a0800998767fe':
  frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
2014-03-07 00:37:27 +00:00
Svetoslav
8cb232cb79 Merge "ProgressBar is important for accessibility by default." into klp-dev 2014-03-07 00:37:14 +00:00
Jay Shrauner
1276295b6b am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE
* commit 'a3ea4be5425fc2a561290c08a9f5f31f374afc31':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
2014-03-07 00:00:14 +00:00
Narayan Kamath
5860f4f5f0 am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '70986e197bbaf4de4f8126519a75df2b057c3b52':
  AArch64: Use of long for pointers in PropertyValuesHolder
2014-03-06 22:58:13 +00:00
Jay Shrauner
a3ea4be542 Prevent SpellChecker from setting invalid range - DO NOT MERGE
Add check for invalid range before setting for further check
at end of parse() loop.

Bug:12936072
Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
(cherry picked from commit ea4adf2847)
2014-03-06 22:29:12 +00:00
Chris Wren
be63a95d2b use relative positioning for notification actions
Bug: 10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
2014-03-06 14:55:23 -05:00
Svetoslav
6a1846a084 ProgressBar is important for accessibility by default.
If a view does not have callbacks, or content description, or does not draw
content, and it is marked as important for accessibility auto, then the system
decides it is not important and does not report it. Apparently progress bar
draws content that means something and it should be important for accessibility
by default.

Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
(cherry picked from commit 7face75f2c)
2014-03-06 19:31:19 +00:00
Wei Wang
ee0b3e9f82 DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Add bluetooth adv data, APIs in BluetoothAdpater etc.

Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
	core/java/android/bluetooth/BluetoothGatt.java

Conflicts:
	core/java/android/bluetooth/BluetoothAdapter.java
2014-03-06 18:45:17 +00:00
Martijn Coenen
a43f7cb01e am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."
* commit '1507c18f87da9906337237d34184d6ac8f1afabd':
  NFC: getNdefMessage() should throw exception if no tag in field.
2014-03-06 15:54:40 +00:00
Martijn Coenen
29e55bef77 Merge "NFC: getNdefMessage() should throw exception if no tag in field." 2014-03-06 14:33:11 +00:00
Griff Hazen
47826bfa16 am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev
* commit 'c748341af5616e183303dbe3267627a7f08aea37':
  Add addExtras and getExtras to Notification.Builder.
2014-03-06 02:19:38 +00:00
Griff Hazen
c748341af5 Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev 2014-03-06 02:05:38 +00:00
Griff Hazen
720042b72f Add addExtras and getExtras to Notification.Builder.
addExtras allows merging with exiting set extras instead of replacing
them. This matches the similar function putExtras in Intent.

Both functions are useful for multi-stage notification building logic.

Change-Id: Ice3e4a53ec05b7129ebdac14e2084163946273a4
2014-03-05 18:00:57 -08:00
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
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
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
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
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 46a27efe95)
2014-03-05 22:37:34 +00:00
Chad Brubaker
18dd015e6e Add the calling package name to requestRouteToHost
The calling package name will be used to check if an application is a
system application when deciding if a route should be exempt from VPN
routing rules.

Bug: 12937545
Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405
2014-03-05 13:35:20 -08:00