Elliott Hughes
b57dd722f1
resolved conflicts for a884d81e to stage-aosp-master
...
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
2015-09-24 10:01:32 -07:00
Daniel Micay
76f6a86de2
constify JNINativeMethod function pointer tables
...
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
2015-09-22 17:10:35 -04:00
Chris Wren
6fe9424837
am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev
...
* commit '6e75e7dd988d7704a01528f479421ab5e6012c99':
Instrument printing service for metrics collection.
2015-08-01 00:18:31 +00:00
Chris Wren
dcc34fd8a3
Instrument printing service for metrics collection.
...
Bug: 22837316
Change-Id: I8bf62940f5eb495d8d7a10df958d9bc8ad76662a
2015-07-30 16:29:20 -04:00
Svetoslav Ganov
817ea6d48d
am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
...
* commit '8a54da92ce3da393396bbf0ff86d9525089dcdbf':
Pass correct extras to the custom print options activity
2015-07-27 19:41:20 +00:00
Svet Ganov
f12b393ff4
Pass correct extras to the custom print options activity
...
bug:22734138
Change-Id: Iea1bc32c3e863072b2021b823bef2cefa54fa540
2015-07-25 12:11:01 -07:00
Geoff Mendal
703170645d
Import translations. DO NOT MERGE
...
Change-Id: I7e22afc43c9029b40ba2df53dfc10a9a688c4fd2
Auto-generated-cl: translation import
2015-07-15 14:17:17 -07:00
Geoff Mendal
5d935e8271
Import translations. DO NOT MERGE
...
Change-Id: Ia90a9400d718b5ef61f55ed4d6c5eb9fe48d9667
Auto-generated-cl: translation import
2015-07-06 08:50:33 -05:00
Alan Viverette
afc21d72d8
am f1da9a14: Merge "DO NOT MERGE: Remove DayNight theme" into mnc-dev
...
* commit 'f1da9a1401fe1304bee8a550a0141c79ecc3c0b3':
DO NOT MERGE: Remove DayNight theme
2015-06-18 22:31:41 +00:00
Alan Viverette
15d48a16f6
DO NOT MERGE: Remove DayNight theme
...
Do not go gentle into that good night,
Old age should burn and rave at close of day;
Rage, rage against the dying of the light.
Though wise men at their end know dark is right,
Because their words had forked no lightning they
Do not go gentle into that good night.
Bug: 21854466
Change-Id: I0b7cd116c23f7df88e94f31b3aee7dd22a102804
2015-06-18 15:15:16 -07:00
Svet Ganov
f3dbed08df
am 5772b5c6: Propagete document meta-data to custom print UI.
...
* commit '5772b5c671a13d9c4bbc1e3803667166f811cb33':
Propagete document meta-data to custom print UI.
2015-06-11 10:48:43 +00:00
Svet Ganov
5772b5c671
Propagete document meta-data to custom print UI.
...
Change-Id: I3f122224e1b311a222969253ae0336177989a414
2015-06-11 03:32:09 -07:00
Geoff Mendal
a126f69419
Import translations. DO NOT MERGE
...
Change-Id: I20b6c72047df24a7b6f9ad21db1234bdc4889925
Auto-generated-cl: translation import
2015-06-10 08:58:30 -05:00
Makoto Onuki
610b517a4d
am e4bd7c98: Improve string comment.
...
* commit 'e4bd7c98323b39a47682216bebf442de206a95dd':
Improve string comment.
2015-06-08 19:21:26 +00:00
Makoto Onuki
e4bd7c9832
Improve string comment.
...
Bug 21685729
Change-Id: If6c79730778f399ed0dbf500ef62df3150fbaea6
2015-06-08 12:11:01 -07:00
Geoff Mendal
40f26e1caa
Import translations. DO NOT MERGE
...
Change-Id: Ib2b21a5127e5d2c29bf60c62fa90c5e1dca3ccf1
Auto-generated-cl: translation import
2015-06-08 08:47:53 -05:00
Makoto Onuki
7ecbf2b1a4
am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev
...
* commit 'fba7f5d73cce893860faa3af9df7b4099a8565a1':
Fix crash on simplified Chinese.
2015-06-05 21:31:42 +00:00
Makoto Onuki
fba7f5d73c
Merge "Fix crash on simplified Chinese." into mnc-dev
2015-06-05 21:18:27 +00:00
Makoto Onuki
98112e886d
Fix crash on simplified Chinese.
...
They use the standard A/B sizes in China too.
Bug 20340812
Change-Id: Ia0842f8ddbdcb4cb2738b746509c60de25b64966
2015-06-05 10:47:44 -07:00
Makoto Onuki
87f3913980
am c0f9ca7b: Merge "Change option label from "Duplex" to "Two-sided"" into mnc-dev
...
* commit 'c0f9ca7bf1212448ee40f3fee0095b634d96c5ab':
Change option label from "Duplex" to "Two-sided"
2015-06-04 22:51:11 +00:00
Makoto Onuki
9f9d70b603
Change option label from "Duplex" to "Two-sided"
...
Bug 21640154
Change-Id: Icab4754e0aeb23fc4da178e7306f5c7a74108c22
2015-06-04 14:17:44 -07:00
Geoff Mendal
e5445d7bb7
Import translations. DO NOT MERGE
...
Change-Id: Ic3da6671bd7a81f8a9c07a0a922d07b773377f96
Auto-generated-cl: translation import
2015-05-30 19:58:03 -07:00
Alan Viverette
fb5dae3024
am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev
...
* commit '8141d6e1509a586e2954fbece04e64aaa02092a2':
Use DeviceDefault (dark) theme for PrintActivity
2015-05-27 20:23:30 +00:00
Alan Viverette
7e59bb70a6
Use DeviceDefault (dark) theme for PrintActivity
...
Bug: 21433656
Change-Id: If90ba72fb5862f0eb583c8e64642920c49c5fea6
2015-05-27 12:17:26 -07:00
Wojciech Staszkiewicz
4f11754f72
Pass charset to XmlPullParser.setInput instead of null
...
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.
bug: b/20849543
(cherry picked from commit 9e9e2e73c6ec7bece20268196dc89ad0c8bafad4)
Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-22 10:26:31 +01:00
Wojciech Staszkiewicz
e2ad30ef51
am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
...
* commit 'be752b1f28f1f3724b235e3f0a77b4c07c40e631':
Pass charset to XmlPullParser.setInput instead of null
2015-05-14 10:34:55 +00:00
Wojciech Staszkiewicz
be752b1f28
Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
2015-05-14 10:27:24 +00:00
Wojciech Staszkiewicz
9e9e2e73c6
Pass charset to XmlPullParser.setInput instead of null
...
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.
bug: b/20849543
Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-14 10:24:34 +01:00
Geoff Mendal
251348d3fc
Import translations. DO NOT MERGE
...
Change-Id: I0096104dd65eeb3b4e7bf836c09a58f8aa34965e
Auto-generated-cl: translation import
2015-05-14 01:56:14 -07:00
Alan Viverette
b9da280ac2
DayNight theme for framework packages
...
Change-Id: I745f90561c957c83540e75a2886e294633c83be1
2015-05-05 14:09:21 -07:00
Geoff Mendal
7c1fa24c2c
Import translations. DO NOT MERGE
...
Change-Id: I66a29628216bcfbb56a5820ba0598bd95af27a81
Auto-generated-cl: translation import
2015-04-27 05:55:04 -07:00
Geoff Mendal
9e672e0d18
Import translations. DO NOT MERGE
...
Change-Id: I67f51468d775874da33c28786b86c69e7f1459b1
Auto-generated-cl: translation import
2015-04-22 05:42:32 -07:00
Deepanshu Gupta
6c04e5e916
Add resources to recyclerview dependency.
...
Change-Id: I03c1dbacf8c83149de3ee01fe6d7dbb288d1948a
(cherry picked from commit 202cbbe45383b871129743d55179cf1c6429fffc)
2015-04-21 11:21:38 -07:00
Geoff Mendal
216bef6c35
Import translations. DO NOT MERGE
...
Change-Id: I9d36d679d32ee84e90eec1d51515894c36390bc1
Auto-generated-cl: translation import
2015-03-25 05:41:29 -07:00
Geoff Mendal
d397039876
Import translations. DO NOT MERGE
...
Change-Id: I43f19279f08e1c5b204836ee69e715c1f889acc7
Auto-generated-cl: translation import
2015-03-20 23:39:30 -07:00
Alan Viverette
4a357cd2e5
Replace usages of deprecated Resources.getColor() and getColorStateList()
...
Change-Id: I8f64fe6c4c44a92ff6d07250223ba590a1d691b0
2015-03-18 18:37:18 -07:00
John Spurlock
08c7116ab9
Remove unused imports in frameworks/base.
...
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Geoff Mendal
c4f503fd77
Import translations. DO NOT MERGE
...
Change-Id: I69d645539c36b3915e43eaa0d7b190bc6d559840
Auto-generated-cl: translation import
2015-02-26 16:16:10 -08:00
Geoff Mendal
a58ef5e511
Import translations. DO NOT MERGE
...
Change-Id: I923776f2ceb27b39485ffc29fb8422bf85e48261
Auto-generated-cl: translation import
2015-02-16 06:43:49 -08:00
Geoff Mendal
23032b3f21
Import translations. DO NOT MERGE
...
Change-Id: I6498f5f266d79b90c3b41956290838e199e50999
Auto-generated-cl: translation import
2015-02-11 06:46:44 -08:00
Geoff Mendal
ca6964d2c2
Import translations. DO NOT MERGE
...
Change-Id: I0636cbe07799e0bd53c2157bf4074d9e7a5f5b1c
Auto-generated-cl: translation import
2015-02-09 08:44:13 -06:00
Dianne Hackborn
a7bb6fbeab
First quick implementation of auto assist data.
...
Introduce new AssistData class that contains all data
the framework automatically generates for assist. Currently
populated with a very simple tree structure representing
the app's view hierarchy.
Reworked how we populate the class name for accessibility
info, so this is provided through a new method call on View
that subclasses can override. This method is also used
to populate the class name in AssistData.
Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
2015-02-06 10:42:44 -08:00
Geoff Mendal
bf40f24bc2
Import translations. DO NOT MERGE
...
Change-Id: I1045d9d3bcb2ddce2eb2c57fff87827c5ee23f04
Auto-generated-cl: translation import
2015-02-04 06:51:45 -08:00
Svetoslav
948c9a6393
Add duplex mode support.
...
This change adds support for duplex printing. The print UI now has a duplex
option which allows the user to choose one of the supported duplex options
by the currently selected printer. The chosen duplex mode is propaged to the
print service that manages this printer.
Change-Id: I807ba9da2723531535c0e1e33f2f4e1b503a54b0
2015-02-04 05:48:48 +00:00
Svetoslav
85d6a63d41
am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
...
automerge: 3fd1ebf
* commit '3fd1ebff6c017ba4495070cb34f1ed7652b33cc9':
Add a missing file to print spooler resources
2015-01-27 23:26:24 +00:00
Svetoslav
3fd1ebff6c
am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
...
* commit 'fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
Add a missing file to print spooler resources
2015-01-27 04:36:37 +00:00
Svetoslav
fcecdccc0f
am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev
...
* commit '369f1ec6ea78637870f35822456628e7ae8caf95':
Add a missing file to print spooler resources
2015-01-27 04:26:55 +00:00
Svetoslav
c0198ce12e
Add a missing file to print spooler resources
...
bug:19120603
Change-Id: Id33c77696a47ef48b0095fd8289f92d7bba71f19
2015-01-23 17:50:31 -08:00
Geoff Mendal
596bf7a3e1
Import translations. DO NOT MERGE
...
Change-Id: I3ed20770355daeb44c7ec26a0cd70d224dde7e9b
Auto-generated-cl: translation import
2015-01-21 06:34:11 -08:00
Geoff Mendal
4a682c1b44
Import translations. DO NOT MERGE
...
Change-Id: I9c93551bd46a5ef15b327a8f7ae332e69578ad90
Auto-generated-cl: translation import
2015-01-05 06:11:03 -08:00