Victoria Lease
1add6cdf76
am e0e4197c: Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev
...
* commit 'e0e4197c55a8a7f6896eec2794c4cd455736e46b':
DroidSans -> NotoSans for {Devanagari,Tamil,Thai}
2013-09-05 14:17:02 -07:00
Victoria Lease
e0e4197c55
Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev
2013-09-05 21:15:01 +00:00
Jeff Sharkey
923396b772
Filter roots based on supported MIME types.
...
Using flags to indicate supported types isn't very extensible, so
use newline-separated MIME types instead.
Bug: 10514613
Change-Id: I45641fc20b423b2a0bb2df7457c274f42aa6861a
2013-09-05 13:58:04 -07:00
Dianne Hackborn
9bf60233bc
am 8e535cec: am dfafaffe: Merge "Fix issue #10387684 : ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev
...
* commit '8e535cec2e172fc08e2d9c98bb3fb1c66e5552c7':
Fix issue #10387684 : ArrayIndexOutOfBoundsException in ArrayMap.put
2013-09-05 13:43:54 -07:00
Dianne Hackborn
8e535cec2e
am dfafaffe: Merge "Fix issue #10387684 : ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev
...
* commit 'dfafaffe8601a3483e8da8f32bd4c754fecb88c1':
Fix issue #10387684 : ArrayIndexOutOfBoundsException in ArrayMap.put
2013-09-05 13:40:42 -07:00
Dianne Hackborn
dfafaffe86
Merge "Fix issue #10387684 : ArrayIndexOutOfBoundsException in ArrayMap.put" into klp-dev
2013-09-05 20:38:55 +00:00
Alan Viverette
651b4249b9
Apply implicit parent dependency when adding to PreferenceGroup
...
BUG: 10493706
Change-Id: Iba741d8dd4e72bc5aef5c033e42a9ba4fb0c523b
2013-09-05 13:32:40 -07:00
Kenny Root
b91773bce1
Add argument to binder call to check key types
...
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.
Bug: 10600582
Change-Id: I9fe9e46b9ec9cfb2f1246179b2c396216b2c1fdb
2013-09-05 13:27:00 -07:00
Dianne Hackborn
f691359724
Fix issue #10387684 : ArrayIndexOutOfBoundsException in ArrayMap.put
...
Locking of sSharedPrefs was bad -- it was using a per-context lock
instead of a static lock.
Change-Id: Ib261a40619c43f7ea2e686057c0702fb5461d843
2013-09-05 13:21:24 -07:00
Victoria Lease
531dfc4573
DroidSans -> NotoSans for {Devanagari,Tamil,Thai}
...
Bug: 7672029
Change-Id: I3b7278841ea1934b459f972d5acd99277e8f6db8
2013-09-05 13:13:58 -07:00
Svetoslav
0951d5986c
am 4063e9e7: am 0cdc24a2: Merge "Bug fixes in the print dialog" into klp-dev
...
* commit '4063e9e73283307344cfe22ce762c4998b16e99f':
Bug fixes in the print dialog
2013-09-05 12:43:36 -07:00
Adam Powell
1d5ac31c0d
am f094655c: am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev
...
* commit 'f094655c804e3983a538b7bc28266b173ea5c78b':
Add View#cancelPendingInputEvents API
2013-09-05 12:43:32 -07:00
Deepanshu Gupta
7913427d68
am e68c111e: (-s ours) am 0851945a: am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
...
* commit 'e68c111e3834bd3f075a3fe747187de5d89d5761':
Fix text rendering
2013-09-05 12:43:27 -07:00
Svetoslav
4063e9e732
am 0cdc24a2: Merge "Bug fixes in the print dialog" into klp-dev
...
* commit '0cdc24a2fb5268241cf16c6b28a4a3b58965a2c8':
Bug fixes in the print dialog
2013-09-05 12:39:37 -07:00
Adam Powell
f094655c80
am a73c3a54: Merge "Add View#cancelPendingInputEvents API" into klp-dev
...
* commit 'a73c3a54886c302cc72e469d27603ef6bb92a6a1':
Add View#cancelPendingInputEvents API
2013-09-05 12:39:34 -07:00
Svetoslav
0cdc24a2fb
Merge "Bug fixes in the print dialog" into klp-dev
2013-09-05 19:38:24 +00:00
Adam Powell
a73c3a5488
Merge "Add View#cancelPendingInputEvents API" into klp-dev
2013-09-05 19:37:51 +00:00
Deepanshu Gupta
dd442d9bf6
am a9f35ab9: (-s ours) am b6545562: am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
...
* commit 'a9f35ab9042e30b15102de6f736827710945faea':
Fix layout rendering for RTL locales
2013-09-05 12:26:32 -07:00
Deepanshu Gupta
e68c111e38
am 0851945a: am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
...
* commit '0851945a72e10e1d31aafa459f7e69cdf7087bee':
Fix text rendering
2013-09-05 12:03:20 -07:00
Deepanshu Gupta
a9f35ab904
am b6545562: am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
...
* commit 'b654556213513885ff5be05d4d2808e34d50233e':
Fix layout rendering for RTL locales
2013-09-05 12:03:17 -07:00
Deepanshu Gupta
0851945a72
am b50de495: am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
...
* commit 'b50de4951aaea6d6f01432dc17b7c5de778a2e71':
Fix text rendering
2013-09-05 12:00:58 -07:00
Deepanshu Gupta
b654556213
am 97c88368: am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
...
* commit '97c88368e0036665507c8cd84c71d26953784c85':
Fix layout rendering for RTL locales
2013-09-05 12:00:54 -07:00
Deepanshu Gupta
b50de4951a
am dd4efc22: am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
...
* commit 'dd4efc22c736973ecfa1b7b4af9e71f971dd48b3':
Fix text rendering
2013-09-05 11:58:59 -07:00
Deepanshu Gupta
97c88368e0
am c78d173b: am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
...
* commit 'c78d173b730dcfdf107e6ac2bc959d459fe3eedd':
Fix layout rendering for RTL locales
2013-09-05 11:58:54 -07:00
Deepanshu Gupta
dd4efc22c7
am 3a762d8b: Merge "Fix text rendering" into jb-mr2-dev
...
* commit '3a762d8bfbe6b2d4066bc5cc90301063c19976c4':
Fix text rendering
2013-09-05 11:52:48 -07:00
Deepanshu Gupta
c78d173b73
am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
...
* commit '68411471083abd7a7713483b5cd40f394387b7b3':
Fix layout rendering for RTL locales
2013-09-05 11:52:42 -07:00
Deepanshu Gupta
3a762d8bfb
Merge "Fix text rendering" into jb-mr2-dev
2013-09-05 18:49:31 +00:00
Deepanshu Gupta
6841147108
Merge "Fix layout rendering for RTL locales" into jb-mr2-dev
2013-09-05 18:48:55 +00:00
Svetoslav
a36285f3f2
Bug fixes in the print dialog
...
1. Read/write async tasks of the persistence manger used by
the FusedPrintersProvider could be run more that once, so
create a new one every time.
2. The fake printer used to save to PDF should not be added
to printer history.
3. Removed print preview leftover code from the print dialog.
4. Save to PDF was not working on the second consecutive attempt.
5. The fisrt time the orientation change was ignored - regression
Change-Id: I8960ef2cf92dfeeec22fa8751ba8475092b5b65c
2013-09-05 11:34:32 -07:00
Deepanshu Gupta
0d9c922c96
Fix text rendering
...
There are still some errors
1. Little vertical clippping for extra tall glyphs.
2. Breaking into scripts isn't perfect which results in incorrect layout
of text.
Change-Id: I54de3c05eca5e8affb1135c120eea24c3afe8a47
2013-09-05 10:58:10 -07:00
Vinit Deshapnde
5261c9772f
am 76998d55: am b402fb2f: Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
...
* commit '76998d552c1f8a83500c313d79e43cdd2de590b7':
Rename LinkInfo to LinkQualityInfo
2013-09-05 10:56:21 -07:00
Vinit Deshapnde
76998d552c
am b402fb2f: Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
...
* commit 'b402fb2fddbee48ef3b518358dc5c86db63f7780':
Rename LinkInfo to LinkQualityInfo
2013-09-05 10:53:16 -07:00
Vinit Deshapnde
b402fb2fdd
Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
2013-09-05 17:50:19 +00:00
Mike Lockwood
f55ba05cf8
Merge "ParcelFileDescriptor: Add comments to warn that parcelling must stay in sync with Parcel.cpp implementation"
2013-09-05 17:14:16 +00:00
Chet Haase
672fcd5c9a
am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
...
* commit '04f31501602a87ae9526983f4a92e623b4d68bb3':
Change build version from KEY_LIME_PIE to KITKAT
2013-09-05 10:13:34 -07:00
Justin Koh
97f3c7d8a5
am c199987a: am 217ecacd: Merge "Add keypress invalid to all AudioPackage mk files." into klp-dev
...
* commit 'c199987a99c058878201a642b004a3398a392163':
Add keypress invalid to all AudioPackage mk files.
2013-09-05 10:13:30 -07:00
Chet Haase
04f3150160
am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
...
* commit 'a9fa33b366e82f330ec8a68b616896876e7ddc46':
Change build version from KEY_LIME_PIE to KITKAT
2013-09-05 10:10:39 -07:00
Justin Koh
c199987a99
am 217ecacd: Merge "Add keypress invalid to all AudioPackage mk files." into klp-dev
...
* commit '217ecacd18407ed6be2dd9a7f062f84103eddb32':
Add keypress invalid to all AudioPackage mk files.
2013-09-05 10:10:36 -07:00
Chet Haase
a9fa33b366
Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
2013-09-05 17:07:30 +00:00
Svetoslav
4fe055ad8d
am e2144155: am 2def6148: Merge "Hiding some unneeded APIs," into klp-dev
...
* commit 'e2144155f63563112b5cde18d61dc04fa838e5ef':
Hiding some unneeded APIs,
2013-09-05 10:06:31 -07:00
Andy McFadden
f7e92f0496
am df102215: am 63571bf2: Merge "Add #! to \'am\' shell script" into klp-dev
...
* commit 'df102215130ea0dda96298c0ea5b58bbb03d2909':
Add #! to 'am' shell script
2013-09-05 10:06:28 -07:00
Justin Koh
217ecacd18
Merge "Add keypress invalid to all AudioPackage mk files." into klp-dev
2013-09-05 17:06:14 +00:00
Svetoslav
e2144155f6
am 2def6148: Merge "Hiding some unneeded APIs," into klp-dev
...
* commit '2def61485413084e68233c89ba956a2282fbacd1':
Hiding some unneeded APIs,
2013-09-05 10:03:47 -07:00
Andy McFadden
df10221513
am 63571bf2: Merge "Add #! to \'am\' shell script" into klp-dev
...
* commit '63571bf203506c57cb4737e4660ccbe1f9eb6e5b':
Add #! to 'am' shell script
2013-09-05 10:03:41 -07:00
Tom O'Neill
5c199a8f0a
am a3fa5138: am cef05c28: Incorporate new API council comments
...
* commit 'a3fa513893343767b2ed5198b96d419d77c6bd50':
Incorporate new API council comments
2013-09-05 10:01:50 -07:00
Svetoslav
2def614854
Merge "Hiding some unneeded APIs," into klp-dev
2013-09-05 17:01:39 +00:00
Tom O'Neill
a3fa513893
am cef05c28: Incorporate new API council comments
...
* commit 'cef05c28eb452810e4b79895970457ff2bdef5b4':
Incorporate new API council comments
2013-09-05 10:00:11 -07:00
Andy McFadden
63571bf203
Merge "Add #! to 'am' shell script" into klp-dev
2013-09-05 17:00:05 +00:00
Svetoslav
a76233ae84
Hiding some unneeded APIs,
...
1. Hide the MediaSize and Resolution constructors that take
package and resource Id.
2. Fix a bug and docs in creating portrait and landscape media
size.
Change-Id: If59992e355391de6ad6d14d4f7b3be8c8b6cc0e0
2013-09-05 09:50:28 -07:00
Tom O'Neill
cef05c28eb
Incorporate new API council comments
...
- Split getStatus() into onGetSummary() and onGetEnabled()
- Call them on app's UI thread
- Allow runtime exceptions to propagate up
- Make a couple of more methods final to prevent subclasses from playing
around with the intent
- Remove explicit timing requirement from javadoc
- Mention that this will be restricted to system-image apps (will be
enforced by the actual settings code)
- b/10461474
Change-Id: Id22dd7a707c05de396ae4c5810e839ca734714c0
2013-09-05 09:45:03 -07:00