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

147105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
b83127f0cf Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 2014-07-30 16:17:51 +00:00
Joe Fernandez
0d568c98c1 docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ 
Change-Id: Ifa8831e1594470ecf65761efea472de79aaf5ece
 2014-07-30 10:10:19 -07:00
Alan Lau
06a8455421 Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
7ab1900a5a Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying"" 
This reverts commit af60e56b39582ea90ccd7601cd06350a50bf6500.

Change-Id: I1aa698608773b9e540457831e11218f371c71268
 2014-07-30 17:35:29 +00:00
Geoff Mendal
b55853e8a3 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-07-30 16:17:51 +00:00
Geoff Mendal
bead503b15 Import translations. DO NOT MERGE 
Change-Id: Iec046e9a3d34bef3d8055f3eb00e243baf69c8fa
Auto-generated-cl: translation import
 2014-07-30 10:40:00 -07:00
Alan Lau
c006227265 Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""" into klp-modular-dev 2014-07-30 16:17:51 +00:00
Alan Lau
273906bb6a Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator"" 
This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f.

Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
 2014-07-30 17:30:15 +00:00
Chris Wren
b0d07db5ce am 6d23f4fd: Merge "Add a log and statistics for notification expansion." into lmp-dev 
* commit '6d23f4fdbe2c191000628e963d14fa8288a06d12':
  Add a log and statistics for notification expansion.
 2014-07-30 15:36:54 +00:00
Robin Lee
6a41c8c43a am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev 
* commit 'e6818f08d6d052bdb7d13effd22c32218e15d95d':
  Don't turn off screen after wiping user profiles
 2014-07-30 15:19:35 +00:00
PauloftheWest
fd2c6b468f am e33e0512: Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
* commit 'e33e0512b0c53f386112777057dbf332927e3688':
  Fixed a bug where Bluetooth was turned on with the drop-down in quick settings.
 2014-07-30 15:14:29 +00:00
Jorim Jaggi
3fe5ea3e78 am e8404d19: Implement nice header transition when opening QS 
* commit 'e8404d1948a9e449e82a7c3bd57ee264f9b02f2b':
  Implement nice header transition when opening QS
 2014-07-30 15:10:07 +00:00
PauloftheWest
64fe15846c Fixed a bug where Bluetooth was turned on with the drop-down in quick settings. 
Bug: 16547579

Change-Id: I3326aa1f4076d46dc0f8f87f14b44f097e684105
 2014-07-30 15:08:10 +00:00
Jorim Jaggi
90e0df291f Implement nice header transition when opening QS 
Bug: 15192264
Change-Id: Id7d67d6067882982e2ca195e257dfa1b73db2cf6
 2014-07-30 15:05:00 +00:00
Nicolas Prevot
807543b9bf am 43586171: Removing old tag TAG_FORWARDING_INTENT_FILTERS. 
* commit '435861715059c79ab4459ecedb0908ffc8c12878':
  Removing old tag TAG_FORWARDING_INTENT_FILTERS.
 2014-07-30 14:30:26 +00:00
Nicolas Prevot
f288907d05 am 4bb6ae67: Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-dev 
* commit '4bb6ae67b08ad4d0d508c269e97ae4d1c7be0e79':
  Fixing a NullPointerException in isProfileOwnerApp.
 2014-07-30 14:30:22 +00:00
Christoph Studer
fa00735f92 am 6d28d0cc: NoListener: Optimize RankingMap 
* commit '6d28d0cc4e0fe97fd7841f402766d38e29a739cc':
  NoListener: Optimize RankingMap
 2014-07-30 14:30:16 +00:00
Kenny Guy
9804485717 am 7d31e8dc: Merge "Add optional handler to LauncherApps callback" into lmp-dev 
* commit '7d31e8dc1469e0768bd5fcd856275238950fc589':
  Add optional handler to LauncherApps callback
 2014-07-30 14:30:12 +00:00
Christoph Studer
f89cb25366 am 64130a59: Notification: Forward setUser() call to publicVersion 
* commit '64130a59d2fbc7175a846c0e38be7534b413e25b':
  Notification: Forward setUser() call to publicVersion
 2014-07-30 14:30:08 +00:00
Adrian Roos
d6f3e3cf9f am a8ef647d: Trust: Make setEnabledFeatures asynchronous 
* commit 'a8ef647d5b4c44f51026682dccd94790e97077bd':
  Trust: Make setEnabledFeatures asynchronous
 2014-07-30 14:30:03 +00:00
Adrian Roos
0a338b4243 am 33d3756f: Add setManagingTrust and expose it on lockscreen 
* commit '33d3756f394b7c697c47851fb0980a766c661f83':
  Add setManagingTrust and expose it on lockscreen
 2014-07-30 14:29:58 +00:00
Jinsuk Kim
56d138c2ef am e129f19b: am 78aaab20: Merge "Send TV app the intent for the new active source" into lmp-dev 
* commit 'e129f19bae9fdac44b9b6b9bcbf55d180a645188':
  Send TV app the intent for the new active source
 2014-07-30 14:15:57 +00:00
Ihab Awad
a5b293a79a am 0b3e8756: am 4290e4eb: Merge "Connection creation and service wiring for WiFi call managers (1/3)" into lmp-dev 
* commit '0b3e87565008f3a8a58219dc35e0da90a4a86b37':
  Connection creation and service wiring for WiFi call managers (1/3)
 2014-07-30 14:15:52 +00:00
Igor Murashkin
22a8176d89 am 75b10ee7: am 3387fffa: Merge "camera2: legacy: Don\'t set the @hide frame number metadata" into lmp-dev 
* commit '75b10ee7e74bea0195ed5190ec6edbaac4a38ae6':
  camera2: legacy: Don't set the @hide frame number metadata
 2014-07-30 14:15:31 +00:00
Igor Murashkin
3b6c24eec1 am 12b57ce6: am 92f2d610: Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev 
* commit '12b57ce60bb6b4b50c47f1e091ffdb5d3c205e46':
  camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)
 2014-07-30 14:15:23 +00:00
Jorim Jaggi
88a5fff444 am 522542ed: am 5c2d0ab8: Optimize alpha handling for stack scroller 
* commit '522542ed7e194b4fced90eb90c520b1bc7dec3d7':
  Optimize alpha handling for stack scroller
 2014-07-30 14:15:19 +00:00
Igor Murashkin
5abfb08c2b am 44e5ce82: am 6dc35134: Merge changes I104c8243,I82811142 into lmp-dev 
* commit '44e5ce8264387f906d360edcd5295b27da54bc11':
  camera2: legacy: fix cached results bug and fix focus modes
  camera2: legacy: Add focus support
 2014-07-30 14:15:07 +00:00
Nicolas Prevot
29762c3dfb Removing old tag TAG_FORWARDING_INTENT_FILTERS. 
By now, all devices should have updated, so we can remove the
old tag name.

Change-Id: Id0bc0e08f3979c5a2652c4eb8da9ff938b5d5bc4
 2014-07-30 14:06:22 +00:00
Christoph Studer
dda48f1221 NoListener: Optimize RankingMap 
Cache ranks and interception bits instead of re-calculating
them every time they're accessed.

Change-Id: I2c6bbeaa01648d03ff8b3690b7f21cef4e2b9d97
 2014-07-30 13:48:04 +00:00
Christoph Studer
fd19326c6b Notification: Forward setUser() call to publicVersion 
Change-Id: I82715d69664fcbf57ca0599994004a8630f8587c
 2014-07-30 13:16:57 +00:00
Torne (Richard Coles)
d0499ec896 am 1acbe9ad: Merge "Parse system properties that are lists correctly." into lmp-dev 
* commit '1acbe9adeffa4ba4806f08e216ae5b6b6ba2904e':
  Parse system properties that are lists correctly.
 2014-07-30 13:08:18 +00:00
Christoph Studer
12031baaa6 am e46fa657: SysUI: Reset background treatment when re-using Entries 
* commit 'e46fa657cfbe255dbefa033dd2b5ac799cabb2c9':
  SysUI: Reset background treatment when re-using Entries
 2014-07-30 13:08:13 +00:00
Sander Alewijnse
9cbe6b2c47 am bbafde69: Add warning in the disambig for specific launchers. 
* commit 'bbafde691fb61a5fbcef0e53b92f9e6c341fcda1':
  Add warning in the disambig for specific launchers.
 2014-07-30 13:08:09 +00:00
Guang Zhu
c7db5d0b49 am 5115b590: Merge "disable flashlight for monkey tests" into lmp-dev 
* commit '5115b59079c5638a6fbed63803ba8687ef67a403':
  disable flashlight for monkey tests
 2014-07-30 13:08:05 +00:00
Youngsang Cho
8e1d0e968a am e2a60df1: Merge "TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch" into lmp-dev 
* commit 'e2a60df171632dde1a0b31b86d7c6088fc9c1819':
  TIF: Add a system api TvInputInfo.isCecDeviceConnectedToSwitch
 2014-07-30 13:08:01 +00:00
Jae Seo
ff87f9a836 am ec7accc2: TIF: Merge TvParentalControlManager into TvInputManager 
* commit 'ec7accc28b47216aaf5a2ee49bf346943af95868':
  TIF: Merge TvParentalControlManager into TvInputManager
 2014-07-30 13:07:56 +00:00
Adrian Roos
8f21158fe6 Trust: Make setEnabledFeatures asynchronous 
Unsynchronizes the call into app code from setEnabledFeatures,
replacing it with a callback mechanism. Also makes this actually
work by fixing the check in TrustManagerService to take into account
whitelisting.

Change-Id: I0831752cd2d3158eda9c8404a5569498f11ac2ac
 2014-07-30 12:34:18 +00:00
Adrian Roos
7861c663fd Add setManagingTrust and expose it on lockscreen 
Adds a facility for trust agents to indicate if they
are ready to manage trust. Also adds an indication to
the lock icon on the lockscreen to show whether trust is
being managed.

Bug: 15518469
Bug: 16123013

Change-Id: Ie17f588aebeafe66c81dea4a69c733b0d2c72fd4
 2014-07-30 12:33:33 +00:00
Christoph Studer
22f2ee567d SysUI: Reset background treatment when re-using Entries 
Bug: 16220667
Change-Id: I8fd2770fa5ea554728eb8cd70ce4a6171e28ece5
 2014-07-30 11:40:24 +00:00
Behdad Esfahbod
3d1856f444 Merge "Clean up Minikin includes" into lmp-dev 2014-07-30 11:24:38 +00:00
Behdad Esfahbod
e21e2a2d1d Clean up Minikin includes 
Include headers where they are used.  Add header guards to MinikinSkia.h

Change-Id: If341231625348290d28a7d625561fffc171a8407
 2014-07-30 14:58:40 +00:00
Sander Alewijnse
6c9eee8747 Add warning in the disambig for specific launchers. 
For launcher that do not support managed profiles.
Also, ignore the intent after click on those launchers.

Change-Id: I3d5691952a9409755b7cde68a3caba98a3772665
 2014-07-30 10:27:44 +00:00
Jae Seo
783645e99f TIF: Merge TvParentalControlManager into TvInputManager 
This change addresses the following API council feedback.

TvParentalControlManager:
-- Replace the listener interface with a broadcast Intent with well-known
   action, something like ACTION_BLOCKED_RATINGS_CHANGED.
-- TvParentalControlManager goes away, and two remaining methods move to
   TvInputManager.

== Implementation changes ==
-- The user-selected rating preferences should be stored in an XML file, and
   loaded at boot by your internal system service.  It should _not_ be stored in
   a Secure/Global setting.

Bug: 16542165
Change-Id: I278df963576652ec9163a66c1ef99419fcdb36c2
 2014-07-30 15:39:39 +09:00
Jae Seo
31ba6138b7 am af0f27fa: TIF: Use more consistent constant names 
* commit 'af0f27faa9648fbe4c7cb131ebb2554ab247e3ab':
  TIF: Use more consistent constant names
 2014-07-30 02:53:20 +00:00
Jae Seo
6e62a1508c TIF: Use more consistent constant names 
Change-Id: Iee7cbbba621e4174c9fdaedc86d3830ca9f46cfe
 2014-07-30 11:46:41 +09:00
Alan Viverette
a147454ca0 am 719cc772: Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev 
* commit '719cc7726b2999ff74e8a8b9a562643adea462c0':
  Revert "Update switch assets, fix SearchView asset 9-patch areas"
 2014-07-30 02:43:36 +00:00
Wonsik Kim
5652ab53cd am d284bd57: TIF: ensure hardware / CEC event calling sequence 
* commit 'd284bd574770412042a463bca1c0091e864706ff':
  TIF: ensure hardware / CEC event calling sequence
 2014-07-30 02:25:38 +00:00
Wonsik Kim
d922a546b9 TIF: ensure hardware / CEC event calling sequence 
Bug: 16441047
Change-Id: Ie654b78ec91a081a1438cc036967f528e063f25b
 2014-07-30 11:19:56 +09:00
Alan Viverette
72061337a0 am cabeac83: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit 'cabeac83d842902fbb9827e51cc8591a930d5409':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 01:17:25 +00:00
Dirk Dougherty
7409cadbf7 am 33bf37c6: am 78ad92b4: am 4ff57a9a: am fa3d1b2a: Doc change: add notice for admob sdk upgrade. 
* commit '33bf37c6970e603969a06c021b7a0a2531a85b37':
  Doc change: add notice for admob sdk upgrade.
 2014-07-30 01:09:40 +00:00