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

235672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson
c331564972 Merge "Skip animation in error case, log for further investigation." into nyc-dev 
am: 6b03ff8d57

* commit '6b03ff8d57bd8c211eb3b3dc2abdb96a1bfa81dc':
  Skip animation in error case, log for further investigation.
 2016-03-01 22:24:44 +00:00
Abhijith Shastry
2d54a7e49c Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev 
am: 35293d2ff7

* commit '35293d2ff7de5d98f9bc5a4417de66147f4a1cf5':
  Add deprecated annotation to launchManageBlockedNumbersActivity API.
 2016-03-01 22:22:44 +00:00
Jeff Sharkey
cfc7bc8137 Merge "Suppress StopInfo exception based on target API." into nyc-dev 
am: d1caf8560d

* commit 'd1caf8560df4860fa7fcbd63afe359990f72d9f4':
  Suppress StopInfo exception based on target API.
 2016-03-01 22:20:58 +00:00
Chris Wren
46e39cfd7c Merge "add all those great comments from the other file." into nyc-dev 
am: f3179cf56a

* commit 'f3179cf56a34ca490d63570473470ee6f833e63b':
  add all those great comments from the other file.
 2016-03-01 22:18:24 +00:00
Jeff Sharkey
258be56dcd Make preferred activities encryption aware. 
Not all built-in apps are encryption aware, so match them all when
setting up preferred activities.

Bug: 27429841
Change-Id: I0fd2195714fac95d031813bab73125a5c7b6c81a
 2016-03-01 15:15:58 -07:00
Dongwon Kang
9cd89a403e Merge "TIF: Address API review comments" into nyc-dev 2016-03-01 22:11:47 +00:00
Alan Viverette
6b3f85f87e Use Holo date/time picker layouts on very small screens 
If the screen is smaller than "small" then use the Holo picker layouts.
Unifies the SavedState between delegates so that we can seamlessly
transition between them during configuration changes. Pushes the
DatePickerSpinnerDelegate up to the same level as the calendar delegate.

Bug: 27239893
Change-Id: Ida4dc2748d38bd766ae93d12aef15e963921939c
 2016-03-01 16:48:04 -05:00
George Mount
f445f76eca Merge "Clear child fragment manager after it is destroyed." into nyc-dev 2016-03-01 21:41:45 +00:00
George Mount
b67d34f10e Merge "Ensure that fragments are created in added order." into nyc-dev 2016-03-01 21:40:54 +00:00
Felipe Leme
9982b3076b Created netpolicy commands to manage UIDs blacklisted for network access 
while on background.

These commands will be used primarily in the CTS tests:

- list restrict-background-blacklist
- add restrict-background-blacklist UID
- remove restrict-background-blacklist UID

BUG:  27432317
Change-Id: Ie1148dcabbb2481ccd39659a813fac3776f84e3b
 2016-03-01 13:40:31 -08:00
Steve McKay
d511a090d2 Merge "Don't assert against Recents title." into nyc-dev 2016-03-01 21:39:27 +00:00
Steve McKay
355d82b67e Don't assert against Recents title. 
It was causing a failure.

Bug: 27383076
Change-Id: Ieb4693783831443e05f32333c181371b0eb4fb93
 2016-03-01 13:36:22 -08:00
Michael Wright
a75c2a7819 Merge "Show error message when pairing fails in SUW." into nyc-dev 2016-03-01 21:32:06 +00:00
Chris Wren
ccb7f018e6 Merge "Revert "add all those great comments from the other file."" into nyc-dev 2016-03-01 21:02:51 +00:00
Chris Wren
58f5bd5412 Revert "add all those great comments from the other file." 
This reverts commit 72a4bbc694aef402a9a3fc1656d8bf26decaeb70.

Change-Id: Ib351cdd85b8daf17fecc23a3851dda9fb89e477c
 2016-03-01 21:02:21 +00:00
Dianne Hackborn
a6dcaa6f84 Merge "Fix issue #27317952: PendingIntent.getIntent() should be protected" into nyc-dev 2016-03-01 20:57:02 +00:00
Jason Monk
a2ad1706f0 Merge "Handle density changes in QS" into nyc-dev 
am: e636afd901

* commit 'e636afd901a58ff54433c907a324ed56d4d33f9c':
  Handle density changes in QS
 2016-03-01 20:53:25 +00:00
Selim Cinek
237811fa92 Notification groups with only one child behave nicer when swiping 
am: a26ddbaf7b

* commit 'a26ddbaf7b5dd642e95cb7be33137312a799546a':
  Notification groups with only one child behave nicer when swiping
 2016-03-01 20:49:42 +00:00
Selim Cinek
30224519ca Fixed a bug where children were not / incorrectly userlocked 
am: 8e0c498165

* commit '8e0c4981656a7def112b10c1bec8e9a00142aa52':
  Fixed a bug where children were not / incorrectly userlocked
 2016-03-01 20:46:31 +00:00
Selim Cinek
1ec621e3f8 Expanding first child in a group now if it\'s the only one 
am: 898d173b92

* commit '898d173b92fb78d56bce208da31808d0852c7762':
  Expanding first child in a group now if it's the only one
 2016-03-01 20:43:14 +00:00
Anna Galusza
3204251a4a Throw exception from SoftKeyboardController if connection is dead and declare 
SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class.
Bug: 27364143

Change-Id: I02c23fbfab1eae8b2a155b1d9c3857e4eb6addb1
 2016-03-01 12:40:19 -08:00
Todd Kennedy
4f858aaa5a Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev 2016-03-01 20:39:59 +00:00
Jason Monk
1fbcefd8d9 Merge "Fix QS edit BGs" into nyc-dev 
am: ee70388723

* commit 'ee70388723af0a5d3b9977aa014a8c647a3b1d34':
  Fix QS edit BGs
 2016-03-01 20:34:58 +00:00
Wale Ogunwale
4722231184 Merge "Changed logging format of lost windows to reduce confusion." into nyc-dev 2016-03-01 20:34:50 +00:00
Wale Ogunwale
6e66695777 Merge "Add activity onStop lifecycle to event logs." into nyc-dev 2016-03-01 20:34:15 +00:00
Phil Burk
f1bc7deffc Merge "AudioTrack: docs for getUnderrunCount()" into nyc-dev 
am: 88353459e2

* commit '88353459e28059d440d76d1e78fb6a2bce157fb3':
  AudioTrack: docs for getUnderrunCount()
 2016-03-01 20:31:18 +00:00
Robin Lee
ff3c66b352 Merge "More sensible return code for Credentials.deleteAll" into nyc-dev 2016-03-01 20:25:19 +00:00
Glenn Kasten
1850c48eac Merge "Add use for audio_unique_id_t" into nyc-dev 
am: 0ce76e9204

* commit '0ce76e920492ce12226591cb0fd66527c7723eed':
  Add use for audio_unique_id_t
 2016-03-01 20:24:33 +00:00
Winson
8da4971577 Merge "Disable extracting the bg color from the window background." into nyc-dev 
am: 1f3eca97b9

* commit '1f3eca97b9a929f2fae33cea930b84ddd2c5d602':
  Disable extracting the bg color from the window background.
 2016-03-01 20:19:08 +00:00
Felipe Leme
8127a3cd75 Merge "Created metric events for scoped directory access API." into nyc-dev 
am: c50bf8e33e

* commit 'c50bf8e33e67c26b5dc4fd18ec665d2985fd42e7':
  Created metric events for scoped directory access API.
 2016-03-01 20:15:23 +00:00
Santos Cordon
fa6662c6ab Merge "Adding toStrings() to the API." into nyc-dev 
am: 3041048a0a

* commit '3041048a0a978e4b43d0dec64ec58de552644920':
  Adding toStrings() to the API.
 2016-03-01 20:12:35 +00:00
Jason Monk
bbcdab6f01 Merge "Fix difference in icon size for quick QS" into nyc-dev 2016-03-01 20:10:24 +00:00
Robin Lee
2f4286b792 Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev 2016-03-01 20:09:45 +00:00
Julia Reynolds
e06a9cc973 Merge "Protect against a lack of metadata." into nyc-dev 
am: 9e65739c19

* commit '9e65739c19a296de06e9a55981cbafa8ee3af94f':
  Protect against a lack of metadata.
 2016-03-01 20:08:07 +00:00
Jakub Pawlowski
ecc873d5ee Merge "Hide android.bluetooth.OobData" into nyc-dev 2016-03-01 20:04:34 +00:00
Julia Reynolds
6144df9712 Merge "Fix app icon in notification guts." into nyc-dev 
am: 1c7cd0a882

* commit '1c7cd0a8826350d08e3576627c8cd61d5c6b20bd':
  Fix app icon in notification guts.
 2016-03-01 20:02:48 +00:00
Adrian Roos
eca23784db Merge "Improve mergeability of metrics_constants.proto" into nyc-dev 2016-03-01 20:00:53 +00:00
Jason Monk
ec87a878d3 Fix difference in icon size for quick QS 
Bug: 27371482
Change-Id: I7c1316bf3b3ff6dfde0a92a6c8b9599c2f203503
 2016-03-01 15:00:16 -05:00
Adrian Roos
159ef7b4e9 Improve mergeability of metrics_constants.proto 
Change-Id: I6f964d85b5d1b85a04bc8ac2a87453455be93719
 2016-03-01 11:59:15 -08:00
Winson
9da1885047 Fixing regression in creating dismiss descriptions. 
Bug: 27411256
Change-Id: I39f56257544d593838349049208fe59f551100eb
 2016-03-01 19:58:06 +00:00
Winson Chung
6b03ff8d57 Merge "Skip animation in error case, log for further investigation." into nyc-dev 2016-03-01 19:57:05 +00:00
Abhijith Shastry
35293d2ff7 Merge "Add deprecated annotation to launchManageBlockedNumbersActivity API." into nyc-dev 2016-03-01 19:56:06 +00:00
Jeff Sharkey
d1caf8560d Merge "Suppress StopInfo exception based on target API." into nyc-dev 2016-03-01 19:55:14 +00:00
Steve McKay
8b8a6fd193 Ensure directory names are aligned correctly... 
In list view...and don't show dir dates, even when present.
In fact, no details on folders at all when in list view.
Also improve layout of files without details (if they exist).

Bug: 27406730
Change-Id: Ida4b5f99666c4a145ca98a3c15c480e59a76b4a6
 2016-03-01 11:49:21 -08:00
Przemyslaw Szczepaniak
b8f106bbca Merge "Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6" am: ffa1c08440 
am: 51969bff58

* commit '51969bff58a6784959e940d2b0f88b301caa50de':
  Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6
 2016-03-01 19:49:12 +00:00
Andreas Gampe
0f6f34b4eb Merge "Frameworks/base: Refactor TextView initialization" into nyc-dev 
am: 4f655de3de

* commit '4f655de3de5819c1076b83747c135554dfd22708':
  Frameworks/base: Refactor TextView initialization
 2016-03-01 19:47:19 +00:00
Keun-young Park
614955d3f9 Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev 
am: 63f2c9b0cb

* commit '63f2c9b0cb2d041202978369ccb9ed3726cd8e3b':
  make isUiModeLocked, isNightModeLocked test api
 2016-03-01 19:45:16 +00:00
Nimrod Gileadi
e9be5da686 Close InputStream in BatteryStatsHelper 
Bug: 17760659
Bug: 27376093
Change-Id: I5e6471f73b3258067fb670a4b66ddc51be62b6ec
(cherry picked from commit e618b53081d9a173305b7c72cab4c2ed6ca2dcec)
 2016-03-01 19:43:52 +00:00
Clara Bayarri
ab525cb808 Merge "Fix Fingerprint confusing personal and work fingerprints when unified" into nyc-dev 
am: 78f335e753

* commit '78f335e7537184093bd78fc22a1ce64c34bd01a5':
  Fix Fingerprint confusing personal and work fingerprints when unified
 2016-03-01 19:42:35 +00:00
Chris Wren
f3179cf56a Merge "add all those great comments from the other file." into nyc-dev 2016-03-01 19:38:45 +00:00