Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,266 Commits 3 Branches 0 Tags
a58405ef46d5f7ea563605697c2a4792fc11bd17
Commit Graph

51038 Commits

Author SHA1 Message Date
Vinod Krishnan
a58405ef46 am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master" 
* commit '027017768fb1e75aa1c5e1b4a0344b9a4b12c4e0':
  Adding a margin for the AlertDialog to work on circular UI.
 2014-05-09 22:26:04 +00:00
Alan Viverette
9edceb71d0 am 9f4c7f31: Animated state transition drawable 
* commit '9f4c7f31b47680973e4e2a23f09e4d5281a40ed0':
  Animated state transition drawable
 2014-05-09 22:25:42 +00:00
Dan Sandler
a020ef5201 am f1f778e6: Merge "Fix misaligned vectors. #cannotunsee" 
* commit 'f1f778e698db54d867ef201d260c2042ec0afc94':
  Fix misaligned vectors. #cannotunsee
 2014-05-09 22:25:38 +00:00
Yin-Chia Yeh
133fca21d7 am 91325444: Merge "Camera2: Minor update for exposureCompensation spec" 
* commit '91325444a1d7c9de947ee055ddfbac9316117234':
  Camera2: Minor update for exposureCompensation spec
 2014-05-09 22:25:30 +00:00
Vinod Krishnan
07bb4c3063 Merge "resolved conflicts for merge of 88aa8aab to master" 2014-05-09 21:11:08 +00:00
Vinod Krishnan
4a3735d081 resolved conflicts for merge of 88aa8aab to master 
Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7
 2014-05-09 13:23:41 -07:00
Alan Viverette
5e92c95d84 Animated state transition drawable 
Change-Id: I6c795d55cd7ab9163fdd6fe6ce3771bbd7015d62
 2014-05-09 13:03:12 -07:00
Dan Sandler
3f4c72f42b Merge "Fix misaligned vectors. #cannotunsee" 2014-05-09 19:39:59 +00:00
Dan Sandler
0b9c9f745c Fix misaligned vectors. #cannotunsee 
Change-Id: Idacc34dc77a811b6355a19b4715309f4e4e29fde
 2014-05-09 15:38:30 -04:00
Yin-Chia Yeh
e2e5527ef3 Merge "Camera2: Minor update for exposureCompensation spec" 2014-05-09 19:02:09 +00:00
Yin-Chia Yeh
a4227dfe48 Camera2: Minor update for exposureCompensation spec 
doc change only

Change-Id: I4bcc461cd9d592d5b15beda45f2b6176d7efde37
 2014-05-09 12:01:10 -07:00
Vinod Krishnan
88aa8aab3d am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev 
* commit 'c4ebd014cec31a2d5a18c2339681ca71bd1f5d0e':
  Adding a margin for the AlertDialog to work on circular UI.
 2014-05-09 18:09:53 +00:00
Vinod Krishnan
c4ebd014ce Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev 2014-05-09 18:05:10 +00:00
Vinod Krishnan
119ba2c72d Adding a margin for the AlertDialog to work on circular UI. 
- also removing the background completely for sdk >= 20

Change-Id: I239c8d066bb7ed0d1ab852a4d162475948b8a0d5
 2014-05-09 11:03:20 -07:00
Craig Mautner
8ce0279fa5 am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls." 
* commit '87bf3b28f3b94464384c8f6adb7867233c960543':
  Introduce persistent forms of Activity lifecycle calls.
 2014-05-09 17:44:37 +00:00
Craig Mautner
d9ddf2e9d0 Merge "Introduce persistent forms of Activity lifecycle calls." 2014-05-09 17:38:53 +00:00
Jason Monk
52cb4ef7c9 am d8bbf999: Merge "Fix badness from proxy refactoring." 
* commit 'd8bbf9994979e17c18f65b4e4ae3231187f1e3a5':
  Fix badness from proxy refactoring.
 2014-05-09 17:16:46 +00:00
Jason Monk
c241db85c9 Merge "Fix badness from proxy refactoring." 2014-05-09 17:11:15 +00:00
Craig Mautner
a002604af0 Introduce persistent forms of Activity lifecycle calls. 
When an Activity is created with R.attr.persistable true different
forms of activity lifecycle methods including PersistableBundle will
be used.

Fixes bug 13736007.

Change-Id: I7e92917b300b76964257cfcc26c24e76aa19bd16
 2014-05-09 09:42:37 -07:00
Mikhail Naganov
b33122ff42 am f25ec68c: am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'f25ec68c973bdd6cd78f2b592a5f756219e0a4b7':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:30:41 +00:00
Mikhail Naganov
3b2f548b67 am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'a08771edfaabab8c2f1f1d552f788c9c4a4162f9':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:26:19 +00:00
Mikhail Naganov
a08771edfa am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'fa75ff626ca48db1007105fa5fd72d83c81c56e2':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:19:12 +00:00
Mikhail Naganov
fa75ff626c am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'b76bc8e06e456715a36edd92cb4ea5437d5306e4':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:14:16 +00:00
Mikhail Naganov
b76bc8e06e am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit '6940b664093c7e66708b125957a2879e027e8cfa':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:08:58 +00:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:47:58 +00:00
Jessica Hummel
fa863aaf08 am 1be633f9: Allow setting password restrictions from a managed profile. 
* commit '1be633f96798cc86be644ab0952e6449464c9860':
  Allow setting password restrictions from a managed profile.
 2014-05-09 15:19:54 +00:00
Jessica Hummel
91da58ded2 Allow setting password restrictions from a managed profile. 
A managed profile will now share password settings with its parent.

- the current password is always stored in the parent
- admins of profiles are notified if that password changes
- checks for password quality now take the requirements of admins on
   the parent and its profiles into account

Todo:

- Currently KeyguardSecurityContainer wipes the whole device when
  the maximum fails has been reached on any profile.
  We need to limit the wipe to the profile for which the fails exceeded
  the maximum number.
- Intents with ACTION_SET_NEW_PASSWORD need to be forwarded to the parent
  of the profile when sent from a managed profile

Change-Id: I8532c59f753f8d9c61200f553f275214ad90276e
 2014-05-09 16:16:02 +01:00
Ben Murdoch
f127d9eb63 am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION 
* commit 'b17860213f101a17f95d2ca95dce7171dd62bf6a':
  Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
 2014-05-09 14:01:26 +00:00
Jason Monk
5df281a570 Fix badness from proxy refactoring. 
When no PAC file getPacFileUrl() can return null now, which you
cannot call toString() on.

Change-Id: Ife00f641c2c17fbc1bde17017d9af59d23cb9182
 2014-05-09 09:53:08 -04:00
Ben Murdoch
b2e56e34de Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION 
We haven't hooked this constant up yet, so @hide from the API until
it's ready.

Bug: 14668406
Change-Id: Ia0bb2ac1deaa0575d5ceb509997ca27f930040b0
 2014-05-09 13:25:48 +01:00
Yohei Yukawa
baabe3ecc2 am e6d58c4c: Merge "Introduce new API for floating window support" 
* commit 'e6d58c4ce6dedc082cbc13aa494e793a78022aa6':
  Introduce new API for floating window support
 2014-05-09 10:47:09 +00:00
Yohei Yukawa
2ac9979179 Merge "Introduce new API for floating window support" 2014-05-09 10:43:44 +00:00
Yohei Yukawa
c2ddd60236 Introduce new API for floating window support 
This CL introduces a new API IMM#updateCursorAnchorInfo for
floating window support.

BUG: 14579622
Change-Id: I61dec2f8fa671ba891da1d4af08975750e3acb04
 2014-05-09 19:17:15 +09:00
Jessica Hummel
5a2e76a4e0 am 690022d1: Merge "Add api for getting the parent of a profile." 
* commit '690022d14be0251b6e618b01e3f448cb49e61241':
  Add api for getting the parent of a profile.
 2014-05-09 09:38:45 +00:00
Jessica Hummel
a8c5f577d0 Merge "Add api for getting the parent of a profile." 2014-05-09 09:33:28 +00:00
Ashish Sharma
29e832bcce am b87cf3a0: Bump the batterystats checkin stats version number. 
* commit 'b87cf3a06618d67ec37a299a385f80466b72d9bd':
  Bump the batterystats checkin stats version number.
 2014-05-09 02:09:11 +00:00
Ashish Sharma
bffcf1c2da Bump the batterystats checkin stats version number. 
Change-Id: Ie403b89022e4d1f6ad0e07e70c95f39a1d5fa530
 2014-05-09 02:03:55 +00:00
Michael Wright
dfeab22a1e am 86d53d01: Merge "Temporarily remove the dpad keys from system keys." 
* commit '86d53d0107e829c537490c97700397452c728556':
  Temporarily remove the dpad keys from system keys.
 2014-05-09 00:33:32 +00:00
Michael Wright
786efab54d Merge "Temporarily remove the dpad keys from system keys." 2014-05-09 00:28:59 +00:00
Martijn Coenen
66f29aa4a5 am 5aa45ef5: Merge "HCE/SE foreground support." 
* commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9':
  HCE/SE foreground support.
 2014-05-08 23:37:00 +00:00
Martijn Coenen
781a83878a Merge "HCE/SE foreground support." 2014-05-08 23:33:51 +00:00
Glenn Kasten
e57c25dcde am a1da4e35: Merge "Add hidden support for ENCODING_PCM_FLOAT to AudioTrack" 
* commit 'a1da4e35ff7a0651cff96ec5dbebd6a4bb160383':
  Add hidden support for ENCODING_PCM_FLOAT to AudioTrack
 2014-05-08 23:24:17 +00:00
Glenn Kasten
eea64a928e Merge "Add hidden support for ENCODING_PCM_FLOAT to AudioTrack" 2014-05-08 23:19:49 +00:00
Michael Wright
7c1c71e27b Temporarily remove the dpad keys from system keys. 
Bug: 14438911
Change-Id: Ibb58a4af89585b6e266f5236df22f0465dd17bd4
 2014-05-08 16:14:11 -07:00
Glenn Kasten
54955e33c8 Add hidden support for ENCODING_PCM_FLOAT to AudioTrack 
Change-Id: I15e6d6ab34846366e7f5cbf948fd3cb327e72632
 2014-05-08 16:11:42 -07:00
Winson Chung
9194acc50f am 12c9e3a0: Merge "Removing the old tasks on launching recents task if they trigger a new task." 
* commit '12c9e3a00bf912167d1c40a356d19301c93bfdd0':
  Removing the old tasks on launching recents task if they trigger a new task.
 2014-05-08 22:38:15 +00:00
Winson Chung
6e05841950 Merge "Removing the old tasks on launching recents task if they trigger a new task." 2014-05-08 22:33:20 +00:00
Dianne Hackborn
d9225ba404 am 60549e20: Merge "Usage stats!" 
* commit '60549e202fd57679b0ead98224264c3308106ebd':
  Usage stats!
 2014-05-08 22:04:02 +00:00
Dianne Hackborn
6af7d62df8 Merge "Usage stats!" 2014-05-08 21:58:45 +00:00
Eino-Ville Talvala
0a7540c53a am 59969600: Merge "Add android.hardware.camera.external feature." 
* commit '599696000400582773dcff7b6142b603ef68ec6b':
  Add android.hardware.camera.external feature.
 2014-05-08 21:50:32 +00:00