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

97636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
ace7404de8 resolved conflicts for merge of d7337fb9 to master 
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
 2012-12-11 15:21:02 -08:00
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
 2012-12-11 14:19:41 -08:00
Stephen Hines
fba73030d6 Merge "Test bounds on rsForEach calls." 2012-12-11 14:19:10 -08:00
Jeff Brown
3781523bec am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
  Play a tone when wireless charging begins.
 2012-12-11 14:17:50 -08:00
Jeff Brown
eaae7d976a Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 2012-12-11 14:14:54 -08:00
Chet Haase
8ee38721e0 Merge "Fix requestLayout-during-layout issue with Gallery" 2012-12-11 14:09:29 -08:00
Chet Haase
bfea76c787 Fix requestLayout-during-layout issue with Gallery 
The way that the Gallery was adding views (which it does in layout)
triggered a requestLayout() because of a call to setLayoutParams()
in View.addViewInner(). This tripped up the new logic that makes
layout-in-layout work, causing layout to be called on every frame,
even when the app was not doing anything.

The fix is to call the appropriate version
of requestLayoutInner() to tell it to skip calls to requestLayout().

Issue #7714495 requestLayout in endless loop

Change-Id: Icdcd886d30e4dd972da36bc6e50732c7213530c5
 2012-12-11 14:05:24 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins. 
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
 2012-12-11 12:55:03 -08:00
John Spurlock
bbb9703860 am 5ccefdd6: am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '5ccefdd6d570a084ce708d7f4654358ef7108451':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:59:28 -08:00
The Android Open Source Project
4f67c7515b am 6c0ad7a0: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '6c0ad7a0644a393e3a89a35fbd80e8f86458585c':
 2012-12-11 11:57:03 -08:00
John Spurlock
5ccefdd6d5 am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '49cc9cb85376bad11611966fcdbe58dae1ab7a56':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:56:56 -08:00
The Android Open Source Project
6c0ad7a064 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I1ff629cf6a936691e18b7857c1f796a3ed55fc47
 2012-12-11 11:54:15 -08:00
John Spurlock
49cc9cb853 am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '5def50da0de624abeafafe71dc72b4baf423b985':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:53:53 -08:00
John Spurlock
5def50da0d Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 2012-12-11 11:51:41 -08:00
Amith Yamasani
03cb98aecf Move Observer test to servicetests 
Change-Id: Ib3493af4eb3185db79004a3cad5473161ed51f71
 2012-12-11 11:15:25 -08:00
Amith Yamasani
e03c17f1cb Merge "Move one more test." 2012-12-11 11:08:06 -08:00
Amith Yamasani
814a8d35ae Move one more test. 
Change-Id: Iea0e0b5727746f2332db2ab1c1b216326eb50f13
 2012-12-11 11:06:21 -08:00
Craig Mautner
28db197580 Merge "Share the pending layout changes" 2012-12-11 10:51:30 -08:00
Amith Yamasani
3a57213c2d Merge "Fix build. Forgot to move this test." 2012-12-11 10:43:45 -08:00
Craig Mautner
74c9671855 Merge "Recouple layout and animation a bit." 2012-12-11 10:42:42 -08:00
Amith Yamasani
8ff9a156c0 Fix build. Forgot to move this test. 
Change-Id: I06aab8ec6e2dac86b65bbeed3587444260fec2e8
 2012-12-11 10:42:09 -08:00
Amith Yamasani
16db3c72c0 Merge "Move lingering services to services.jar." 2012-12-11 10:04:07 -08:00
Craig Mautner
07ce651137 Merge "Further refine test for window gone." 2012-12-11 09:54:22 -08:00
Jeff Sharkey
7a96c39c51 Move lingering services to services.jar. 
This helps reduce the pressure on framework.jar, and makes it clear
that it should only be used by the system_server.

Bug: 7333397
Change-Id: I0858904239535380fbf30562b793e277d8c3f054
 2012-12-11 09:50:50 -08:00
Craig Mautner
ccc9e9b936 Further refine test for window gone. 
Do not treat a window that is animating as being onscreen until it
has been drawn. The indication that a window was "gone" was occurring
too soon resulting in windows appearing before the status bar came
back and having to be drawn twice, with and without the status bar.
By waiting for the window to be drawn the status bar appears and the
window does not have to get redrawn.

Bug 7696315 fixed.

Change-Id: Ic93bf6eed03cf12a92a656791725a6d26e0ad0e9
 2012-12-11 09:49:38 -08:00
Baligh Uddin
151cb90c60 Merge "Import translations. DO NOT MERGE" 2012-12-10 20:42:38 -08:00
Baligh Uddin
32de9220e0 Merge "Import translations. DO NOT MERGE" 2012-12-10 20:32:41 -08:00
Baligh Uddin
51b2592153 am fca736b8: (-s ours) am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'fca736b889759c585629f5cbfae6667612a326c5':
  Import translations. DO NOT MERGE
 2012-12-10 20:26:22 -08:00
Baligh Uddin
fca736b889 am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'c39adf91c9d99eea31d9e83fa3c905516ebbb37e':
  Import translations. DO NOT MERGE
 2012-12-10 20:23:59 -08:00
Baligh Uddin
c39adf91c9 am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd39a0d8041cec16429331937ec81d55f18b0db72':
  Import translations. DO NOT MERGE
 2012-12-10 20:22:17 -08:00
Baligh Uddin
984e4b5add am 8672f044: (-s ours) am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '8672f044ffba414c6caade21cff8b55a707713f0':
  Import translations. DO NOT MERGE
 2012-12-10 20:21:39 -08:00
Baligh Uddin
8672f044ff am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
  Import translations. DO NOT MERGE
 2012-12-10 20:20:17 -08:00
Baligh Uddin
d39a0d8041 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-10 20:19:06 -08:00
Baligh Uddin
73f6e3f583 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-10 20:17:14 -08:00
Mita Yun
b84b9c2191 am 81f82d29: am aa8dc2ee: Removed mCallbackLooper from WallpaperService 
* commit '81f82d29ed3c93704c4fa0cbfeb48a675b71c349':
  Removed mCallbackLooper from WallpaperService
 2012-12-10 19:50:11 -08:00
The Android Automerger
20340705bb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 19:33:40 -08:00
Mita Yun
81f82d29ed am aa8dc2ee: Removed mCallbackLooper from WallpaperService 
* commit 'aa8dc2ee18c15a5c7fb897d2f41116950fd30fe6':
  Removed mCallbackLooper from WallpaperService
 2012-12-10 18:36:01 -08:00
Mita Yun
aa8dc2ee18 Removed mCallbackLooper from WallpaperService 
Change-Id: Icb060a9225dbe7e848bbe80e6a9ab28fcfb59969
 2012-12-10 18:32:03 -08:00
Wink Saville
875eef2daa am 8c0e3c23: am 74199056: Merge "Add config_speed_up_audio_on_mt_calls option" 
* commit '8c0e3c232a9000b347b18340fa343a15d4434d7b':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 18:13:29 -08:00
Wink Saville
8c0e3c232a am 74199056: Merge "Add config_speed_up_audio_on_mt_calls option" 
* commit '7419905676db3cecb011d7e63a0eb64421e02b55':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 18:11:34 -08:00
Stephen Hines
cca2455dc1 Test bounds on rsForEach calls. 
Change-Id: I1dedfda90200bac984b552d52e1ac26523085357
 2012-12-10 17:45:33 -08:00
Alex Yakavenka
4fee26799e am 176c7a2b: am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '176c7a2b72ff3ee6c34096cb637a48058a7b6798':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:36:45 -08:00
Alex Yakavenka
176c7a2b72 am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '4d56777e678ab17379ec54a0875a14299817da8e':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:08:58 -08:00
Alex Yakavenka
4d56777e67 am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '32b424f7240580e3948f44559050262e18de99d8':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:06:44 -08:00
Wink Saville
7419905676 Merge "Add config_speed_up_audio_on_mt_calls option" 2012-12-10 17:03:46 -08:00
Mita Yun
d44280e288 resolved conflicts for merge of ebcbfb3f to master 
Change-Id: I0658dd4a1418fbad91d9663e5b52418a979dc683
 2012-12-10 16:50:22 -08:00
Alex Yakavenka
32b424f724 Add config_speed_up_audio_on_mt_calls option 
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
 2012-12-10 15:47:35 -08:00
Adam Powell
f930fee835 Merge "Set an ID for the action bar's Spinner" 2012-12-10 15:44:09 -08:00
Adam Powell
29c04ef841 Set an ID for the action bar's Spinner 
This ensures state is preserved properly.

Change-Id: I4bdccaf9b8a30a0a38466a5615cebbb596d80fb4
 2012-12-10 15:42:22 -08:00
Adam Powell
6a7304c95b Merge "Clear SearchView query field when collapsed as an action view" 2012-12-10 15:38:33 -08:00