John Reck
79d81e68aa
Remove dead code
...
Change-Id: I242eacf68067ffe353802f07d6bfe5bb152fe9d0
2013-11-05 13:28:34 -08:00
Baligh Uddin
196d0ac0cb
Merge "Import translations. DO NOT MERGE"
2013-11-05 15:55:14 +00:00
Fabrice Di Meglio
93c9093a32
am 641bac8e: am 073041c3: am f48bcd5b: Merge "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales" into klp-dev
...
* commit '641bac8e21673a2d526b9c0ccf28d5fd08bd6994':
Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales
2013-11-04 22:00:22 -08:00
Fabrice Di Meglio
49d6862183
am 346d001b: am 0804ff1f: am cad157b3: Merge "Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape" into klp-dev
...
* commit '346d001b6fae9c5abb0de8d58b3c6d778d3508dc':
Fix bug #11252410 Recents items stuck behind hammerhead navigation panel in landscape
2013-11-04 22:00:18 -08:00
Svetoslav
2dc3477e7f
am 109c0a21: am b1dac2f4: am 517220b4: Merge "PreferenceFragment showing the breadcrumb when not needed." into klp-dev
...
* commit '109c0a21938cbab8ae1bde594339cbdf338cb559':
PreferenceFragment showing the breadcrumb when not needed.
2013-11-04 21:59:59 -08:00
Brian Carlstrom
6f1a44f3de
am 5f4a8948: am c8b01295: am 60999fcb: Merge "Treat UnsatisfiedLinkError as non-fatal" into klp-dev
...
* commit '5f4a89480a6f5d3eb6ec7f7979f6555ae083c25f':
Treat UnsatisfiedLinkError as non-fatal
2013-11-04 21:59:53 -08:00
Adam Powell
307182870d
am a20bfd96: am fe803958: am 1262d0c8: Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
...
* commit 'a20bfd96bae95bd54b20ebd184655d7211cedcb4':
Fix action menu visibility callbacks for nested popups
2013-11-04 21:59:49 -08:00
Adam Powell
ccb5b6de00
am b688a0c9: am 9382a071: am b611eb94: Merge "Fix incorrect content description on action bar home/up" into klp-dev
...
* commit 'b688a0c9ac41fc5edc2fdbb515f1eda4869989c2':
Fix incorrect content description on action bar home/up
2013-11-04 21:59:45 -08:00
Victoria Lease
8f86d3d28e
am c403afb6: am 79007026: am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
...
* commit 'c403afb6421f0ab840303ac7f5a207067e976e77':
use SpannedStringBuilder to build a SpannedString
2013-11-04 21:59:42 -08:00
Brian Carlstrom
6a429f5604
am 94edb339: am 10193b78: am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
...
* commit '94edb3390970c302be926b42e0f8a8da0d5d5960':
Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-04 21:59:23 -08: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
Alan Viverette
fadfbf1ae0
Merge "Add support for using ColorStateList as GradientDrawable's stroke"
2013-11-05 02:44:31 +00: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
Alan Viverette
a211dd28b9
Add support for using ColorStateList as GradientDrawable's stroke
...
Refactors isOpaque() so that ColorStateList APIs previously added
on master branch are no longer needed.
Change-Id: I104c9a14ef81db6c4cf141e8fd0ebbd20bd52ee9
2013-11-04 13:46:29 -08: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
Zhijun He
7f80d6f741
Camera2: hide some face related keys
...
STATISTICS_FACE_IDS, STATISTICS_FACE_LANDMARKS, STATISTICS_FACE_RECTANGLES and
STATISTICS_FACE_SCORES are redundant since STATISTICS_FACES can report face
info already.
Bug: 11082745
Change-Id: I8239cee8fdce8f5aea3cc26ca979e41251ca05fa
2013-11-04 10:18:05 -08:00
Baligh Uddin
8a6b6c50f2
Import translations. DO NOT MERGE
...
Change-Id: I3966d55cad10cba7d01159e02138d4f8745720fb
Auto-generated-cl: translation import
2013-11-04 10:08:28 -08: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
Adam Powell
1262d0c864
Merge "Fix action menu visibility callbacks for nested popups" into klp-dev
2013-11-04 17:55:24 +00:00
Adam Powell
b611eb94e9
Merge "Fix incorrect content description on action bar home/up" into klp-dev
2013-11-04 17:55:05 +00:00
Victoria Lease
7900702693
am 3dbea35f: Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
...
* commit '3dbea35f7eaa6d5f94601a48ebb3be18223d4604':
use SpannedStringBuilder to build a SpannedString
2013-11-04 08:25:54 -08:00
Victoria Lease
3dbea35f7e
Merge "use SpannedStringBuilder to build a SpannedString" into klp-dev
2013-11-04 16:23:15 +00:00
Brian Carlstrom
e92f19e58c
Treat UnsatisfiedLinkError as non-fatal
...
Bug: 11466297
Change-Id: I12be43564da37290b3ee52b1858e44f2229711d9
2013-11-03 22:47:11 -08:00
Adam Powell
b411b32861
Fix action menu visibility callbacks for nested popups
...
When opening a submenu from a popup in ActionMenuPresenter, delegate
the submenu callbacks to the presenter callback registered on the
ActionMenuPresenter. This allows menu visibility callbacks to
propagate properly so that apps that hide their action bars after a
timeout can detect open menus that are deeply nested.
Bug 11429613
Change-Id: I3332886f08d4f9010f0875057c457566301d12ec
2013-11-01 18:22:11 -07:00
Brian Carlstrom
10193b78b8
am a51052d1: Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
...
* commit 'a51052d17cf94fcddb5739141132fb9dee75bffb':
Move set of persist.sys.dalvik.vm.lib to SystemServer only
2013-11-01 17:28:38 -07:00
Adam Powell
f37a5139db
Fix incorrect content description on action bar home/up
...
Some stray code from a previous change caused an erroneous content
description to be set on the wrong view in the action bar. Correct
this and sync with the right behavior.
Bug 10969992
Change-Id: I4deaa3528b4bc222e25354679fa93f8316fa2d70
2013-11-01 16:36:49 -07:00
Brian Carlstrom
a51052d17c
Merge "Move set of persist.sys.dalvik.vm.lib to SystemServer only" into klp-dev
2013-11-01 22:51:07 +00:00
Nick Kralevich
59477290cc
Merge "AppOpsManager: fix javadoc misspelling."
2013-11-01 22:48:55 +00:00
Nick Kralevich
e20166acfd
AppOpsManager: fix javadoc misspelling.
...
Change-Id: I15cb1ed4c46026db248dc5ebc1d46e65c5f7bc0b
2013-11-01 15:28:29 -07:00
Brian Carlstrom
5637ffced9
Move set of persist.sys.dalvik.vm.lib to SystemServer only
...
Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
2013-11-01 14:51:58 -07:00
Victoria Lease
6eb3a0e9ba
am 24aecc3f: am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit '24aecc3fb609ce999a7fef7a610891d5a32eb92c':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:34:10 -07:00
Victoria Lease
24aecc3fb6
am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:30:51 -07:00
Victoria Lease
24a24b2790
am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
...
* commit 'ee4c84642afffa80f23039bbc2d4f59de11f67da':
Handle surrogate pairs in Html.toHtml()
2013-11-01 13:27:46 -07:00
Victoria Lease
ee4c84642a
Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev
2013-11-01 20:22:42 +00:00
Michael Wright
943345f92a
am d35e94a3: am 6be8dde6: am 4846a93b: Merge "Only call dump when a ViewRoot actually exists" into klp-dev
...
* commit 'd35e94a3cbd27f08430c593930c989a36f17a833':
Only call dump when a ViewRoot actually exists
2013-11-01 13:21:01 -07:00