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

188369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yang Ni
5024f20a85 am 09339053: am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method" 
* commit '0933905375790eb850334b53fd6d0981bd40e007':
  Add name to ScriptGroup2.Builder.create() method
 2015-04-14 17:02:33 +00:00
Mady Mellor
b3a0660eab Merge "Use HandleView's previous offset for text selection handles" 2015-04-14 16:52:06 +00:00
Yang Ni
0933905375 am 6ca1e45a: am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method" 
* commit '6ca1e45aab5b4a1b229c6493780a04976db12817':
  Add name to ScriptGroup2.Builder.create() method
 2015-04-14 16:50:22 +00:00
Yang Ni
6ca1e45aab am 8704ae46: Merge "Add name to ScriptGroup2.Builder.create() method" 
* commit '8704ae464a001e17275257d19eae688ff3a28892':
  Add name to ScriptGroup2.Builder.create() method
 2015-04-14 16:36:36 +00:00
Yang Ni
8704ae464a Merge "Add name to ScriptGroup2.Builder.create() method" 2015-04-14 16:15:54 +00:00
Andres Morales
317918e206 Merge changes from topic 'lss-update' 
* changes:
  Add challenge to IGateKeeperService
  Wire up GateKeeper to LockSettingsService
 2015-04-14 16:12:55 +00:00
Tom Hudson
34e79c1e57 Convert from glyph count to byte length 
Canvas drawText* APIs are inconsistent, and this mismatch snuck through
our tests.

BUG=skia:3636
R=djsollen@google.com

Change-Id: Ibaab512c3f19df8445d582633b2748f1ec4d2902
 2015-04-14 11:34:39 -04:00
Kenny Guy
4fc266bbef Merge "Display toast when screen is unlocked to a work app." 2015-04-14 14:20:45 +00:00
Chet Haase
575217fc3d Make ActionBar animations work correctly 
Previous ActionBar animations didn't handle configuration changes
or other situations in which the view would get detached. listeners
would stay on the view and would attempt to do something nonsensical
in the new window. This new approach removes listeners on window
detach to avoid this problem.

Issue #20125407 Settings Crashes when changing orientation of device

Change-Id: I0b3bbd0f6fc23cdb4cbd646b0d2772d72d3d795d
 2015-04-14 14:09:26 +00:00
Kenny Guy
de77be6311 Merge "Show a status bar icon for managed profile activities." 2015-04-14 11:53:00 +00:00
Benjamin Franz
12fdfa43ce Merge "Introduce device owner API to disable the keyguard" 2015-04-14 11:12:32 +00:00
Gustav Sennton
1b4edc9068 Merge "Revert "Load WebView from one out of a list of packages."" 2015-04-14 10:59:35 +00:00
Gustav Sennton
9915eb56fe Revert "Load WebView from one out of a list of packages." 
This reverts commit fe320b2fe95fc3a7aa95ca4171f8703369a54867.
We need to check in a new Webview APK first.

Change-Id: Ica6adef7a1e68c06b4c6a6a3c851f40f56b006ef
 2015-04-14 10:48:05 +00:00
Erik Kline
172cf02435 am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" 
* commit '73e056d3931b419c2653eb7365fb72b50a9a36c3':
  Add android.net.IpPrefix#contains()
 2015-04-14 09:58:38 +00:00
Benjamin Franz
e36087e5b6 Introduce device owner API to disable the keyguard 
Let the device owner disable the keyguard to achieve undisturbed single
use mode with multiple apps. Calling this API has no effect if a
password
has been set for the calling user.

Bug: 19533026
Change-Id: I6b726b7f36efb669359e9da4b7e3db1f8031dad5
 2015-04-14 10:58:36 +01:00
Gustav Sennton
75f4b76638 Merge "Load WebView from one out of a list of packages." 2015-04-14 09:46:10 +00:00
Erik Kline
73e056d393 am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" 
* commit '402f2501ac73adba86ec3973ef81e6911fbcd564':
  Add android.net.IpPrefix#contains()
 2015-04-14 09:44:25 +00:00
Erik Kline
402f2501ac am 3312c6b9: Merge "Add android.net.IpPrefix#contains()" 
* commit '3312c6b9f3e9c83865eeec2af609338ce74a0a10':
  Add android.net.IpPrefix#contains()
 2015-04-14 09:29:56 +00:00
Rubin Xu
c9c9f7b40e Merge "Add setOtaPolicy/getOtaPolicy API in DPMS" 2015-04-14 09:16:28 +00:00
Ricky Wai
0c606812c5 Merge "Add Bluetooth Contacts Sharing policy in DevicePolicyManager" 2015-04-14 08:59:18 +00:00
Ricky Wai
778ba13538 Add Bluetooth Contacts Sharing policy in DevicePolicyManager 
Bug: 19990979

Change-Id: Ide9adf66eec5721e50573c03956a1b63b7e8b18b
 2015-04-14 08:57:32 +00:00
Rubin Xu
8027a4ffc2 Add setOtaPolicy/getOtaPolicy API in DPMS 
Allow device owners to set OTA policy for automatically accept/postpone
incoming OTA system updates. This class only provides the setting
and getting of OTA policy, the actual OTA subsystem should handle
and respect the policy stored here.

Bug: 19650524
Change-Id: I9b64949fab42097429b7da649039c13f42c10fd1
 2015-04-14 09:34:03 +01:00
Erik Kline
3312c6b9f3 Merge "Add android.net.IpPrefix#contains()" 2015-04-14 07:58:33 +00:00
Erik Kline
acc8c09d3a Add android.net.IpPrefix#contains() 
This was originally to avoid RuntimeException in RouteInfo#matches():
    When an IPv6 prefix with a length greater than the max permitted
    for IPv4 is matched against an Inet4Address, the call to
    NetworkUtils throws RuntimeException.

Change-Id: I92e2bd19a4e7d656cf682fd27678da07e211850d
 2015-04-14 16:19:11 +09:00
Dirk Dougherty
8cc578c37b am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '38544901e6aa6934b032303be314a92dcde662f3':
  Doc change: add new pages for Designed for Families.
 2015-04-14 05:13:35 +00:00
Dirk Dougherty
38544901e6 am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'f2a57c69d4af3f7b1368e6edb6801b1cf2058dd8':
  Doc change: add new pages for Designed for Families.
 2015-04-14 05:03:13 +00:00
Dirk Dougherty
f2a57c69d4 am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'cda895c53d22496001ae59fae36f751cf04af3ed':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:54:32 +00:00
Dirk Dougherty
cda895c53d am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'c578bff74acdaf103c05794f39acf9ea49e4621d':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:43:06 +00:00
Dirk Dougherty
c578bff74a am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit 'a80fc040ea814af2a1d3f2cbfa5efb8eaa898697':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:33:27 +00:00
Dirk Dougherty
a80fc040ea am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs 
* commit '00f857c5a132555774bd286c254dade281473427':
  Doc change: add new pages for Designed for Families.
 2015-04-14 04:22:27 +00:00
Doris Liu
14c361e1b7 Merge "Rename duration scale hint types in xml" 2015-04-14 04:21:08 +00:00
Doris Liu
5c8c779ff6 Rename duration scale hint types in xml 
To avoid being confused with unit dp

Change-Id: I5ea9e5ad6034c1d79c9e0bb65759a122ea715770
 2015-04-13 21:17:46 -07:00
Dirk Dougherty
00f857c5a1 Merge "Doc change: add new pages for Designed for Families." into lmp-docs 2015-04-14 04:12:57 +00:00
Dirk Dougherty
f802cc02a2 Doc change: add new pages for Designed for Families. 
Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
 2015-04-13 20:23:18 -07:00
Mathieu Chartier
d65e66a854 am 9426ad32: am 869c5490: am 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '9426ad32bcdc2bf80491e7c170d9b6ef66f0ca89':
  Update "Investigating your RAM usage" for ART
 2015-04-14 03:11:03 +00:00
smain@google.com
3c273bbb91 am f46c8f5b: am c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'f46c8f5bfcb30d7f9d8b91e6f193d7ab574e05e9':
  initial batch of NDK files for skeleton site build
 2015-04-14 03:10:51 +00:00
Rich Slogar
b8a699c846 am 7fd2be12: am f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '7fd2be12d11a33c2ad622d8b49e74d6ba7a12be5':
  docs: systrace update
 2015-04-14 03:10:38 +00:00
Rich Slogar
6f92b72298 am c29f30cb: am 9e58689d: am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit 'c29f30cbf1ee6bec3b2ead374aba71002db6faaa':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 03:10:28 +00:00
Mathieu Chartier
7a55461453 am 7e39ae4f: am 32b675b9: am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit '7e39ae4fd683f6fd056eae754fde1579fb5a19b6':
  Update "Investigating your RAM usage" for ART
 2015-04-14 03:10:16 +00:00
Ruchi Kandoi
8f87489beb am 36e53bb8: am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds." 
* commit '36e53bb8aa6db4ac101f88a7394f5011643693e2':
  BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBounds.
 2015-04-14 03:01:20 +00:00
Mathieu Chartier
9426ad32bc am 869c5490: am 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '869c5490214c99cacb05024cfc72efa4cffb9208':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:55:17 +00:00
smain@google.com
f46c8f5bfc am c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit 'c9393a5d707529a465fe68ee96d9929deb8ef3c8':
  initial batch of NDK files for skeleton site build
 2015-04-14 02:55:13 +00:00
Rich Slogar
7fd2be12d1 am f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit 'f828c92c5ebbcba3204581b49e91b5b80f8ed2b4':
  docs: systrace update
 2015-04-14 02:55:09 +00:00
Rich Slogar
c29f30cbf1 am 9e58689d: am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '9e58689da633b5ec4517ac17bd7274510992143d':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 02:55:04 +00:00
Mathieu Chartier
7e39ae4fd6 am 32b675b9: am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit '32b675b9f56210afb0254b866235ebfa7908d39c':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:55:00 +00:00
Mathieu Chartier
869c549021 am 2f0dc155: am 2c871d2c: am 17781b68: am 473989c3: Merge "Update "Investigating your RAM usage" for ART" into lmp-docs 
* commit '2f0dc1551958088fdf20f89eb98f34d00b21bf3d':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:44:26 +00:00
smain@google.com
c9393a5d70 am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs 
* commit '2b92e18b4bf70c88662dfa1137c4901daae4d4d5':
  initial batch of NDK files for skeleton site build
 2015-04-14 02:44:14 +00:00
Rich Slogar
f828c92c5e am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace update" into lmp-docs 
* commit '6b9e30fe959e6c67687c52eeb152de623368695d':
  docs: systrace update
 2015-04-14 02:43:56 +00:00
Rich Slogar
9e58689da6 am 9761530b: am 8f68c77c: am 6656ea46: am 880460a7: Merge "docs: nexus usb driver update" into lmp-docs 
* commit '9761530b3fbff0f2d686c4a0f48efa02c159a309':
  docs: nexus usb driver update
  docs: remove adb install option
 2015-04-14 02:43:49 +00:00
Mathieu Chartier
32b675b9f5 am d4bcbcfa: am dd9e4140: am f2a4968b: Merge "Update "Investigating your RAM usage" for ART" into lmp-mr1-dev 
* commit 'd4bcbcfa08502d6feafbe39e9dcb16a38e61f892':
  Update "Investigating your RAM usage" for ART
 2015-04-14 02:43:39 +00:00