Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
229,657 Commits 3 Branches 0 Tags
e05d8fb91bdb579d2b532e6c4ea529b18ded2bd8
Commit Graph

229657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
e05d8fb91b Fix FeatureSplit tests to work properly with Java code 
Change-Id: I2f6d770c860c05e0d5a407fd76dc59dd748e3c3f
 2016-01-14 15:14:59 -08:00
Adam Lesinski
44859db74b Merge "AAPT2: Variety of small fixes to get the build working" 2016-01-14 02:51:02 +00:00
Adam Lesinski
52364f7ae3 AAPT2: Variety of small fixes to get the build working 
- Add option to rename package in AndroidManifest.xml
- Support default versionName and versionCode
- Accept True and False as valid booleans

Change-Id: I400e350b9dcd0fd1c197d1929144299c7823617d
 2016-01-13 18:48:24 -08:00
Jiaquan He
e7d716d5e3 Add support for shortcuts with the shift key. 
Now shortcuts with the shift key can be defined in
frameworks/base/packages/SettingsProvider/res/xml/bookmarks.xml.

Sample:

<bookmark
    package="package"
    class="package.Class"
    shift="true"
    shortcut="z"  />

Bug 26540880

Change-Id: Ib6d6ea59124226d4e4eb8ec9972059f2d71bd77e
(cherry picked from commit e7319ecbbe865db8884914ceb10f526f4e160a64)
 2016-01-14 02:36:58 +00:00
Daichi Hirono
cc1251b9b2 Merge "Change offset and size arguments of MtpDevice#getPartialObject to Java long." 2016-01-14 02:28:45 +00:00
Dongwon Kang
1ef6a06e11 Merge "Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED" 2016-01-14 02:16:23 +00:00
Dongwon Kang
32cb9ab5cc Fix javadoc related to ACTION_MEDIA_RESOURCE_GRANTED 
This addresses comments left in If506a533c5c7b567e770217a9430bf68b539677a

Change-Id: I6f952db6a8fa246d974bab556be3e21fe1b7f3da
 2016-01-13 18:11:10 -08:00
Doris Liu
2300b83462 Merge "Properly handle the negative scaling factor of canvas in VectorDrawable" 2016-01-14 01:30:02 +00:00
Doris Liu
e410a357f5 Properly handle the negative scaling factor of canvas in VectorDrawable 
Bug: 26489687
Change-Id: I91cce34759fbbac206cd59f4636fd92194396c87
 2016-01-13 17:23:33 -08:00
Jorim Jaggi
fdbdb9f9c6 Merge changes I55d96ec3,I0ebc4639 
* changes:
  Reenable task preloading in recents
  When creating docked stack, use SnapAlgorithm
 2016-01-14 01:08:52 +00:00
Adam Lesinski
89a697a7e7 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b am: a5c7106017 
am: 6a8c328d73

* commit '6a8c328d7386d19f4590dfbfc71338b1ec208fb7':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 01:05:24 +00:00
Adam Lesinski
6a8c328d73 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev am: d2e215978b 
am: a5c7106017

* commit 'a5c71060174c5357c75592998fb095e768eca8bd':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:59:58 +00:00
Adam Lesinski
a5c7106017 Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 
am: d2e215978b

* commit 'd2e215978be9df2f3d2bf56eb1c857c6a1bc420a':
  UsageStats: Use new settings key idle_duration2 for app idle
 2016-01-14 00:54:10 +00:00
Pavel Zhamaitsiak
1121576a6e Merge "Add ITelephonyDebug.aidl" into mm-wireless-dev 
am: 4a4345b681

* commit '4a4345b681f430bc76bed964eb3d4d569539130e':
  Add ITelephonyDebug.aidl
 2016-01-14 00:49:09 +00:00
Adam Lesinski
d2e215978b Merge "UsageStats: Use new settings key idle_duration2 for app idle" into mnc-dr1.5-dev 2016-01-14 00:45:31 +00:00
Daichi Hirono
2dd48256e9 Change offset and size arguments of MtpDevice#getPartialObject to Java 
long.

To represents full range of 32-bit unsigned integer, we should use
jlong instead of jint.

BUG=26284424

Change-Id: Id3fa9e3daa778c204ab8e38f821d454c709c317a
 2016-01-14 09:42:59 +09:00
Nancy Zheng
231c401745 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 am: f474056e99 am: f4c56a21a3 
am: b05f242bc8

* commit 'b05f242bc809196a58b1142665a336fc23dc7f9c':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:34:11 +00:00
Nancy Zheng
b05f242bc8 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 am: f474056e99 
am: f4c56a21a3

* commit 'f4c56a21a389e70b472e4e7e586c7cf59a444f8e':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:23:20 +00:00
Jorim Jaggi
a0fdeec66c Reenable task preloading in recents 
Make sure to call the task stack changed listener only when
app visibilities changed. This fixes the problem of too many
callbacks when just focusing another activity.

Bug: 26420341
Change-Id: I55d96ec367f7461be1f3e35bc0d12ae4b050ece0
 2016-01-13 16:20:38 -08:00
Jorim Jaggi
d434dcbfc9 When creating docked stack, use SnapAlgorithm 
To make sure the bounds snapped to a snap position are
set from the very beginning.

Change-Id: I0ebc463926dd17e0deeefc211b097f28a6456b96
 2016-01-13 16:19:56 -08:00
Selim Cinek
77d8a04959 Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0cd am: 804ff964af 
am: a8a4d29aec  -s ours

* commit 'a8a4d29aecd1eca223245d1db1231707992c9341':
  Fixed a crash with the heads up manager
 2016-01-14 00:12:20 +00:00
Nancy Zheng
f4c56a21a3 Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1 
am: f474056e99

* commit 'f474056e99de892b731155989ee0d9dae1d3eea7':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-14 00:12:14 +00:00
Nancy Zheng
f474056e99 Pulling in https://android-review.googlesource.com/#/c/186482/1 
am: 74dfcf90f1

* commit '74dfcf90f18d8d0e1128707a5986c4fa94d70350':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
 2016-01-13 23:59:42 +00:00
Makoto Onuki
9bd64e2b88 Merge "API for blocked number provider" 2016-01-13 23:51:35 +00:00
Nancy Zheng
74dfcf90f1 Pulling in https://android-review.googlesource.com/#/c/186482/1 
Fix memory leak in HWUI

std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.

Bug: 26116596
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
 2016-01-13 15:23:56 -08:00
Ian Pedowitz
d901155166 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2016-01-13 23:21:49 +00:00
Ian Pedowitz
46f890188c Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f am: 0cd5e9f475 
am: 105108209f

* commit '105108209fc35b5029e5a728c09f6eaf91b8a940':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:21:05 +00:00
Ian Pedowitz
f4bb9772a4 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f am: 0cd5e9f475 
am: 105108209f

* commit '105108209fc35b5029e5a728c09f6eaf91b8a940':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:19:39 +00:00
Robert Greenwalt
47359e813d Merge "Add free short codes for Direct Carrier Billing in Google Play" am: d736cba6e7 
am: be81d28798

* commit 'be81d28798358aed3a3d7de2464242df15e07486':
  Add free short codes for Direct Carrier Billing in Google Play
 2016-01-13 23:18:06 +00:00
Selim Cinek
a8a4d29aec Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev am: d23f1eb0cd 
am: 804ff964af

* commit '804ff964afed8154c5b169cd1f2bb6e89dc05f2f':
  Fixed a crash with the heads up manager
 2016-01-13 23:14:26 +00:00
xin He
7692bb21a1 Merge "Initial codes for Quality network selection" 2016-01-13 23:14:16 +00:00
Victor Chang
f577d79e43 Merge "Show work missed call notification for sim call from work contacts" 2016-01-13 23:11:36 +00:00
Ian Pedowitz
4395343e0c Merge "Add ITelephonyDebug.aidl" 2016-01-13 23:10:41 +00:00
Ian Pedowitz
105108209f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev am: 624d43b66f 
am: 0cd5e9f475

* commit '0cd5e9f475cd31535ad33a6d2151f2270bd3f29c':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:10:29 +00:00
Selim Cinek
804ff964af Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev 
am: d23f1eb0cd

* commit 'd23f1eb0cd9893395573a4059be195e8fdb1007a':
  Fixed a crash with the heads up manager
 2016-01-13 23:10:20 +00:00
Wale Ogunwale
3a9154c8a0 Merge "Fix build breakage." 2016-01-13 23:10:15 +00:00
Pavel Zhamaitsiak
14ef09514b Add ITelephonyDebug.aidl 
(cherry picked from commit f91818ca34)

Change-Id: Ie3c846a90632e3afa793e6e60f5a3390a260c5a5
 2016-01-13 15:09:16 -08:00
Wale Ogunwale
b2d135694f Fix build breakage. 
Bug: 22405482
Change-Id: I8fc522885801e9735544ec3820c8fdd4a4368d71
 2016-01-13 15:08:29 -08:00
Pavel Zhamaitsiak
527e24d617 Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am: 9ae30e69ad am: fba6bccff5 
am: e737a028b1

* commit 'e737a028b1b1151d43e3ecceb1b2bb10e0c75665':
  Add WiFi Calling overlays for T-Mobile's MCCMNCs
 2016-01-13 23:08:20 +00:00
xinhe
f7705c3ed6 Initial codes for Quality network selection 
In this change list, the old WifiAutojoin module is
    refactored initially. The old WifiAutojoinController is
    replaced with a new WifiQualifiedNetworkSelector.
    WifiConfiguration, WifiConfigureStore and
    WifiStateMachine have been modified accordingly. The new
    network selection logic is refactored with a more clear
    and deterministci one. To refer to thedescribed in
    details, in "Quality Network Selection and Connectivity
    Scan Management in N". The link of the document is:
    https://docs.google.com/document/d
    /1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c

cherry-picked from 8d106780b6
and make changes on WiFiConfigurationSerializer.java since
it is not on mm-wireless-dev
Bug:26012244
Change-Id: I44e454544b630b891c9a58a18b5a028edcce580f
 2016-01-13 15:06:30 -08:00
Keisuke Kuroyanagi
a2477acec9 Tests for getPrimaryHorizontal with grapheme boundaries am: a5c53291a8 am: 3bb115ba5c 
am: 404a22cf74

* commit '404a22cf74f47bbdbeccb3452aefcfd3c34eee74':
  Tests for getPrimaryHorizontal with grapheme boundaries
 2016-01-13 23:05:34 +00:00
Adam Lesinski
860bd87d5e Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am: f2cc98bc96 am: 112e26646f 
am: dd0957caf4  -s ours

* commit 'dd0957caf4d16c46971444b00befb415f9a6d549':
  UsageStats: Fix issue where initializing data for first time would cause crash
 2016-01-13 23:03:08 +00:00
Ian Pedowitz
0cd5e9f475 Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 
am: 624d43b66f

* commit '624d43b66f039e3b0f33274486512621919d96a3':
  Revert "Avoid drawable invalidation during draw()"
 2016-01-13 23:01:29 +00:00
Selim Cinek
d23f1eb0cd Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev 2016-01-13 23:01:13 +00:00
Ian Pedowitz
624d43b66f Merge "Revert "Avoid drawable invalidation during draw()"" into mnc-dr1.5-dev 2016-01-13 22:47:45 +00:00
Victor Chang
9359ee18a5 Show work missed call notification for sim call from work contacts 
BUG=26082618

Change-Id: I82bf3d9835589a309101b23536748ae2b27b1d2d
 2016-01-13 22:44:52 +00:00
Xiyuan Xia
ee9ca3cde7 Merge "Fix a race condition during async credential check" 2016-01-13 22:32:21 +00:00
Filip Gruszczynski
4d0f5ee232 Merge "Fix delivery of visible behind cancel action." 2016-01-13 22:01:05 +00:00
Filip Gruszczynski
4e7fe7142e Fix delivery of visible behind cancel action. 
Bug: 26471802

Change-Id: I4e35f904080d1c57bbb034725d34d8c5bca87238
 2016-01-13 14:00:31 -08:00
Yin-Chia Yeh
b99ed40fb0 Merge "Camera: cleanup dead code" 2016-01-13 21:50:02 +00:00