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

149601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
6a12e77194 Merge "Remove old NFC unlock api" into lmp-dev 2014-08-21 17:07:32 +00:00
Paul Jensen
e16a24559f Merge "Send captive portal broadcast as user CURRENT." into lmp-dev 2014-08-21 17:05:42 +00:00
RoboErik
abb19a71fd am 90863124: Merge "Set transport control flags when a session is created" into lmp-dev 
* commit '908631240c31ef482f7e9189822e803da1b22030':
  Set transport control flags when a session is created
 2014-08-21 17:05:04 +00:00
Dianne Hackborn
6f334b8964 am ee6e179e: Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 
* commit 'ee6e179e85c029573948830f37bbbddfea1e78a5':
  Fix issue #17038762: Add API to add entries to the recents list
 2014-08-21 17:04:52 +00:00
RoboErik
69b131339b Merge "Set transport control flags when a session is created" into lmp-dev 2014-08-21 16:58:42 +00:00
Dianne Hackborn
198d928615 Merge "Fix issue #17038762: Add API to add entries to the recents list" into lmp-dev 2014-08-21 16:56:18 +00:00
Chris Craik
ab3f9dd4e7 am 7d271c37: Merge "Clarify text shadow attribute/method comments" into lmp-dev 
* commit '7d271c376159a6202b463930efd63d177351fd18':
  Clarify text shadow attribute/method comments
 2014-08-21 16:52:23 +00:00
Chris Craik
c56a1a51a9 Merge "Clarify text shadow attribute/method comments" into lmp-dev 2014-08-21 16:46:53 +00:00
Nicolas Prevot
2236849d5f am 85814a34: Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 
* commit '85814a346c08eed294fd2c49fff317aaeca9840f':
  Marking the methods to get Profile/Device Owner with @SystemApi.
 2014-08-21 16:36:20 +00:00
Paul Lawrence
0080c2b08e am c8b0ddfc: Merge "Save PatternVisible setting to crypto header" into lmp-dev 
* commit 'c8b0ddfc90c5b448075438df5a0c3793e806163d':
  Save PatternVisible setting to crypto header
 2014-08-21 16:36:16 +00:00
Nicolas Prevot
01e6a6fef1 Merge "Marking the methods to get Profile/Device Owner with @SystemApi." into lmp-dev 2014-08-21 16:33:47 +00:00
Paul Lawrence
7bf41929f2 Merge "Save PatternVisible setting to crypto header" into lmp-dev 2014-08-21 16:25:56 +00:00
Zhijun He
ffa904f68b am a34cf262: Merge "Camera2: update aberration correction related tag name" into lmp-dev 
* commit 'a34cf262ff0789ebe671ac89941a3f93095147da':
  Camera2: update aberration correction related tag name
 2014-08-21 16:22:46 +00:00
Jaewan Kim
8aaf7555fe am 1ca0c4f0: Merge "TIF: Accept any character for custom label." into lmp-dev 
* commit '1ca0c4f0ccedd26c90c20295b1eeb907073b6a18':
  TIF: Accept any character for custom label.
 2014-08-21 16:22:41 +00:00
Nicolas Prevot
465acf3f3f Marking the methods to get Profile/Device Owner with @SystemApi. 
BUG: 16860239

Change-Id: I60126a8112a57e836cae3bcd9b62ebf50385f5ec
 2014-08-21 17:22:28 +01:00
Zhijun He
eee850d355 Merge "Camera2: update aberration correction related tag name" into lmp-dev 2014-08-21 16:17:52 +00:00
Lorenzo Colitti
bd8069177d am ff067823: Merge "Fix findConnectionTypeForIface." into lmp-dev 
* commit 'ff067823e482f512ba6938870035c0097426319b':
  Fix findConnectionTypeForIface.
 2014-08-21 16:14:11 +00:00
Wenchao Tong
67a7ee0f27 am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 
* commit '2954d35a8ea73a59f9b333ecf3497022c57e5476':
  Revert "Annotate @SystemApi on some WifiManager methods."
 2014-08-21 16:14:06 +00:00
Behdad Esfahbod
76625e3b7f am ffb1c54b: Merge "Throw exception on nonexistent font" into lmp-dev 
* commit 'ffb1c54ba7d0d7b3bc5e6096c5937e6aff498cd4':
  Throw exception on nonexistent font
 2014-08-21 16:14:00 +00:00
Kenny Guy
98ecaa1ae6 am 87c29bd1: Merge "Replicate text and sounds settings for managed profile." into lmp-dev 
* commit '87c29bd1b08b48b093808b8831bc23de69f9d318':
  Replicate text and sounds settings for managed profile.
 2014-08-21 16:13:54 +00:00
Esteban Talavera
b676afcacf am a47533ff: Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 
* commit 'a47533ff3c3fdd6ad0d81266e75403eb441be141':
  Set last phrase for constant values of EXTRA_* fields to ALL_CAPS
 2014-08-21 16:13:44 +00:00
Esteban Talavera
da3b8a493a am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 
* commit '3e02b271fcea87e07534712127fad60b0ce92dab':
  Updated documentation for setScreenCaptureDisabled()
 2014-08-21 16:13:39 +00:00
Jorim Jaggi
9921de0df1 am af1c312d: Merge "Update notification layouts to match redlines" into lmp-dev 
* commit 'af1c312d19d9b786b2edc1e83d4688870a51ef17':
  Update notification layouts to match redlines
 2014-08-21 16:13:34 +00:00
Jaewan Kim
edaece1f30 Merge "TIF: Accept any character for custom label." into lmp-dev 2014-08-21 16:13:25 +00:00
Lorenzo Colitti
a945c35273 Merge "Fix findConnectionTypeForIface." into lmp-dev 2014-08-21 16:08:11 +00:00
Jaewan Kim
f0e530e4eb TIF: Accept any character for custom label. 
Bug: 16874696
Change-Id: Idc42853ea7f4b12a2eda1f45319bc31ee1a8c6b7
 2014-08-22 01:05:40 +09:00
Wenchao Tong
ddd0986311 Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev 2014-08-21 16:05:00 +00:00
Behdad Esfahbod
9f6ba7af56 Merge "Throw exception on nonexistent font" into lmp-dev 2014-08-21 16:01:54 +00:00
Kenny Guy
7a13ea7e3b Merge "Replicate text and sounds settings for managed profile." into lmp-dev 2014-08-21 15:55:43 +00:00
Svet Ganov
3de01b2e34 Fix a regression in partially updading app widgets. 
App widgets can be partially updated where only the actions delta
is delivered to the client. There was a regression where instead
of sending the delta, the merged remote views were sent. This was
problematic because certain actions are ignored when merging to
avoid clutter (specifically showNext and showPrevious), hence these
actions never reached the client.

bug:16844814

Change-Id: I88ab58e610cda24154985165e6d6d93a1baa9c79
 2014-08-21 15:47:08 +00:00
Esteban Talavera
e4be1bf2be Merge "Set last phrase for constant values of EXTRA_* fields to ALL_CAPS" into lmp-dev 2014-08-21 15:33:20 +00:00
Ricardo Cervera
2c374e643d am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 
* commit '82957e38b2d38ea41fdf930d722157287eab0590':
  docs: Fixed typo in intents page. Bug: 16949177
 2014-08-21 15:31:34 +00:00
Ricardo Cervera
82957e38b2 Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs 2014-08-21 15:22:11 +00:00
Esteban Talavera
5cef4fa9c1 Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev 2014-08-21 15:21:59 +00:00
Jorim Jaggi
922fb7a7db Merge "Update notification layouts to match redlines" into lmp-dev 2014-08-21 15:21:22 +00:00
Kenny Guy
6460657d0e Replicate text and sounds settings for managed profile. 
Replicate touch sound / vibrate setting and show password
setting between managed and parent user.

Bug: 17064707,17157511
Change-Id: I70ea9f2ac57ba5a8f9619b21eb7adad91011d733
 2014-08-21 16:19:35 +01:00
Jorim Jaggi
445d3c0a6f Update notification layouts to match redlines 
Also fixes a lot of paddings and other small issues with
the notification layouts.

Bug: 15437369
Change-Id: I40b6c69afc160c498b7e2e709814b5b847f615de
 2014-08-21 17:13:55 +02:00
Naveen Kalla
74eedc2a72 am 30e6a232: Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
* commit '30e6a232769fba0cc08a5e783582858c4b4add0d':
  Invoke shutdownMobileRadios Telephony APIs from ShutdownThread
 2014-08-21 15:12:09 +00:00
Esteban Talavera
ae4af39504 am a2cdeadd: Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 
* commit 'a2cdeadd322a1d2cb0778fa44eee61fcd0aa1e41':
  Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
 2014-08-21 15:12:05 +00:00
Naveen Kalla
bd7723637b Invoke shutdownMobileRadios Telephony APIs from ShutdownThread 
shutdownMobileRadios API shuts down multiple Radios on MSIM devices and
also gracefully shuts down Radios and SIM cards on single SIM and
MSIM devices. Use this API instead of the old setRadio APIs.

Add RIL_REQUEST_SHUTDOWN to RILConstants. Message is sent to notify
RIL that the device is shutting down.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
 2014-08-21 15:08:22 +00:00
Esteban Talavera
a5a69a3f89 am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 
* commit '5f9653cec90ad88d94ee5c31b5de6010c4fb97a1':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
 2014-08-21 15:02:32 +00:00
vandwalle
a37f2592dd am 23e25851: Merge "per bssid blacklist" into lmp-dev 
* commit '23e258519b3c6e479bd748ce7bab624ca1ab088c':
  per bssid blacklist
 2014-08-21 15:02:28 +00:00
Esteban Talavera
2df7d1ef51 Merge "Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC" into lmp-dev 2014-08-21 14:58:18 +00:00
Esteban Talavera
20303426ac Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev 2014-08-21 14:58:07 +00:00
vandwalle
beec21522d Merge "per bssid blacklist" into lmp-dev 2014-08-21 14:55:12 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked() 
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
 2014-08-21 15:30:13 +01:00
John Reck
d5f826b4c1 am d6a934a9: Merge "Run RevealAnimator on RT" into lmp-dev 
* commit 'd6a934a9a86a293428ccff8b78eba42825dd09f8':
  Run RevealAnimator on RT
 2014-08-21 14:29:25 +00:00
Esteban Talavera
ed8cf270ae am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev 
* commit '58dada0df65027cad970351b981f526e80052aef':
  Remove setApplicationsHidden
 2014-08-21 14:25:07 +00:00
John Reck
94f6878bbd Merge "Run RevealAnimator on RT" into lmp-dev 2014-08-21 14:23:29 +00:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00