Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,155 Commits 3 Branches 0 Tags
bece80645e2b2d84ea65aabfa7fc01d5ad633708
Commit Graph

8495 Commits

Author SHA1 Message Date
Seigo Nonaka
d4474cb945 Remove dead code from IMMS. 
MSG_SHOW_IM_PICKER is no longer used.  Also by removing that message, we
can simplify showInputMethodMenu/showINputMethodSubtypeMenu.

Change-Id: I7002ff063e490928309e9a9a0f6557ce3d12e6aa
 2015-05-05 12:49:34 +09:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Fabrice Di Meglio
44b60be189 Merge "Add user selectable Default Browser feature - part 5" into mnc-dev 2015-05-05 00:11:06 +00:00
Fabrice Di Meglio
7d1a9d0562 Add user selectable Default Browser feature - part 5 
- check and clear default Browser if its package is no more available

See bug #20144393

Change-Id: I60a1b8f11058f3a4f9dc80440027ab72fe7cce2e
 2015-05-04 17:06:33 -07:00
Sanket Padawe
5c33a2e3ec Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev 2015-05-04 20:44:52 +00:00
Fabrice Di Meglio
8ef631de47 Merge "Add user selectable Default Browser feature - part 4" into mnc-dev 2015-05-04 19:59:35 +00:00
John Spurlock
ad2399f3be Merge "Zen: Implement calendar event system condition provider." into mnc-dev 2015-05-04 19:07:36 +00:00
John Spurlock
2f096ed766 Zen: Implement calendar event system condition provider. 
- Wire up basic implementation for the system provider that
   handles event-based DND subscriptions.
 - Backed by the standard system calendar content provider.
 - Move shared time utils to base class, clean up logging.

Bug: 20064962
Change-Id: I070b6baa580c592c2ab4101c6b44a254787f9dd7
 2015-05-04 14:29:41 -04:00
John Reck
1641c0cb0b Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev 2015-05-04 14:34:39 +00:00
Fabrice Di Meglio
4c92949993 Add user selectable Default Browser feature - part 4 
- when selecting a default Browser App, make the others Browser Apps
not capable to open URLs automatically

See bug #20144393

Change-Id: I6ffaafbfb1a2571c0eba90af5c1648150b020559
 2015-05-01 18:52:29 -07:00
Bryce Lee
13428b5079 am f626c679: am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'f626c679fdd7e44c6cf0eb2d2f6be786636a90bc':
  Add configuration to allow animations during low power mode.
 2015-05-02 01:22:24 +00:00
Sanket Padawe
7094d22022 Adding "Connected, no Internet" string in Wifi nw summary. 
Bug: 17380953
Change-Id: I9664bcbf33832fe722e7d2b3125939287ee98098
 2015-05-01 16:55:00 -07:00
Svet Ganov
574f53793d Merge "Add body sensors app op - framework base" into mnc-dev 2015-05-01 23:09:52 +00:00
John Reck
c6e2e8ff47 Move AssetAtlas off of SkBitmap* 
Switched to SkPixelRef*

Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
 2015-05-01 14:30:21 -07:00
Svet Ganov
b9d71a6f89 Add body sensors app op - framework base 
Change-Id: Idd5cd573fab3405e5b2a6e51d2d9d115650826e9
 2015-05-01 13:56:04 -07:00
Fabrice Di Meglio
83bb765b04 Merge "Add IntentFilter auto verification - part 7" into mnc-dev 2015-05-01 18:27:32 +00:00
Fabrice Di Meglio
1de3f0dcaf Add IntentFilter auto verification - part 7 
- update packages priming so that it effectively save its data
- use ArraySet instead of ArrayList for list of domains (a set
is preferable as we dont want duplicates)

See bug #19628909

Change-Id: I52085f4bc28dcbc7fbc02ba0898abcd4ae9cf1e2
 2015-05-01 11:24:44 -07:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Jeff Sharkey
a320505f3a Merge "Move both app code and data together." into mnc-dev 2015-05-01 16:22:46 +00:00
John Reck
78760b4ae4 Merge "A bunch more cleanups" into mnc-dev 2015-05-01 14:42:51 +00:00
Wei Wang
3b72899c71 am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit 'c869bbfd94549039624f76740f9bf858b25cfa56':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:41:17 +00:00
Wei Wang
c869bbfd94 am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit '50b37f8c6a7237af29f533b83ee2176301d107ea':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:30:36 +00:00
John Reck
6dc2c89b49 am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '0385dc8d12088d98ab76de86db4cd8e1ffa34af7':
  Change how Java Bitmaps are accessed in a few places
 2015-05-01 01:32:46 +00:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master 
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
 2015-04-30 16:17:16 -07:00
Jeff Sharkey
bd0e9e4958 Move both app code and data together. 
Refactor app movement code into the normal install flow as a new
flavor of InstallArgs.  It copies both app code and data during the
copy step, and just updates paths during the rename step.

Measure free space before kicking off a move.  Spawn a thread to
derive a hacky progress estimate based on free disk space counting
down.

Remove checkFreeStorage() and getLegacyNativeLibraryPath() which
nobody was calling.  Fix deadlocks around package broadcasts, and fix
wrong lock ordering when loading packages.

Bug: 19993667, 20275578, 20370140
Change-Id: I7bbf14c924a724d6ebb8a41a02434750fa3302bc
 2015-04-30 16:04:53 -07:00
Wei Wang
67d8416b8e Honor Ble scanning settings from Settings UI. 
Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
 2015-04-30 14:45:17 -07:00
John Reck
3731dc220e A bunch more cleanups 
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI

Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
 2015-04-30 14:34:55 -07:00
John Reck
0385dc8d12 am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 
* commit '1d8aae3b1924b2340250bdffe491819a26eea5fe':
  Change how Java Bitmaps are accessed in a few places
 2015-04-30 21:20:51 +00:00
John Reck
db672b03a2 Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev 2015-04-30 21:00:08 +00:00
Mady Mellor
04f2fe3958 am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev 
* commit 'd73f05f5f0ec3a212e4390d790c0229892c21930':
  Add onStylusButtonPress listener to View
 2015-04-30 20:36:06 +00:00
Bryce Lee
f626c679fd am a7f07fc3: Merge "Add configuration to allow animations during low power mode." into lmp-mr1-modular-dev 
* commit 'a7f07fc35ba647465503fe0cba3d4521b68d89c1':
  Add configuration to allow animations during low power mode.
 2015-04-30 20:01:02 +00:00
John Reck
ed207b9274 Change how Java Bitmaps are accessed in a few places 
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
 2015-04-30 12:46:57 -07:00
Mady Mellor
2619ef3918 Merge "Add onStylusButtonPress listener to View" into mnc-dev 2015-04-30 19:06:45 +00:00
Svetoslav
e80045ac64 am cae8686c: am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev 
* commit 'cae8686c8853de745baf8a26406d18efab09a380':
  Add use fingerprint app op - framework
 2015-04-30 18:58:30 +00:00
Svetoslav
cae8686c88 am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev 
* commit '0165cf4d719ab6560507a18ffd7375b0ad850622':
  Add use fingerprint app op - framework
 2015-04-30 18:39:32 +00:00
Svetoslav
3327f3d688 Merge "Add use fingerprint app op - framework" into mnc-dev 2015-04-30 18:05:18 +00:00
Andreas Gampe
fcda22b1fe Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev 2015-04-30 17:53:51 +00:00
Jean-Michel Trivi
e36846cbf1 am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit 'c8efc4490df6fb58bf333540cf746c68070345f5':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 17:26:29 +00:00
Jean-Michel Trivi
c8efc4490d am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 
* commit '3d42d2380f5af53ce299610e27f40a8d88930c89':
  AudioService receives callback for dynamic policy mix state changes
 2015-04-30 17:14:30 +00:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View 
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
 2015-04-30 09:58:35 -07:00
Jean-Michel Trivi
f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev 2015-04-30 16:43:19 +00:00
John Spurlock
b7ca2709c3 am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '0f4c6a8bdf6444d05a6d9de3b32ec2bc7f39f1b3':
  Zen: New event condition data model.
 2015-04-30 16:25:19 +00:00
John Spurlock
0f4c6a8bdf am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev 
* commit '1642e354ed10bc606f403ac6f529392f3f25dd2d':
  Zen: New event condition data model.
 2015-04-30 16:16:13 +00:00
John Spurlock
8f72b40370 Merge "Zen: New event condition data model." into mnc-dev 2015-04-30 15:45:55 +00:00
John Spurlock
d60258f2d3 Zen: New event condition data model. 
- Add system condition provider for calendar event-based rules.
 - Add stub condition provider for handling event conditions.
 - Add various shared items to support new settings subpage.

Bug: 20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
 2015-04-30 11:42:11 -04:00
Zoltan Szatmary-Ban
e5f6407994 am 2aab6de5: am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev 
* commit '2aab6de5a8370833077c3d58a64e615c33e52e0f':
  Fix potential NPE on devices without DPMS
 2015-04-30 15:35:11 +00:00
Benjamin Franz
c5e3d4361d am f225e6c6: am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit 'f225e6c6af849f965eec8392204b2491f17babac':
  Add package name extra to PackageInstaller callback
 2015-04-30 15:35:05 +00:00
Jeff Sharkey
bc493cabf5 am a54020c7: am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev 
* commit 'a54020c7ae1c7a28ea78f0fe44ad5da662a0bb1e':
  New "frozen" state during app move/upgrade.
 2015-04-30 15:34:41 +00:00
Zoltan Szatmary-Ban
2aab6de5a8 am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev 
* commit '795ec67721c565ffa15a4c283428227c954e7a5f':
  Fix potential NPE on devices without DPMS
 2015-04-30 15:20:27 +00:00
Benjamin Franz
f225e6c6af am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev 
* commit '550ab61ca54cc0366842263563f8061d56931fcd':
  Add package name extra to PackageInstaller callback
 2015-04-30 15:20:19 +00:00