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

120624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
9f97ac433a ExifInterface: fix class load failure 
libexif_jni was renamed as libjhead_jni

b/12203995
Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556
 2014-03-06 16:54:05 -08:00
Jay Shrauner
2876797cfb am 4395a082: am d96e021a: am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE 
* commit '4395a082d21ac5b05b89100dac9eef40fc244df5':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
 2014-03-07 00:50:27 +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
Marco Nelissen
e1af0bd858 am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
  libexif is now libjhead
 2014-03-07 00:47:02 +00:00
Jay Shrauner
4395a082d2 am d96e021a: am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE 
* commit 'd96e021a9ef03b4bbcf061723e303805919ae35c':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
 2014-03-07 00:45:06 +00:00
Jay Shrauner
d96e021a9e am 1276295b: (-s ours) am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE 
* commit '1276295b6b157b583480fbdf2be72b9bc0fb1c54':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
 2014-03-07 00:39:49 +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
Marco Nelissen
4f36104f06 am e29c96e7: Merge "libexif is now libjhead" into klp-dev 
* commit 'e29c96e7ae96f3b94937ea86ffcc0d4d1e930248':
  libexif is now libjhead
 2014-03-07 00:38:48 +00:00
Svetoslav
8cb232cb79 Merge "ProgressBar is important for accessibility by default." into klp-dev 2014-03-07 00:37:14 +00:00
Marco Nelissen
e29c96e7ae Merge "libexif is now libjhead" into klp-dev 2014-03-07 00:34:36 +00:00
Will Haldean Brown
434901078f Fix Theme.Micro to not request ActionBar. 
This led to a crash for apps that use Theme.DeviceDefault, because it
requests both actionbar and swipe-to-dismiss.

Bug: 13348329
Change-Id: Iabc95600b19d842d02df4e92ab32327328f99be5
 2014-03-06 16:17:38 -08:00
Marco Nelissen
c0786cc258 libexif is now libjhead 
b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
 2014-03-06 16:00:35 -08: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
Leon Scroggins III
5a2c6a2110 am 6f71894b: am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '6f71894b8c7f24c00f8963d3508afbd18f3f0910':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 22:56:33 +00:00
Leon Scroggins III
6f71894b8c am a4d7259c: am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit 'a4d7259c8246a07666f732b5e9fd12280b611d2e':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 22:45:26 +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 ea4adf28474d949c51518a5abe6dbd3a3529cf29)
 2014-03-06 22:29:12 +00:00
Takahiro Aizawa
092759f6b4 EGL14.eglCreateWindowSurface should set producerControlledByApp 
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

Bug 13226025
(cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)

Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a
 2014-03-06 14:18:44 -08:00
Leon Scroggins III
a4d7259c82 am 87e9e744: (-s ours) am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 22:09:41 +00:00
Leon Scroggins III
9d3f94b99b am 86176afd: am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '86176afdeac9133b3b0caf2753a252167d1dad76':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 22:09:33 +00:00
Eric Laurent
33ac1218b9 am 6c506aac: am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '6c506aacb2015fd23487a4aa48cbb276ad40cc3a':
  Fix RemoteController synchronization mode
 2014-03-06 22:09:27 +00:00
Dianne Hackborn
ece7042d7d am 01579953: am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '01579953331b415c2ad1f04f91815d1f6eabe1e2':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 22:09:23 +00:00
Santos Cordon
056d9ee45a am 61e385ac: am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '61e385acf0e2c2296baf593b56ca3d4830bfaa02':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 22:09:20 +00:00
Leon Scroggins III
87e9e744ed am 92a32832: DO NOT MERGE - Fix Javadoc build break. 
* commit '92a3283286df3a6c2a27ecde8eddf23abbb87de9':
  DO NOT MERGE - Fix Javadoc build break.
 2014-03-06 21:31:31 +00:00
Leon Scroggins III
86176afdea am 337a2003: am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '337a200361482c046fb695f46b1052aa3c85db57':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 21:30:53 +00:00
Eric Laurent
6c506aacb2 am 3260f254: am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '3260f254459fab42fb23389088da0eb73e0e0969':
  Fix RemoteController synchronization mode
 2014-03-06 21:30:49 +00:00
Dianne Hackborn
0157995333 am 76e1d769: am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '76e1d76948c68f9414a9ca0271ea9dfb6da40191':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 21:30:47 +00:00
Santos Cordon
61e385acf0 am 59999040: am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '5999904094865f27febb7588f1a40b5561ef8d4b':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 21:30:45 +00:00
Filip Gruszczyński
311bc98362 am 2f1b6851: am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 
* commit '2f1b685154ef178a1e5932f252025a67aec9c1f1':
  Setting pretty large divider distance for NumberPicker in clockwork.
 2014-03-06 21:02:40 +00:00
Leon Scroggins III
92a3283286 DO NOT MERGE - Fix Javadoc build break. 
Remove links to non-specific function name.

Bug: 13246311

Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)
 2014-03-06 20:44:16 +00:00
Leon Scroggins III
337a200361 am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit '8d3281f5f7a880b996e50d291ebb7154a486eb6c':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 20:06:14 +00:00
Eric Laurent
3260f25445 am eac19754: am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit 'eac19754ca0822e4c1c50c436affbf5cbf7e08d3':
  Fix RemoteController synchronization mode
 2014-03-06 20:06:08 +00:00
Dianne Hackborn
76e1d76948 am 12caef78: (-s ours) am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '12caef7836a21fa20d052e4868df92e23b930cf6':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 20:06:05 +00:00
Santos Cordon
5999904094 am abbd963e: (-s ours) am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit 'abbd963e3c50f5241f9bf668b8b806c42a202621':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 20:06:02 +00:00
Baligh Uddin
3d207a2e57 am 7f2a7372: (-s ours) am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7f2a7372850cc812873b5466cf4cbe7afceb8873':
  Import translations. DO NOT MERGE
 2014-03-06 19:59:46 +00:00
Chris Wren
be63a95d2b use relative positioning for notification actions 
Bug: 10531101
Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d
 2014-03-06 14:55:23 -05:00
Filip Gruszczyński
2f1b685154 am fb71862d: Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 
* commit 'fb71862d31781581f3b6dbb043efb116f03876c8':
  Setting pretty large divider distance for NumberPicker in clockwork.
 2014-03-06 19:54:11 +00:00
Leon Scroggins III
8d3281f5f7 am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 
* commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c':
  Update framework to use M33 Skia. DO NOT MERGE
 2014-03-06 19:49:58 +00:00
Eric Laurent
eac19754ca am 617e715a: Merge "Fix RemoteController synchronization mode" into klp-dev 
* commit '617e715a40e2867c0b30d1bae38c20815ee30071':
  Fix RemoteController synchronization mode
 2014-03-06 19:49:55 +00:00
Dianne Hackborn
12caef7836 am 71ab245a: Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 
* commit '71ab245a0d7830791cb89ec9130313620a1ee029':
  Fix issue #11536426 DO NOT MERGE
 2014-03-06 19:49:52 +00:00
Santos Cordon
abbd963e3c am 4c8c27ed: Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE. 
* commit '4c8c27ed7360abe3cd91a281e40d4e21948abc2a':
  Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.
 2014-03-06 19:49:46 +00:00
Filip Gruszczyński
fb71862d31 Merge "Setting pretty large divider distance for NumberPicker in clockwork." into klp-modular-dev 2014-03-06 19:43:39 +00:00
Baligh Uddin
7f2a737285 am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c7a535c552f8853076ba104e7948f7c1d324d47a':
  Import translations. DO NOT MERGE
 2014-03-06 19:40:40 +00:00
Leon Scroggins III
ee008d4264 Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev 2014-03-06 19:37:28 +00: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 7face75f2c655a371a4dcdf6063886f92c637ce4)
 2014-03-06 19:31:19 +00:00
Eric Laurent
617e715a40 Merge "Fix RemoteController synchronization mode" into klp-dev 2014-03-06 19:21:26 +00:00
Filip Gruszczyński
fbd60cfdfb Setting pretty large divider distance for NumberPicker in clockwork. 
This is required because NumberPicker code calculated the click action based
on the divider distance and only counts clicks withing these bounds.

Change-Id: I24d7d498c1a9c023fb6a3488a5b90afd6b6f7597
 2014-03-06 11:03:01 -08:00
Dianne Hackborn
52f610d248 Fix issue #13199860: PRE_BOOT_COMPLETED intent is... 
...broadcasted repeatedly at every boot time

Remember the last done pre-boot receivers, so that if we have
a new pre boot receiver appearing (without the platform version
changing), when we re-write the file of done receivers it will
contain all of them, not just the new one.

Change-Id: I4ed3478edc549d4b023ec4b3719111bc4d970ae4
 2014-03-06 10:52:05 -08: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
Baligh Uddin
c7a535c552 am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'd010cf12c796cf83c760df037916e5572ce55868':
  Import translations. DO NOT MERGE
 2014-03-06 18:44:45 +00:00
Dianne Hackborn
71ab245a0d Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev 2014-03-06 18:29:19 +00:00