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

195495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Kwa
8dbb43289c Merge "Fix drawer selection to match Material spec." into mnc-dev 2015-06-05 00:51:54 +00:00
Svet Ganov
e074831605 Merge "Update the pdfium library - framework" into mnc-dev 2015-06-05 00:49:43 +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
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
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
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
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
Alan Viverette
43cb62f05b am 193259d4: Merge "Manually jump ripples when preemptively aborting RT animation" into mnc-dev 
* commit '193259d40a448b8063837f679e2111664f1bb045':
  Manually jump ripples when preemptively aborting RT animation
 2015-06-04 22:51:06 +00:00
Makoto Onuki
c0f9ca7bf1 Merge "Change option label from "Duplex" to "Two-sided"" into mnc-dev 2015-06-04 22:49:10 +00:00
Alan Viverette
193259d40a Merge "Manually jump ripples when preemptively aborting RT animation" into mnc-dev 2015-06-04 22:41:18 +00:00
Roozbeh Pournader
912dbdb9fa Move NotoSansSymbols higher than CJK in the fallback chain. 
This makes sure that symbol characters who have both an alternative
or "full-width" version in the CJK fonts and a more regular version
in the symbols font get the default or "half-width" version by
default in non-CJK locales.

This is not a complete fix: such "full-width" symbol characters only
exist in the Simplfied Chinese font for now, which means in
Traditional Chinese, Japanese, and Korean locales, they characters
would now appear "half-width", which *may* be sub-optimal. The
complete fix would make sure the ones that actually need to be
"full-width" in TC/J/K are also included in the TC/J/K font.

Bug: 21525318
Bug: 21525012
Bug: 21524421
Bug: 21521330
Bug: 21520316
Bug: 21518544
Bug: 21517912
Bug: 21503807
Bug: 21502245
Bug: 21501669
Bug: 21525905
Bug: 21524018
Bug: 21503952
Bug: 21502678
Change-Id: I93cf7119b45ed3c080cd39d631a687e0ef9fd8ce
 2015-06-04 15:39:43 -07:00
Jorim Jaggi
1c047b5777 am 81f2992f: Merge "Speed up recents -> app #2" into mnc-dev 
* commit '81f2992fac1667336cc526a380c696258569de09':
  Speed up recents -> app #2
 2015-06-04 22:38:51 +00:00
Jorim Jaggi
749e373e0f am 75289664: Merge "Speed up recents -> app" into mnc-dev 
* commit '752896648e9c15ea5884b1683ee14daae5147ad3':
  Speed up recents -> app
 2015-06-04 22:38:48 +00:00
Alan Viverette
c3b68dff16 Manually jump ripples when preemptively aborting RT animation 
Bug: 21079749
Change-Id: If79dcef59aba616c0446efc623863f563cb16250
 2015-06-04 15:33:52 -07:00
Jorim Jaggi
81f2992fac Merge "Speed up recents -> app #2" into mnc-dev 2015-06-04 22:30:57 +00:00
Jorim Jaggi
752896648e Merge "Speed up recents -> app" into mnc-dev 2015-06-04 22:30:27 +00:00
Alex Klyubin
8c415cf32c am 2c378078: Merge "Export KeyFactory backed by Android Keystore." into mnc-dev 
* commit '2c37807801dce09b0f0ba1e6360d84b163d88abe':
  Export KeyFactory backed by Android Keystore.
 2015-06-04 22:25:46 +00:00
Alex Klyubin
2c37807801 Merge "Export KeyFactory backed by Android Keystore." into mnc-dev 2015-06-04 22:16:19 +00:00
John Reck
6f5c99a888 am dde606df: Merge "Iterate step of launch & iterate" into mnc-dev 
* commit 'dde606df7f20f5d14b9d1440f1bd80e8d0d3969c':
  Iterate step of launch & iterate
 2015-06-04 22:04:32 +00:00
Jorim Jaggi
76bb1e1db2 am 3a4656e8: Merge "Make entering recents a lot faster" into mnc-dev 
* commit '3a4656e8874a7bfa11ff8c68dfca87b7f399ff36':
  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-04 22:04:28 +00:00
Svet Ganov
fbd0288655 Update the pdfium library - framework 
Change-Id: I4880e9310c02c6e26d4560fb8515f2ce51c597f4
 2015-06-04 14:57:06 -07:00
John Reck
dde606df7f Merge "Iterate step of launch & iterate" into mnc-dev 2015-06-04 21:54:18 +00:00
Jorim Jaggi
3a4656e887 Merge "Make entering recents a lot faster" into mnc-dev 2015-06-04 21:52:14 +00:00
Tim Kilbourn
9c76cfae29 am 57914802: Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev 
* commit '57914802b5c514a84e69b52c8897eaa3a3e74aa7':
  DO NOT MERGE Fix DropBoxManager.Entry parcels with fds.
 2015-06-04 21:50:24 +00:00
Yohei Yukawa
7b31afd6c8 am 34df42d5: Merge "Make IMMS#mSettingsObserver multiuser-aware." into mnc-dev 
* commit '34df42d59753e7721b346d1048c686d204a44da3':
  Make IMMS#mSettingsObserver multiuser-aware.
 2015-06-04 21:41:32 +00:00
Paul Lawrence
df28b1916f am 8836528d: Merge "Move crypt commands to a different listener in vold" into mnc-dev 
* commit '8836528d7bc86742c973200f861328b3f9cbd421':
  Move crypt commands to a different listener in vold
 2015-06-04 21:41:29 +00:00
Pavlin Radoslavov
102e015402 am d2b033ae: Add a missing check for null pointer. 
* commit 'd2b033aeb4123ec92892495c262e0272ffb7ecdc':
  Add a missing check for null pointer.
 2015-06-04 21:41:25 +00:00
Tim Kilbourn
57914802b5 Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev 2015-06-04 21:40:15 +00:00
Yohei Yukawa
34df42d597 Merge "Make IMMS#mSettingsObserver multiuser-aware." into mnc-dev 2015-06-04 21:38:20 +00:00
Tim Kilbourn
4bf27b53b9 DO NOT MERGE Fix DropBoxManager.Entry parcels with fds. 
When the socketpair communication channel was added to
ParcelFileDescriptor, the CREATOR method for DropBoxManager.Entry was
not updated to read the extra fd from the Parcel. This was causing reads
to end too early.

Also removed comments referring to the now-deleted native methods in
the native Parcel implementation.

Change-Id: I49a9691da6ea927382ceb2fcbfdc7985a601111b
(cherry picked from commit ba953230f71e5117d819d9e7153da8304b141695)
 2015-06-04 21:37:50 +00:00
Paul Lawrence
8836528d7b Merge "Move crypt commands to a different listener in vold" into mnc-dev 2015-06-04 21:32:38 +00:00
Alex Klyubin
43fff84a08 am cb94dd1c: Merge "Expose RSA and ECDSA Signature from Android Keystore Provider." into mnc-dev 
* commit 'cb94dd1cee4ec3cc8ebc1fe3df92d72071768e9d':
  Expose RSA and ECDSA Signature from Android Keystore Provider.
 2015-06-04 21:30:03 +00:00
Pavlin Radoslavov
d2b033aeb4 Add a missing check for null pointer. 
There is a race condition when processing intents inside
PairingCancelHandler.onReceive() that could trigger NPE.
A speculative list of events (untested) that could trigger it:

1. Trigger Pairing Cancel for a Bluetooth device.
2. Turn Off Bluetooth
   This should call CachedBluetoothDeviceManager.onBluetoothStateChanged()
   and should remove the device from (1) from the list of cached devices
3. BluetoothEventManager.PairincCancelHander.onReceive() receives
   an intent about about Pairing Cancel event.
   Within the processing of that intent, cachedDevice.getName()
   is called without checking whether cachedDevice is null.
   In this specific example, cachedDevice could be null because of (2)

Bug: 21368124
Change-Id: I86f5d5287b440d1d2e0fe147278b1c2257902e95
 2015-06-04 21:29:34 +00:00
Alex Klyubin
cb94dd1cee Merge "Expose RSA and ECDSA Signature from Android Keystore Provider." into mnc-dev 2015-06-04 21:19:37 +00:00
Jeff Brown
017efadc2e am 16422b25: Merge changes If241e329,Ib69b6987 into mnc-dev 
* commit '16422b25f7a814be0c3ceba44a4e9e62b10427a5':
  Clarify docs on registerContentObserver.
  Add missing docs to StateSet.
 2015-06-04 21:18:40 +00:00
Nancy Chen
1319e2f82b am 65561b5c: Merge "Add carrier package name field to check for carrier vvm app." into mnc-dev 
* commit '65561b5c5100d4d4b18d5086cba52d796122e78d':
  Add carrier package name field to check for carrier vvm app.
 2015-06-04 21:18:35 +00:00
Vadim Tryshev
f46a5828ac am c51c3f64: Merge "Processing non-long clicks on application icon." into mnc-dev 
* commit 'c51c3f6436bc4e101c63c388fd6ba8b46f2d4189':
  Processing non-long clicks on application icon.
 2015-06-04 21:18:30 +00:00
Alex Klyubin
28d99c2419 am df6c6702: Merge "Streamline Android Keystore delete entry operation." into mnc-dev 
* commit 'df6c67028a0341a5b05d5097e12ae4d0cbb69fa4':
  Streamline Android Keystore delete entry operation.
 2015-06-04 21:18:26 +00:00