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

104969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
3569e9e50c resolved conflicts for merge of 2f6a2526 to master 
Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a
 2013-04-17 14:18:56 -07:00
Jim Miller
2f6a2526db am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 
* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
 2013-04-17 13:44:23 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Dianne Hackborn
2590a8b341 am bc463ea1: am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 
* commit 'bc463ea1c5fa9c80fa06183a82fdd1acfb5289e5':
  Fix issue #8032572: Android app permission help text "null"...
 2013-04-17 11:30:50 -07:00
Amith Yamasani
ac16c21d11 am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:30:41 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Dianne Hackborn
bc463ea1c5 am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 
* commit 'e8d12dd6b08ec5b3f2a18bee14171079c6c27e0d':
  Fix issue #8032572: Android app permission help text "null"...
 2013-04-17 11:26:05 -07:00
Dianne Hackborn
e8d12dd6b0 Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev 2013-04-17 18:21:04 +00:00
Dianne Hackborn
84c7111c4b Fix issue #8032572: Android app permission help text "null"... 
...for "Microphone / Record audio"

Change-Id: Ie839b055771950e1078fa66506a007203338cfb5
 2013-04-17 11:18:10 -07:00
Christopher Tate
a952f9d590 am 0bd7a2f2: am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 
* commit '0bd7a2f27120e945376217e2300ac2cd8bb00059':
  Lengthen the AM timeout reading crash reports slightly
 2013-04-17 11:13:29 -07:00
Christopher Tate
0bd7a2f271 am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 
* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly
 2013-04-17 11:11:30 -07:00
Christopher Tate
effb153aba Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev 2013-04-17 18:08:19 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations 
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
 2013-04-17 10:44:44 -07:00
Victoria Lease
87d591d59f Merge "resolved conflicts for merge of 6c18e2c8 to master" 2013-04-17 17:42:15 +00:00
Christopher Tate
1b64598602 Lengthen the AM timeout reading crash reports slightly 
We're missing some (small fraction of) native crash reports from
debuggerd.  It looks like under high system load the debuggerd
reporting code just isn't quite timely enough for the very short
timeouts initially deployed, so lengthen those a bit.

Bug 8552010

Change-Id: Icbc5b6517de3bb98fff1af2ea42ffd208ef20412
 2013-04-17 10:40:02 -07:00
Victoria Lease
af1653a851 resolved conflicts for merge of 6c18e2c8 to master 
Change-Id: Idb4679247b201a1f453c63fee5b45b12b03a67a1
 2013-04-17 10:33:23 -07:00
Baligh Uddin
f2928665cf Merge "Import translations. DO NOT MERGE" 2013-04-17 17:18:27 +00:00
Victoria Lease
6c18e2c89f am 25df1a82: Merge "use appropriate fallback chain for style" into jb-mr2-dev 
* commit '25df1a82a846cbdbdd2de0ce3d6741dfcfdf31fd':
  use appropriate fallback chain for style
 2013-04-17 09:27:49 -07:00
Victoria Lease
25df1a82a8 Merge "use appropriate fallback chain for style" into jb-mr2-dev 2013-04-17 16:23:38 +00:00
Daniel Sandler
a38006d74f am 74c69f1e: am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 
* commit '74c69f1e0c184faeaf0e02f2a0445d1c436b6287':
  Treat the default sound Uri the same as DEFAULT_SOUND.
 2013-04-17 09:12:11 -07:00
Daniel Sandler
74c69f1e0c am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 
* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
 2013-04-17 09:07:02 -07:00
Daniel Sandler
66769767b6 Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev 2013-04-17 16:04:33 +00:00
Baligh Uddin
9f7fd99c94 Import translations. DO NOT MERGE 
Change-Id: I912a433cb92359b877eaee39eae0a9da6679eb8f
Auto-generated-cl: translation import
 2013-04-17 08:52:28 -07:00
Daniel Sandler
3147523c10 Treat the default sound Uri the same as DEFAULT_SOUND. 
For the purposes of deciding whether or not to invoke the
"fallback vibrate", that is. (RingtonePicker will return
content://settings/system/notification_sound when "Default"
is chosen, so if the app pops this Uri directly into
Notification.sound, we should treat it like DEFAULT_SOUND
and look to see whether the system notification sound is
not None before running the fallback vibration.)

Bug: 8627641
Change-Id: Ia469b8e4d5d7647ce1a8a179f591ed7a3443b5c5
 2013-04-17 10:59:50 -04:00
Chet Haase
8c00be17e3 am 5bded3bf: am 8bba7510: Fix build - remove obsolete import of Animatable 
* commit '5bded3bfe19cdf57620c7b6fa5ae7608333f3e7e':
  Fix build - remove obsolete import of Animatable
 2013-04-17 07:07:19 -07:00
Chet Haase
5bded3bfe1 am 8bba7510: Fix build - remove obsolete import of Animatable 
* commit '8bba7510bc96d5404c070a4846318ee6a9eb1365':
  Fix build - remove obsolete import of Animatable
 2013-04-17 07:04:38 -07:00
Chet Haase
8bba7510bc Fix build - remove obsolete import of Animatable 
Change-Id: I3133669386f50177c863f8a58733be771f819a17
 2013-04-17 06:44:08 -07:00
Chet Haase
270003d636 am 91fedd82: am 873d3ca4: Merge "Remove Animatable interface" into jb-mr2-dev 
* commit '91fedd820bf51061c384d0dc18ea4d15ed22eeaf':
  Remove Animatable interface
 2013-04-17 06:42:22 -07:00
Chet Haase
91fedd820b am 873d3ca4: Merge "Remove Animatable interface" into jb-mr2-dev 
* commit '873d3ca43dc054222e635586b760125078fb7c39':
  Remove Animatable interface
 2013-04-17 06:38:38 -07:00
Chet Haase
873d3ca43d Merge "Remove Animatable interface" into jb-mr2-dev 2013-04-17 13:36:00 +00:00
Kristian Monsen
f5b69a17de am bd4dbe73: am 87c67f31: Merge "Part of fix for bug 8629392" into jb-mr2-dev 
* commit 'bd4dbe73a962426651ed256b131176f2bdecc316':
  Part of fix for bug 8629392
 2013-04-16 19:27:05 -07:00
Kristian Monsen
bd4dbe73a9 am 87c67f31: Merge "Part of fix for bug 8629392" into jb-mr2-dev 
* commit '87c67f315c0eea253c73ae7ebb40931c686a406d':
  Part of fix for bug 8629392
 2013-04-16 19:24:56 -07:00
Kristian Monsen
87c67f315c Merge "Part of fix for bug 8629392" into jb-mr2-dev 2013-04-17 02:22:26 +00:00
Craig Mautner
bbcc289dad Merge "Incremental repairs to side by side stacks." 2013-04-17 01:58:51 +00:00
Craig Mautner
53078b25c9 Merge "Implement stack splitting and task movement." 2013-04-17 01:58:15 +00:00
Craig Mautner
4cd0c13f8f Incremental repairs to side by side stacks. 
- Add taskId parameter to createStack() so stacks are pre-populated
with a task.
- Keep track of stack access order in DisplayContent so getTasks
returns in MRU order.
- Set touchableRegion in InputMonitor so modal touching does not
extend beyond stack boundary.
- Fix stack merging so that deleting a stack results in a new
stack the size of the two children.

Change-Id: I62a6ba0a34f34dd7ec866b440bf04595379e19e8
 2013-04-16 18:55:07 -07:00
Jim Miller
187ec581c6 Move owner info from Settings.Secure to LockSettings 
Fixes bug 8512972

Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
 2013-04-16 18:33:43 -07:00
Kristian Monsen
083c4dc1ac Part of fix for bug 8629392 
Adding extra logging to fix cts bugs that are only on bots

Change-Id: I24b4b7aad200ffc23c002f4a8f0fe9246991c4f0
 2013-04-16 18:14:47 -07:00
Chris Craik
e76dd37bdb am 680ca941: am ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev 
* commit '680ca9418b6b3f01547b286d1a80e07e186bc05f':
  Make layer double drawing visible in overdraw debug mode
 2013-04-16 18:02:31 -07:00
Philip Milne
d05849e887 am a1ea8019: am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 
* commit 'a1ea801956c4727656ef25177b1bb4c5b788cde7':
  Fix for bug 8272673: GridLayout in battery details is cut off.
 2013-04-16 18:02:28 -07:00
Chris Craik
680ca9418b am ec5dc76a: Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev 
* commit 'ec5dc76a15081136fa57d10a231d1c5ac5901421':
  Make layer double drawing visible in overdraw debug mode
 2013-04-16 18:00:18 -07:00
Philip Milne
a1ea801956 am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 
* commit '61527436b7fd5d8dd42eaf8052c02816e6a13887':
  Fix for bug 8272673: GridLayout in battery details is cut off.
 2013-04-16 18:00:15 -07:00
Chris Craik
ec5dc76a15 Merge "Make layer double drawing visible in overdraw debug mode" into jb-mr2-dev 2013-04-17 00:58:43 +00:00
Philip Milne
61527436b7 Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev 2013-04-17 00:56:55 +00:00
Chet Haase
e8cee38c6a Remove Animatable interface 
Push the interface methods from the new Animatable interface back
down into Animator, from whence they came.

Issue #8634310 Remove Animatable interface

Change-Id: I79e26001709d791d54fcb02561640fe2e008b1fd
 2013-04-16 17:54:14 -07:00
Ben Gruver
303d004ca0 am e920a298: am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 
* commit 'e920a298f7ee7005b05a0d689e0aae5ca1b369e9':
  Monitor the firewall rules file for changes
 2013-04-16 17:51:04 -07:00
Ben Gruver
e920a298f7 am 53f22ad9: Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 
* commit '53f22ad9c30e03f4762737a722b2762dcf934523':
  Monitor the firewall rules file for changes
 2013-04-16 17:47:57 -07:00
Ben Gruver
53f22ad9c3 Merge "Monitor the firewall rules file for changes" into jb-mr2-dev 2013-04-17 00:44:56 +00:00
Jamie Gennis
a720a87fde am a0b28ca7: am 95a869f9: Merge "Disable tracing from Zygote" into jb-mr2-dev 
* commit 'a0b28ca74806dcf46300d82ebb689b002bd36955':
  Disable tracing from Zygote
 2013-04-16 17:01:12 -07:00