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

159695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
21aaf98f6f am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev 
* commit 'd8dd5100f453b0e82b75c56651889eca03414696':
  Fix several small layout and color issues
 2014-11-19 23:53:17 +00:00
Alan Viverette
b130d5961c Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 2014-11-19 23:52:24 +00:00
Pavel Zhamaitsiak
185062733b TTY over IMS: Add messages about change of TTY mode in the repote device 
Bug: 18247323
Change-Id: Iefd9bfdccc4af2acf06259f9804dbebb576aca12
 2014-11-19 23:52:11 +00:00
Alan Viverette
552eca1a71 Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 2014-11-19 23:51:34 +00:00
Alan Viverette
d8dd5100f4 Merge "Fix several small layout and color issues" into lmp-mr1-dev 2014-11-19 23:50:00 +00:00
Chet Haase
0d1c27a713 Fix seeking and scaled duration behavior 
The animation scaled was not being factored in early enough in the
activity lifecycle. Also, setCurrentPlaytTime() was not accounting for
the scaled duration correctly. Finally, added setCurrentFraction() as
a more general-purpose seeking facility.

Issue #18222006 Animator duration scale ignored in some situations
Issue #17951668 add ability to seek fraction, not just time

Change-Id: Idad401f5ff5026d7046c36eee09d78a4793215dc
 2014-11-19 15:29:47 -08:00
xinhe
29b90ae5fd am 77bfacc6: Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 
* commit '77bfacc6fe0816e97be3a0f9a824759629d1f9eb':
  Add configuration to control converting sms destination number
 2014-11-19 22:55:37 +00:00
xinhe
77bfacc6fe Merge "resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE)" into lmp-mr1-dev 2014-11-19 22:50:43 +00:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process. 
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
 2014-11-19 14:29:10 -08:00
Dianne Hackborn
4f0e4a9ada Add new empty app test entry points. 
Change-Id: Ib899c95de6b7bb936d2114e86bec4c5aef5f7eda
 2014-11-19 14:21:07 -08:00
George Mount
2db3bf5c49 Slide supports Gravity.START and Gravity.END. 
Bug 18444396

Change-Id: Id7b82b44948e4501c2b4fb5302d22672fa20cd00
 2014-11-19 14:14:53 -08:00
John Spurlock
61f4f68571 am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 
* commit 'c70a4ccf45f669c07345cd438d68747d0558fd49':
  BatterySaver: Update disclosure string.
 2014-11-19 22:12:06 +00:00
John Spurlock
c70a4ccf45 Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 2014-11-19 22:09:14 +00:00
xinhe
b4e8478a73 resolved conflicts for merge of 62a22d5b to lmp-mr1-dev(DO NOT MERGE) 
Change-Id: I83bf149b4905b82e3787097c55b7d3cd026061dd
 2014-11-19 14:04:23 -08:00
John Spurlock
a7b6a278d0 BatterySaver: Update disclosure string. 
Bug: 18451615
Change-Id: Iea8c71a4ef1e3217953672b2a8691d612bacf8a9
 2014-11-19 16:53:52 -05:00
Mathieu Chartier
78f235db2d am 7fc9176c: Add zygote space to Dalvik Heap 
* commit '7fc9176c8a2102fb5be3668404bd15feb6878c89':
  Add zygote space to Dalvik Heap
 2014-11-19 21:51:35 +00:00
Mathieu Chartier
7fc9176c8a Add zygote space to Dalvik Heap 
Broken by
https://googleplex-android-review.git.corp.google.com/#/c/590612/

This change fixes it by correctly putting the zygote in Dalvik Heap
instead of Dalvik Other.

Bug: 18447855

Change-Id: I4a58480f1ef1eb17e760245d8690ce92e28ebea3
 2014-11-19 13:43:40 -08:00
Jason Monk
bdf37b714d am 2e982258: Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 
* commit '2e982258f10e9af21ec328faf41e77b38b109738':
  SysUI: Refactor the NetworkControllerImpl
 2014-11-19 21:22:29 +00:00
Jason Monk
2e982258f1 Merge "SysUI: Refactor the NetworkControllerImpl" into lmp-mr1-dev 2014-11-19 21:18:22 +00:00
Vinit Deshpande
a34f3d30c6 am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 
* commit '800bf3ae6e9affb151b3b0b368c4a3dd22bb1fa0':
  Fix WPS docs for LABEL method
 2014-11-19 20:29:56 +00:00
Eric Laurent
6368a7df18 AudioSystem JNI: fix AudioPortConfig mask usage 
Bug: 18444838.
Change-Id: I9151538399001c719b9e0681c00d47a26928896c
 2014-11-19 12:18:32 -08:00
Vinit Deshpande
800bf3ae6e Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev 2014-11-19 20:17:22 +00:00
Alan Viverette
7573f496a1 Fix several small layout and color issues 
Adjusts switch track asset for consistent alignment across DPI buckets,
adjusts edit text background. Lightens the "Light" theme action bar
color so that it doesn't blend in with the action bar shadow.

BUG: 18430444
BUG: 18356558
BUG: 18390994
Change-Id: I1d1e26239fa0c921a65e4ec8b5df0b0093b3989c
 2014-11-19 11:59:24 -08:00
xinhe
62a22d5b1f resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) 
The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
 2014-11-19 11:48:43 -08:00
Andrew Lee
3f4244773d am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 
* commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268':
  Add GENERIC_CONFERENCE to phone capabilities.
 2014-11-19 19:06:32 +00:00
Andrew Lee
e6a1e993c2 Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev 2014-11-19 19:00:41 +00:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
 2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
xinhe
046f3843f1 Merge "Add configuration to control converting sms destination number" into lmp-dev 2014-11-19 17:47:25 +00:00
Amit Mahajan
6f10d1c34e am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'b22462c57f35404f5b39680a9fb76165968d8faf':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:44:33 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
John Spurlock
9d48ec7a5c am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '2ee054b4f099ce67dffc29329612170305053783':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:24:09 +00:00
John Spurlock
2ee054b4f0 Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 2014-11-19 17:19:15 +00:00
Geoff Mendal
5b95c75582 am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '9792edd17c777118f64a585272c9f11112cb22d7':
  Import translations. DO NOT MERGE
 2014-11-19 16:59:27 +00:00
Geoff Mendal
9792edd17c am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5fafd21b1f15930b729f067be7d2c584add3217b':
  Import translations. DO NOT MERGE
 2014-11-19 16:55:43 +00:00
John Spurlock
5eb21f3466 Volume: Ensure ring/notif slider is enabled when ringer=vibrate. 
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.

Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
 2014-11-19 11:54:53 -05:00
Geoff Mendal
cfe34ebce6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-19 16:49:40 +00:00
Jorim Jaggi
4e857f4ef0 Fade notifications when exiting dozing 
Bug: 18146441
Change-Id: Ifa0cbb8157c65768c3a0c584166ca88c3016b730
 2014-11-19 16:52:43 +01:00
Geoff Mendal
5fafd21b1f Import translations. DO NOT MERGE 
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
 2014-11-19 07:52:29 -08:00
Geoff Mendal
0f2e8a9fd3 Import translations. DO NOT MERGE 
Change-Id: Ic62940d6ffe06c77d7eacfcf53af30850a7e3d38
Auto-generated-cl: translation import
 2014-11-19 07:46:41 -08:00
Geoff Mendal
0014addf88 am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '04b6a6d3a17e40599d90ccabc6a8481a62dd2ae1':
  Import translations. DO NOT MERGE
 2014-11-19 15:25:23 +00:00
Geoff Mendal
04b6a6d3a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-19 15:19:34 +00:00
Geoff Mendal
2a42085896 Import translations. DO NOT MERGE 
Change-Id: Ibfc1a6ef7529620c86fb25ac4ae4b27258a810c1
Auto-generated-cl: translation import
 2014-11-19 07:17:01 -08:00
Jason Monk
90bec30012 am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '56dd1f1eb6fdca10ea2f33d8420e6051e14ed435':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:03:46 +00:00
Jason Monk
56dd1f1eb6 Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 2014-11-19 14:58:40 +00:00
Dongwon Kang
5f3cb4a584 TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView. 
Background: because the hole-punching code lives only in SurfaceView,
the overlay view can be covered by the application if the TV input
changes the position of SurfaceView via Session.layoutSurface().
This change punches a hole as large as TvView so that the underlying
overlayview can be shown properly.

Bug: 18420642
Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
 2014-11-19 20:27:55 +09:00
Nicolas Prevot
439f17e622 am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '76ea69b35e45f4b23dfb7b39c6cd790b00576526':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 09:55:44 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Alan Viverette
4be155e81a am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'a489f0b3d9007d94ba514bf4ce71ce9957147e33':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:34:59 +00:00
Alan Viverette
a489f0b3d9 Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 2014-11-19 02:28:37 +00:00