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

198712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Kwa
fc181d7b9e am e4c632f8: am 7eb2d726: am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 
* commit 'e4c632f820128e54a21c08922f1e843c599bfa73':
  Fix drawer selection to match Material spec.
 2015-06-05 01:27:27 +00:00
Svet Ganov
014340fecf am bfc87427: am acce6dda: am e0748316: Merge "Update the pdfium library - framework" into mnc-dev 
* commit 'bfc8742783c4fc1a8aa082519a33aeae2fa38b38':
  Update the pdfium library - framework
 2015-06-05 01:27:22 +00:00
Clara Bayarri
b1d4d77d6a am 612e1da8: am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit '612e1da808b327aba06be883a54dc08f9afd6dd2':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:18:32 +00:00
Ben Kwa
e4c632f820 am 7eb2d726: am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 
* commit '7eb2d726e8effc2af6983c78d3d69992c68b9562':
  Fix drawer selection to match Material spec.
 2015-06-05 01:16:01 +00:00
Svet Ganov
bfc8742783 am acce6dda: am e0748316: Merge "Update the pdfium library - framework" into mnc-dev 
* commit 'acce6dda97e57db562f751bdd5ff72ea058dd970':
  Update the pdfium library - framework
 2015-06-05 01:15:55 +00:00
Clara Bayarri
612e1da808 am f407aa30: am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit 'f407aa302788c7a5a885e069fd169b6a18a9bcbb':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 01:06:23 +00:00
Ben Kwa
7eb2d726e8 am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 
* commit '8dbb43289ccc6bf85399eb3737be0dd5f01de923':
  Fix drawer selection to match Material spec.
 2015-06-05 01:04:52 +00:00
Svet Ganov
acce6dda97 am e0748316: Merge "Update the pdfium library - framework" into mnc-dev 
* commit 'e0748316053fe0210cf08be002d00a04e6068fb8':
  Update the pdfium library - framework
 2015-06-05 01:04:47 +00:00
Dongwon Kang
bc39decc82 am a401c112: am c9ae5377: am 9e7ac352: Merge "TIF: Add sanitization code for the current position" into mnc-dev 
* commit 'a401c1125e64ebe86614b60381ce64ea5a6d6ec5':
  TIF: Add sanitization code for the current position
 2015-06-05 01:02:50 +00:00
Wale Ogunwale
549d16eaab am f318db78: am bb2a990b: am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit 'f318db78c27dc5b4037f8208ee8b0dd4ee714e9f':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 01:02:44 +00:00
Ben Kwa
8dbb43289c Merge "Fix drawer selection to match Material spec." into mnc-dev 2015-06-05 00:51:54 +00:00
Dongwon Kang
a401c1125e am c9ae5377: am 9e7ac352: Merge "TIF: Add sanitization code for the current position" into mnc-dev 
* commit 'c9ae5377b94d6391f785e0f99c539cb7d79591c0':
  TIF: Add sanitization code for the current position
 2015-06-05 00:51:04 +00:00
Wale Ogunwale
f318db78c2 am bb2a990b: am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit 'bb2a990bda622e0f13cf4d33cf8fe0d2c2756e07':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 00:50:59 +00:00
Svet Ganov
e074831605 Merge "Update the pdfium library - framework" into mnc-dev 2015-06-05 00:49:43 +00:00
Roozbeh Pournader
74b8a37992 am 3f21671e: am 946e8698: am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 
* commit '3f21671e4a585e1e00794e3c00e89a8697dc74d2':
  Move NotoSansSymbols higher than CJK in the fallback chain.
 2015-06-05 00:49:08 +00:00
Johnson Hsieh
1ddd35c454 am 01f77af0: am 37750c28: am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '01f77af0480a07e1a6420d9d9d7efaa52b5a933d':
  Updates AlarmClock intent API.
 2015-06-05 00:49:01 +00:00
Clara Bayarri
f407aa3027 am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit 'c1f28bc97d2f88f839269ce701c7fe68c4f1615a':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 00:48:54 +00:00
Yohei Yukawa
42c0ef452f am c225c81b: am 8d38afdd: am 4493017a: Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 
* commit 'c225c81b13e700fd96c5c0a128931de46c421c27':
  Report EditorInfo#packageName based on the actual uid.
 2015-06-05 00:48:49 +00: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
Alan Viverette
a30bfe2d30 am 460ab500: am 43cb62f0: am 193259d4: Merge "Manually jump ripples when preemptively aborting RT animation" into mnc-dev 
* commit '460ab50014e163040872842916c4b03708887d6b':
  Manually jump ripples when preemptively aborting RT animation
 2015-06-05 00:48:33 +00:00
Jorim Jaggi
c61aeb6345 am 178f57f8: am 1c047b57: am 81f2992f: Merge "Speed up recents -> app #2" into mnc-dev 
* commit '178f57f8ced4e3762cec41bc61a4b4514a3753b5':
  Speed up recents -> app #2
 2015-06-05 00:48:27 +00:00
Jorim Jaggi
334f31aa67 am 5e21ab6e: am 749e373e: am 75289664: Merge "Speed up recents -> app" into mnc-dev 
* commit '5e21ab6ef24744e6a9d996c7a375e76723e8c22f':
  Speed up recents -> app
 2015-06-05 00:48:22 +00:00
Alex Klyubin
6b6015a528 am 3b491da5: am 8c415cf3: am 2c378078: Merge "Export KeyFactory backed by Android Keystore." into mnc-dev 
* commit '3b491da51d04acb0f635727af357cf8414ac7f97':
  Export KeyFactory backed by Android Keystore.
 2015-06-05 00:48:16 +00:00
John Reck
abd302275d am 5c81f7aa: am 6f5c99a8: am dde606df: Merge "Iterate step of launch & iterate" into mnc-dev 
* commit '5c81f7aacc354c8577197e1396455a867d44c23f':
  Iterate step of launch & iterate
 2015-06-05 00:48:10 +00:00
Jorim Jaggi
0854558225 am 6849bbeb: am 76bb1e1d: am 3a4656e8: Merge "Make entering recents a lot faster" into mnc-dev 
* commit '6849bbeb8295878d6e1f7a3cc012c3bf71b3d2e6':
  Make entering recents a lot faster
  Fix build
  SettingsLib/Wifi: Run pause/resumes on main thread
  Fix NPE when requesting outsets for detached view.
  UsbDeviceManager: Don't unnecessarily touch properties
  Fix the NPE when checking mRebootReason
  Handle network info updates while scanning is paused
  Enabled WMS.DEBUG_STARTING_WINDOW
  Make CameraService proxy retry behavior more lenient.
  Revert "Use getRunAdvance to position cursor"
  Be more careful with mAccessPoints usage
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-05 00:48:04 +00:00
Tim Kilbourn
4191329037 am 9603852e: (-s ours) am 9c76cfae: am 57914802: Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev 
* commit '9603852e08c6e73f7692df0ede6fc1deeae58935':
  DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
 2015-06-05 00:47:59 +00:00
Yohei Yukawa
dd358e334e am 8ad8800f: am 7b31afd6: am 34df42d5: Merge "Make IMMS#mSettingsObserver multiuser-aware." into mnc-dev 
* commit '8ad8800f4cdd64279073b83c11c4c2de3651b0cf':
  Make IMMS#mSettingsObserver multiuser-aware.
 2015-06-05 00:47:53 +00:00
Paul Lawrence
01e5419b20 am 42eed8f4: am df28b191: am 8836528d: Merge "Move crypt commands to a different listener in vold" into mnc-dev 
* commit '42eed8f40c589addadeb8adf89cf07e3e4944563':
  Move crypt commands to a different listener in vold
 2015-06-05 00:47:47 +00:00
Pavlin Radoslavov
af80db9cc6 am a41dc20d: am 102e0154: am d2b033ae: Add a missing check for null pointer. 
* commit 'a41dc20d4469effb0744999ae2290b1f43e900e4':
  Add a missing check for null pointer.
 2015-06-05 00:47:42 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Dongwon Kang
c9ae5377b9 am 9e7ac352: Merge "TIF: Add sanitization code for the current position" into mnc-dev 
* commit '9e7ac352ebc023527e2f6745d35d39e05c2bad60':
  TIF: Add sanitization code for the current position
 2015-06-05 00:36:25 +00:00
Wale Ogunwale
bb2a990bda am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit '733f147401f180b14acb13137cf99e65da1d72cc':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 00:36:20 +00:00
Dongwon Kang
9e7ac352eb Merge "TIF: Add sanitization code for the current position" into mnc-dev 2015-06-05 00:27:02 +00:00
Dongwon Kang
bb3e2674b5 TIF: Add sanitization code for the current position 
+ More documentation on the currnet position

Bug: 21573422
Change-Id: I51d184d03a61270d3ea36b36f880f1f052a99cd1
 2015-06-04 17:25:59 -07:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
Roozbeh Pournader
3f21671e4a am 946e8698: am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 
* commit '946e869807126f0de680db7126d512d740995a2b':
  Move NotoSansSymbols higher than CJK in the fallback chain.
 2015-06-04 23:59:50 +00:00
Johnson Hsieh
01f77af048 am 37750c28: am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '37750c281104435b5d0dc39fc0cde4fce312f6f4':
  Updates AlarmClock intent API.
 2015-06-04 23:59:45 +00:00
Roozbeh Pournader
946e869807 am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 
* commit '73d2f160ecdd0e00b805fd956abc88996758e516':
  Move NotoSansSymbols higher than CJK in the fallback chain.
 2015-06-04 23:54:15 +00:00
Johnson Hsieh
37750c2811 am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '6c72febd3526cc460b62926302fbcde1d38d42e5':
  Updates AlarmClock intent API.
 2015-06-04 23:48:24 +00:00
Roozbeh Pournader
73d2f160ec Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 2015-06-04 23:45:27 +00:00
Yohei Yukawa
c225c81b13 am 8d38afdd: am 4493017a: Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 
* commit '8d38afddb12047c79d56ed8103341be166a3d6c7':
  Report EditorInfo#packageName based on the actual uid.
 2015-06-04 23:37:58 +00:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
Ben Kwa
50698068c1 Fix drawer selection to match Material spec. 
- highlighted text changed to match the application primary color
- change highlighted background to light gray
- remove highlight icon tinting (provides insufficient contrast against
  the new light gray background)

BUG=18685226

Change-Id: I4040fa951fd2822cea324e0bd1924d10024b6a11
 2015-06-04 16:28:16 -07:00
Yohei Yukawa
8d38afddb1 am 4493017a: Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 
* commit '4493017abb5ff30648b7d736b411c4d22d002de1':
  Report EditorInfo#packageName based on the actual uid.
 2015-06-04 23:22:45 +00:00
Yohei Yukawa
4493017abb Merge "Report EditorInfo#packageName based on the actual uid." into mnc-dev 2015-06-04 23:12:45 +00:00
Makoto Onuki
4f4d5de122 am 87f39139: am c0f9ca7b: Merge "Change option label from "Duplex" to "Two-sided"" into mnc-dev 
* commit '87f3913980700001c04d28b0f06067b77f8eed5f':
  Change option label from "Duplex" to "Two-sided"
 2015-06-04 23:09:01 +00:00
Alan Viverette
460ab50014 am 43cb62f0: am 193259d4: Merge "Manually jump ripples when preemptively aborting RT animation" into mnc-dev 
* commit '43cb62f05b619e63727e38ce60583770d7a84e2b':
  Manually jump ripples when preemptively aborting RT animation
 2015-06-04 23:08:56 +00:00
Jorim Jaggi
178f57f8ce am 1c047b57: am 81f2992f: Merge "Speed up recents -> app #2" into mnc-dev 
* commit '1c047b577710f2fcb63dcbc13d853202d3851ff7':
  Speed up recents -> app #2
 2015-06-04 23:08:41 +00:00
Jorim Jaggi
5e21ab6ef2 am 749e373e: am 75289664: Merge "Speed up recents -> app" into mnc-dev 
* commit '749e373e0f0ad3e3cd92d38cccdfd1ef2c1a703f':
  Speed up recents -> app
 2015-06-04 23:08:36 +00:00
Alex Klyubin
3b491da51d am 8c415cf3: am 2c378078: Merge "Export KeyFactory backed by Android Keystore." into mnc-dev 
* commit '8c415cf32c46a24a2f71dd6b0ffe0b4e15705a4e':
  Export KeyFactory backed by Android Keystore.
 2015-06-04 23:08:27 +00:00