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

45299 Commits

Author SHA1 Message Date
Victoria Lease
dd3776d673 am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit '30a3ef6c85011ba82a777e6eef7f026323019f35':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:37:15 -08:00
Victoria Lease
30a3ef6c85 am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 
* commit 'c89eaf916ad7e88565d2a15991432b22cd9099ff':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
 2013-11-06 11:33:35 -08:00
Victoria Lease
c89eaf916a Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 2013-11-06 19:30:23 +00:00
Raph Levien
4f0064fa34 Fix for Typeface.create(Typeface, style) semantics changed in KK 
This is a fix for bug 11553661. The "closest match" heuristic for
resolving a typeface when an exact match was not found changed between
JB MR2 and KK, resulting in loss of custom typeface when StyleSpan was
applied. This patch reinstates the logic that had been present. Also
reported externally as:
https://code.google.com/p/android/issues/detail?id=61771

Change-Id: Ia432fca07c4bf3b830ee2487cd8f5267a9cfb7ff
 2013-11-06 11:16:01 -08:00
Patrick Tjin
b4328566fa am 5eecb9e8: am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit '5eecb9e8d44b3864a3261a3c5ebfbb9c606e77f5':
  Add HSPA+ to BatteryStats
 2013-11-06 10:20:00 -08:00
Patrick Tjin
5eecb9e8d4 am bd9513f3: Merge "Add HSPA+ to BatteryStats" into klp-dev 
* commit 'bd9513f3b27a9a15a12474ff5b270abd69a013a1':
  Add HSPA+ to BatteryStats
 2013-11-06 10:16:56 -08:00
Ruben Brunk
5717190521 am 6327136c: am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '6327136cdb1a0438132ea9d91c3b498a034ec071':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:13:03 -08:00
Patrick Tjin
bd9513f3b2 Merge "Add HSPA+ to BatteryStats" into klp-dev 2013-11-06 18:12:47 +00:00
Ruben Brunk
6327136cdb am 6fe15c3d: Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 
* commit '6fe15c3d5f1b2759b06f3ce489071bb7708d7f6b':
  gcam: Avoid leaking repeating CaptureRequests.
 2013-11-06 10:09:57 -08:00
Ruben Brunk
6fe15c3d5f Merge "gcam: Avoid leaking repeating CaptureRequests." into klp-dev 2013-11-06 18:07:28 +00:00
Adam Lesinski
9aaf4e13f0 am 35040fdc: am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '35040fdc428669bf7e3a1ec9ea388fb49ede32df':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:54:46 -08:00
Adam Lesinski
35040fdc42 am 1aac29c3: Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 
* commit '1aac29c3dd6feece257882469d9825255c69c736':
  Fix off-by-one issue when removing from Iterator
 2013-11-06 09:51:14 -08:00
Adam Lesinski
1aac29c3dd Merge "Fix off-by-one issue when removing from Iterator" into klp-dev 2013-11-06 17:49:21 +00:00
Patrick Tjin
b71703cfdf Add HSPA+ to BatteryStats 
HSPA+ was being shown as connection type other in battery
statistics because it was not updated when TelephonyManager
was changed.

Bug: 11552902
Change-Id: I85ce7c393bf93010a4ac8437f14684015ad0391a
 2013-11-06 17:29:33 +00:00
Robert Greenwalt
146c90edaa am 5ce5c9bc: am 4653837b: Merge "Add config var for single-pdn devices/networks." into klp-dev 
* commit '5ce5c9bcc5e10488bf3b2e75722076322e82dedf':
  Add config var for single-pdn devices/networks.
 2013-11-05 16:30:26 -08:00
Robert Greenwalt
5ce5c9bcc5 am 4653837b: Merge "Add config var for single-pdn devices/networks." into klp-dev 
* commit '4653837b78b7da950e7827598baabc79be1aa4ca':
  Add config var for single-pdn devices/networks.
 2013-11-05 16:00:15 -08:00
Robert Greenwalt
4653837b78 Merge "Add config var for single-pdn devices/networks." into klp-dev 2013-11-05 23:58:07 +00:00
Vineeta Srivastava
e6d7490520 am aee87dd2: am 65d4a84b: Merge "Setting Tethering profile for specific network" into klp-dev 
* commit 'aee87dd202e5b9767ec7a36b824bd28a3b6d37e8':
  Setting Tethering profile for specific network
 2013-11-05 13:57:05 -08:00
Jeff Sharkey
2b80a35cb5 am f5073e71: am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev 
* commit 'f5073e71c2d5d124865d01ad9343793f6fcf620c':
  Clarify DocumentsProvider recents behavior.
 2013-11-05 13:56:58 -08:00
John Spurlock
2237f9f3d4 am eaf393bc: am a90f8160: Merge "Enable translucent system bars on the lockscreen by default." into klp-dev 
* commit 'eaf393bc948514409216aabde2048081c27584e9':
  Enable translucent system bars on the lockscreen by default.
 2013-11-05 13:56:55 -08:00
Vineeta Srivastava
aee87dd202 am 65d4a84b: Merge "Setting Tethering profile for specific network" into klp-dev 
* commit '65d4a84b980583e068dd21bf11e5fe034df8d7ef':
  Setting Tethering profile for specific network
 2013-11-05 12:53:22 -08:00
Vineeta Srivastava
65d4a84b98 Merge "Setting Tethering profile for specific network" into klp-dev 2013-11-05 20:50:09 +00:00
Jeff Sharkey
f5073e71c2 am 5f4affda: Merge "Clarify DocumentsProvider recents behavior." into klp-dev 
* commit '5f4affdab8ff25d3657075a0b3ae10697aae77da':
  Clarify DocumentsProvider recents behavior.
 2013-11-05 12:49:49 -08:00
John Spurlock
eaf393bc94 am a90f8160: Merge "Enable translucent system bars on the lockscreen by default." into klp-dev 
* commit 'a90f816048604538cc25d3b8848ac263761175b4':
  Enable translucent system bars on the lockscreen by default.
 2013-11-05 12:46:15 -08:00
Jeff Sharkey
5f4affdab8 Merge "Clarify DocumentsProvider recents behavior." into klp-dev 2013-11-05 20:46:11 +00:00
John Spurlock
a90f816048 Merge "Enable translucent system bars on the lockscreen by default." into klp-dev 2013-11-05 20:45:15 +00:00
Jeff Sharkey
37ed78e504 Clarify DocumentsProvider recents behavior. 
Bug: 11448309
Change-Id: I17e0ac757e549b251e08d58d5ce7d25fb253883f
 2013-11-05 12:38:21 -08:00
Robert Greenwalt
8e090d7411 Add config var for single-pdn devices/networks. 
bug:10212445
Change-Id: Iec98bb4a6ad3a38eb7fe876ebcb10515b8a789b7
 2013-11-05 10:29:01 -08:00
seonju.oh
725e2655e8 Setting Tethering profile for specific network 
US CellOneIL - 311-190

Bug:11455011
Change-Id: Ia6a5d0bf1d23b4e9281211eb0e32c04905727a04
 2013-11-05 09:50:16 -08:00
Baligh Uddin
17e8f4377c Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-05 15:55:11 +00:00
John Spurlock
fa02aded83 Enable translucent system bars on the lockscreen by default. 
Bug:11442758
Change-Id: Ic143977d8c2686c6b4e48a09fd116d46ff1e98e9
 2013-11-05 10:09:25 -05:00
Fabrice Di Meglio
641bac8e21 am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 
* commit '073041c3708b5856a027d32c93c6945e2266336e':
  Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
 2013-11-04 21:55:31 -08:00
Fabrice Di Meglio
346d001b6f am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev 
* commit '0804ff1f5a27239c7bc5b02581585f4a61e72aa6':
  Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
 2013-11-04 21:55:27 -08:00
Svetoslav
109c0a2193 am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev 
* commit 'b1dac2f49bd462c9a5f93390ddcc563a7044ea50':
  PreferenceFragment showing the breadcrumb when not needed.
 2013-11-04 21:54:39 -08:00
Brian Carlstrom
5f4a89480a am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev 
* commit 'c8b01295bc5dcfcd2d9559f366e175db086eae37':
  Treat UnsatisfiedLinkError as non-fatal
 2013-11-04 21:54:21 -08:00
Adam Powell
a20bfd96ba am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev 
* commit 'fe803958d8c38fa865116912cff95c436d6db4e2':
  Fix action menu visibility callbacks for nested popups
 2013-11-04 21:54:18 -08:00
Adam Powell
b688a0c9ac am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev 
* commit '9382a071612231ee355128f71efb5877550074d9':
  Fix incorrect content description on action bar home/up
 2013-11-04 21:54:14 -08:00
Victoria Lease
c403afb642 am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev 
* commit '79007026935acf84baba183aad0ef654d9ed91aa':
  use SpannedStringBuilder to build a SpannedString
 2013-11-04 21:54:02 -08:00
Brian Carlstrom
94edb33909 am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev 
* commit '10193b78b87a18e5fee7faa4890a01946934000c':
  Move set of persist.sys.dalvik.vm.lib to SystemServer only
 2013-11-04 21:53:29 -08:00
Newton Allen
04b7821496 am 47feee53: Merge "Fix some documentation typos." into klp-docs 
* commit '47feee535f9e4e77165b93b6b9f10379e7aa4bbd':
  Fix some documentation typos.
 2013-11-04 19:25:58 -08:00
Fabrice Di Meglio
073041c370 am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 
* commit 'f48bcd5b68613b0a4ff0162091047fb9465b5290':
  Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
 2013-11-04 16:48:28 -08:00
Fabrice Di Meglio
0804ff1f5a am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev 
* commit 'cad157b370524782183de688bf97c9078c1c08da':
  Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
 2013-11-04 16:48:25 -08:00
Fabrice Di Meglio
f48bcd5b68 Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev 2013-11-05 00:46:19 +00:00
Fabrice Di Meglio
cad157b370 Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev 2013-11-05 00:45:41 +00:00
Svetoslav
b1dac2f49b am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev 
* commit '517220b4682d31e9ea515f28c3702324352bfcda':
  PreferenceFragment showing the breadcrumb when not needed.
 2013-11-04 11:12:41 -08:00
Svetoslav
517220b468 Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev 2013-11-04 19:09:49 +00:00
Brian Carlstrom
c8b01295bc am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev 
* commit '60999fcb2ed251ec4e24eccf94b66e35b851b415':
  Treat UnsatisfiedLinkError as non-fatal
 2013-11-04 10:01:48 -08:00
Adam Powell
fe803958d8 am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev 
* commit '1262d0c864acd9b5cb87767e11de6bdf1cbf2f39':
  Fix action menu visibility callbacks for nested popups
 2013-11-04 10:01:46 -08:00
Adam Powell
9382a07161 am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev 
* commit 'b611eb94e992390dde302124795e18f537aea017':
  Fix incorrect content description on action bar home/up
 2013-11-04 10:01:43 -08:00
Brian Carlstrom
60999fcb2e Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev 2013-11-04 17:57:15 +00:00