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

91664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
6cbaf15465 am c77a2594: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'c77a2594c79a280173874a37143d70b2391e3233':
  Import translations. DO NOT MERGE
 2012-10-10 21:21:04 -07:00
Baligh Uddin
615a6948b2 Merge "Import translations. DO NOT MERGE" 2012-10-10 21:19:55 -07:00
Baligh Uddin
caff48e3b1 am eb214524: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'eb214524be8b41a246b4e544cf5cbf30b16497f2':
  Import translations. DO NOT MERGE
 2012-10-10 21:19:27 -07:00
Baligh Uddin
eb214524be Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-10 21:16:53 -07:00
Baligh Uddin
c77a2594c7 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-10 21:07:49 -07:00
Jeff Brown
3c584f20ac Use exactly the same timings for the ElectronBeam as JB. 
Bug: 7318962
Change-Id: Ic04bac5b07ec64fed84a6381ee1916ddeed01255
 2012-10-10 19:47:18 -07:00
Jim Miller
71b3cd56a6 Final keyguard tablet layout integration 
This change integrates the finalized tablet layouts for keyguard.  It supports
both 7" and 10" tablets and makes some minor tweaks on phones.

Bug 7094419

Change-Id: I7b683382974de509e8045210544ea959db82e72d
 2012-10-10 19:02:40 -07:00
Dianne Hackborn
8d866e52b2 More on issue #7318666: hide developer options from user build 
The action to launch the developer settings panel is now required
by the platform.

Add a new hidden API to LauncherActivity so I can better integrate
these into the existing Dev Tools app.

Change-Id: I9c082622fd4c8f4a5be51cabb664741a3782ece1
 2012-10-10 18:39:45 -07:00
Fabrice Di Meglio
287fc821bc am ce6e952c: am 91622961: am f6215e55: Fix the build 
* commit 'ce6e952cd2026dae30d1ccc13c118c375eca99e4':
  Fix the build
 2012-10-10 18:31:31 -07:00
Fabrice Di Meglio
ce6e952cd2 am 91622961: am f6215e55: Fix the build 
* commit '91622961171c5710a36a4123e2c8f406b026f51a':
  Fix the build
 2012-10-10 18:29:44 -07:00
Fabrice Di Meglio
9162296117 am f6215e55: Fix the build 
* commit 'f6215e55df1ab4f6cda33dd081c0a91062a1be63':
  Fix the build
 2012-10-10 18:28:02 -07:00
Fabrice Di Meglio
f6215e55df Fix the build 
Change-Id: I9c79677ee4f68d6fc82b754d08e701229725c2a6
 2012-10-10 18:23:00 -07:00
Chris Wren
cea520747f resolve conflicting assumptions from the merge. 
Bug: 7300843
Change-Id: I5894fba34550d1b98f6cbe5ca808820b70e19819
 2012-10-10 21:06:11 -04:00
Tim Murray
07fd8b4fc5 am b97bf6c4: am ab01a9e4: am b2d55225: Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev 
* commit 'b97bf6c458689a5e4284b902f0c012b4ebe273b0':
  Add DAG validation for ScriptGroups.
 2012-10-10 17:42:41 -07:00
Tim Murray
b97bf6c458 am ab01a9e4: am b2d55225: Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev 
* commit 'ab01a9e4affac86a138a7b22a2d27f80d02446dc':
  Add DAG validation for ScriptGroups.
 2012-10-10 17:40:38 -07:00
Tim Murray
ab01a9e4af am b2d55225: Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev 
* commit 'b2d552259ebe254fe3fc830e71caadef9d72a778':
  Add DAG validation for ScriptGroups.
 2012-10-10 17:38:47 -07:00
Tim Murray
b2d552259e Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev 2012-10-10 17:35:12 -07:00
Fabrice Di Meglio
6acf744fab am f4a1dad6: am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit 'f4a1dad63db89b805df0c83b2044dad0d60e3686':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:34:52 -07:00
Fabrice Di Meglio
f4a1dad63d am 5b04d032: am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit '5b04d0320b877693fe10f70773657585c1c4aa58':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:32:47 -07:00
Svetoslav Ganov
38fbe45d7d am c4160940: am e34b3243: am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev 
* commit 'c41609408bbafa48cb222be40a4e43b88d3d09dc':
  Fix WebView accessibility scripts.
 2012-10-10 17:31:34 -07:00
Fabrice Di Meglio
5b04d0320b am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 
* commit 'b8021a88e5c00ebd985a348b56af29c95a178a90':
  Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)
 2012-10-10 17:29:52 -07:00
Svetoslav Ganov
c41609408b am e34b3243: am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev 
* commit 'e34b32430ab8885951dbedc0a2c339da654c989c':
  Fix WebView accessibility scripts.
 2012-10-10 17:29:25 -07:00
Romain Guy
451f912411 am 146f0412: am 21ff8c9c: am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 
* commit '146f04122ae674419fd35ff6d683b58e437d6136':
  Prevent possible divide by 0 Bug #7307304
 2012-10-10 17:26:42 -07:00
Fabrice Di Meglio
b8021a88e5 Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev 2012-10-10 17:26:41 -07:00
Svetoslav Ganov
e34b32430a am 02f0daa5: Merge "Fix WebView accessibility scripts." into jb-mr1-dev 
* commit '02f0daa580a3d97f64e126198e42c3247ee37517':
  Fix WebView accessibility scripts.
 2012-10-10 17:26:17 -07:00
Svetoslav Ganov
02f0daa580 Merge "Fix WebView accessibility scripts." into jb-mr1-dev 2012-10-10 17:23:48 -07:00
Romain Guy
1ced04fce1 am 9068e1b6: am 3bb02a34: am 38a64240: Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 
* commit '9068e1b6cc6963ce5031e7a4c9b96965b099c2a6':
  Allow 9patches to shrink Bug #7307304
 2012-10-10 17:23:39 -07:00
Jean-Michel Trivi
7e04bd1cc1 am afb19545: am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev 
* commit 'afb195453a40ba41ee4a08a1d920110c5b8af58e':
  Don't play notifications during speech recognition
 2012-10-10 17:23:22 -07:00
Adam Powell
01c0eecf8d am 223e0a8a: am cd480277: am fb901079: Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 
* commit '223e0a8a117c8e54f3bbe9976de57f556db047c4':
  Fix MediaRouter prioritization around a2dp devices
 2012-10-10 17:23:18 -07:00
Brian Colonna
7b19cf630d am c32f65ba: am 4d757625: am 6b17799b: Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 
* commit 'c32f65bac00cb2678e669c250c6263860fc501f3':
  Suppressing FUL after user switch (fix b/7316467)
 2012-10-10 17:23:14 -07:00
Jeff Sharkey
852ebc0cee am 50035e83: am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '50035e83963a20e91a764054004fbda8f0a85807':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 17:23:09 -07:00
Katie McCormick
a5259759eb am ef0eaa5e: am ed6059a2: am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev 
* commit 'ef0eaa5e661d9eb21974c290a121b35fc78b8bcb':
  Doc changes: misc GCM updates.
 2012-10-10 17:22:50 -07:00
Romain Guy
146f04122a am 21ff8c9c: am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 
* commit '21ff8c9cf22b38ad577d7eb01088cb49274cb22d':
  Prevent possible divide by 0 Bug #7307304
 2012-10-10 17:21:07 -07:00
Romain Guy
21ff8c9cf2 am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 
* commit '1460c8ca094e2e1cbf19a71319341fbc7678cfd9':
  Prevent possible divide by 0 Bug #7307304
 2012-10-10 17:19:06 -07:00
Romain Guy
1460c8ca09 Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev 2012-10-10 17:16:34 -07:00
Romain Guy
9068e1b6cc am 3bb02a34: am 38a64240: Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 
* commit '3bb02a347f453136dff28720aaf9d7db2f517bb4':
  Allow 9patches to shrink Bug #7307304
 2012-10-10 17:15:37 -07:00
Romain Guy
3bb02a347f am 38a64240: Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 
* commit '38a642401332088cb8e09b23b6cdb617a7a70ccd':
  Allow 9patches to shrink Bug #7307304
 2012-10-10 17:13:38 -07:00
Romain Guy
c37f349ecf Prevent possible divide by 0 
Bug #7307304

Should never happen, but eh :))

Change-Id: Ic7a09fd5c7a3622e6b4963f9ee6920e232018e2e
 2012-10-10 17:13:36 -07:00
Romain Guy
38a6424013 Merge "Allow 9patches to shrink Bug #7307304" into jb-mr1-dev 2012-10-10 17:10:24 -07:00
alanv
df313699ba Fix WebView accessibility scripts. 
Ensures A11y APIs are added to WebView before page loads. Prevents calls
to TTS before init and after shutdown. Ensures calls to TTS are thread-
safe. Activates and deactivates feedback from AndroidVox when view is
attached and detached. Adds a flag for logging debug output, as well as
a lot of debug output.

Bug: 7326781
Change-Id: I5d4ab7f9fb1669f98ef05ae207e897565d3086c9
 2012-10-10 17:09:11 -07:00
Fabrice Di Meglio
2918ab6c32 Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int) 
- rename to LayoutParams.resolveLayoutDirection(int)
- upate 17.txt too

Change-Id: I54fe28dc47cfdb65ef0b5b0244dabbe1d675c781
 2012-10-10 16:47:51 -07:00
Jean-Michel Trivi
afb195453a am 7e466e89: am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev 
* commit '7e466e894ad4738a76c94c871cfc2f900518aea8':
  Don't play notifications during speech recognition
 2012-10-10 16:36:07 -07:00
Adam Powell
223e0a8a11 am cd480277: am fb901079: Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 
* commit 'cd4802776d6ea817e08619956d5fe35c11acc225':
  Fix MediaRouter prioritization around a2dp devices
 2012-10-10 16:34:23 -07:00
Brian Colonna
c32f65bac0 am 4d757625: am 6b17799b: Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 
* commit '4d7576254f9604f60332d16951a220f856f79b51':
  Suppressing FUL after user switch (fix b/7316467)
 2012-10-10 16:34:15 -07:00
Chet Haase
c61d70ec46 Cache wallpaper bitmap to avoid re-loading on rotation 
Screen rotations force static wallpapers to get recreated. One of the things
that happens is that the underlying bitmap resource is loaded. This can be quite
expensive for large bitmaps (which is the case on large-display devices).
A simple optimization is to retain the bitmap in the wallpaper process, to avoid
this re-loading step. We still re-draw and re-upload the texture, but at least
we don't re-load the thing.

Issue #7324823 Manta wallpaper decode performance is atrocious

Change-Id: I0748e275a55992d13704a7dec5910d2dbdc9e2a4
 2012-10-10 16:33:31 -07:00
Jean-Michel Trivi
7e466e894a am bcfc1ca8: Merge "Don\'t play notifications during speech recognition" into jb-mr1-dev 
* commit 'bcfc1ca8ab8bf057e20d9369af3d007d80ca83e4':
  Don't play notifications during speech recognition
 2012-10-10 16:33:15 -07:00
Jeff Sharkey
50035e8396 am 89be4267: am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '89be4267d0a23ca258af607291bc4f905f963185':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:32:36 -07:00
Adam Powell
cd4802776d am fb901079: Merge "Fix MediaRouter prioritization around a2dp devices" into jb-mr1-dev 
* commit 'fb9010798d9352fd4f9413f882ffd214d69610b5':
  Fix MediaRouter prioritization around a2dp devices
 2012-10-10 16:31:33 -07:00
Brian Colonna
4d7576254f am 6b17799b: Merge "Suppressing FUL after user switch (fix b/7316467)" into jb-mr1-dev 
* commit '6b17799b253dad55dc3df7929342d7effa3137ea':
  Suppressing FUL after user switch (fix b/7316467)
 2012-10-10 16:31:29 -07:00
Jean-Michel Trivi
bcfc1ca8ab Merge "Don't play notifications during speech recognition" into jb-mr1-dev 2012-10-10 16:30:56 -07:00