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

754 Commits

Author SHA1 Message Date
Elliott Hughes
434a481b21 am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master 
* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
  constify JNINativeMethod function pointer tables
 2015-09-24 17:23:00 +00:00
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
Geoff Mendal
1c85ac66c0 Import translations. DO NOT MERGE 
Change-Id: I6c5aed9a246676b5b0c3c636f7ef034da7d1de01
Auto-generated-cl: translation import
 2015-08-31 05:43:06 -07:00
Chris Wren
2741a28bee am 75cc74b6: am a757636e: am b35152cb: am ca3a3650: am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev 
* commit '75cc74b62a9fa8888c0ca52099557deb7d8ad53c':
  Instrument printing service for metrics collection.
 2015-08-01 17:54:55 +00:00
Chris Wren
a757636e11 am b35152cb: am ca3a3650: am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev 
* commit 'b35152cb182a0d25c896d27acf4bedb93f03cadc':
  Instrument printing service for metrics collection.
 2015-08-01 16:53:49 +00:00
Chris Wren
b35152cb18 am ca3a3650: am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev 
* commit 'ca3a3650e41449eb9d3b9643e844b7506d77759f':
  Instrument printing service for metrics collection.
 2015-08-01 16:38:10 +00: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
Geoff Mendal
b851c2102b Import translations. DO NOT MERGE 
Change-Id: I074e138929dbd329a281adbf55521e0d4a521485
Auto-generated-cl: translation import
 2015-07-29 05:32:05 -07:00
Svetoslav Ganov
ceb0c2d0bd am 58ef5f1d: am dc63edf4: am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '58ef5f1db5907209faf1890079f6ee607e38427c':
  Pass correct extras to the custom print options activity
 2015-07-27 20:50:38 +00:00
Svetoslav Ganov
dc63edf43b am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '34c1df3a154abb8bd495f74f5e53b91e7956e596':
  Pass correct extras to the custom print options activity
 2015-07-27 20:21:48 +00:00
Svetoslav Ganov
34c1df3a15 am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev 
* commit '9124c1784d6537827a6b6423f58572395d8fb820':
  Pass correct extras to the custom print options activity
 2015-07-27 19:59:10 +00: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
9f1c526f9c Import translations. DO NOT MERGE 
Change-Id: Id853f95b011d837e60ad22cee691260e9bc6c2a8
Auto-generated-cl: translation import
 2015-07-22 05:38:43 -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
eddc2bcb8a Import translations. DO NOT MERGE 
Change-Id: Ica6b328575762721edf4f692d131934f4e3d195d
Auto-generated-cl: translation import
 2015-07-08 05:32:41 -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
Geoff Mendal
f7566076d1 Import translations. DO NOT MERGE 
Change-Id: Ibd03405c7db49d8b8da9e34c3ae36e0ea082f1d1
Auto-generated-cl: translation import
 2015-07-06 07:37:05 -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
28a8ff2feb am 72c9e509: am f3dbed08: am 5772b5c6: Propagete document meta-data to custom print UI. 
* commit '72c9e50908a9d50775be0a966735ecf1041b0690':
  Propagete document meta-data to custom print UI.
 2015-06-11 17:07:28 +00: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
Geoff Mendal
39da55fece Import translations. DO NOT MERGE 
Change-Id: I444c2fffad2519fbb7b8bb43d6fbb5bb89261ac3
Auto-generated-cl: translation import
 2015-06-10 07:49:13 -05:00
Makoto Onuki
71cc735836 am 0def58a1: am 610b517a: am e4bd7c98: Improve string comment. 
* commit '0def58a15df2d169970048ccb5f5a573e9916bed':
  Improve string comment.
 2015-06-08 19:58:57 +00: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
Geoff Mendal
494d26f976 Import translations. DO NOT MERGE 
Change-Id: Icc2d49c172da9fb6e304556610a8338880d4ab97
Auto-generated-cl: translation import
 2015-06-08 07:38:25 -05:00
Makoto Onuki
182294c778 am f3992045: am 7ecbf2b1: am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev 
* commit 'f3992045d3fb8e6b79c4cbcf9647aa7633ec9501':
  Fix crash on simplified Chinese.
 2015-06-05 21:56:37 +00: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
a126e932ff am 4f4d5de1: am 87f39139: am c0f9ca7b: Merge "Change option label from "Duplex" to "Two-sided"" into mnc-dev 
* commit '4f4d5de122e965821c8d8f292ece01f1e704bae4':
  Change option label from "Duplex" to "Two-sided"
 2015-06-05 00:48:39 +00: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
3ff704ab46 Import translations. DO NOT MERGE 
Change-Id: I74581c2a392ffcd7265444889381fc1d88242f7e
Auto-generated-cl: translation import
 2015-06-03 10:25:00 -05: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
Geoff Mendal
bad5bceae2 Import translations. DO NOT MERGE 
Change-Id: I72496efc53c99b1ef5ca3a02aa1bf1dfcd5c8ddf
Auto-generated-cl: translation import
 2015-05-29 21:11:45 -07:00
Alan Viverette
880ae8b562 am d27a1081: am fb5dae30: am 8141d6e1: Merge "Use DeviceDefault (dark) theme for PrintActivity" into mnc-dev 
* commit 'd27a10817e80909172bf836354cb3f81e317ce5e':
  Use DeviceDefault (dark) theme for PrintActivity
 2015-05-27 20:56:09 +00: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
b41aab7b5c am b8ee07d1: am e2ad30ef: am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 
* commit 'b8ee07d10c8a8494cb658c3bc3f58f404b949db6':
  Pass charset to XmlPullParser.setInput instead of null
 2015-05-14 21:23:12 +00: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