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

100450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
8cf1921fc0 am 7f84ed31: Merge "Dynamically configurable accessibility flags mishandled." 
* commit '7f84ed31f01997d4906e408c335f783a91d197d5':
  Dynamically configurable accessibility flags mishandled.
 2013-02-15 15:29:25 -08:00
Svetoslav
7f84ed31f0 Merge "Dynamically configurable accessibility flags mishandled." 2013-02-15 23:26:59 +00:00
Svetoslav
9e065121fa Dynamically configurable accessibility flags mishandled. 
A bug was preventing clearing dynamically settable accessibility
service flags.

bug:8051095

Change-Id: I6844b2f44e323bc741ac39983a892f1d28f3132b
 2013-02-15 15:24:13 -08:00
Laurent Tu
1662cf99b6 am 8acb27c5: Merge "Tentative fix for aidl import issue" 
* commit '8acb27c505c610b4027ec3d140ccc7722ab4faa3':
  Tentative fix for aidl import issue
 2013-02-15 15:19:22 -08:00
Laurent Tu
8acb27c505 Merge "Tentative fix for aidl import issue" 2013-02-15 23:16:08 +00:00
Dirk Dougherty
9002ffeb97 am 156a2fc6: am 5fce0c1f: am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '156a2fc65a2b493a73fa1031f54664a8086c5f4e':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:13:38 -08:00
Dirk Dougherty
156a2fc65a am 5fce0c1f: am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '5fce0c1fe3352ae7c69dc67be1ff84425e11455a':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:12:37 -08:00
Dirk Dougherty
5fce0c1fe3 am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:11:25 -08:00
Dirk Dougherty
e91b053369 am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'ed0c6fe66ce836431ba999cb79fa0d1441e21997':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:08:33 -08:00
Dirk Dougherty
ed0c6fe66c am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '531375f9bdca84a34a0ca5bdba34f44f0b34ed50':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:06:00 -08:00
Dirk Dougherty
531375f9bd am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '34434badf6ca2fd04c088e2971d33ded39158d22':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:03:37 -08:00
Dirk Dougherty
34434badf6 Doc change: Edits for RTL in highlights. 
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
 2013-02-15 15:00:43 -08:00
Baligh Uddin
d2f4998aa5 am e1fbc6d7: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'e1fbc6d7fb2ab0d5e9488adb426813d316e17789':
  Import translations. DO NOT MERGE
 2013-02-15 14:49:52 -08:00
Baligh Uddin
e1fbc6d7fb Merge "Import translations. DO NOT MERGE" 2013-02-15 22:43:35 +00:00
Baligh Uddin
2af2cdeb4f Merge branch 'master-chromium' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into master-chromium 2013-02-15 14:43:09 -08:00
Baligh Uddin
36efbea8dd am 21741f87: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '21741f8734f35b9089fbb53b329971837d331274':
  Import translations. DO NOT MERGE
 2013-02-15 14:43:05 -08:00
Baligh Uddin
1234a8b6c1 Merge "Import translations. DO NOT MERGE" into master-chromium 2013-02-15 22:41:31 +00:00
Baligh Uddin
21741f8734 Merge "Import translations. DO NOT MERGE" 2013-02-15 22:39:22 +00:00
Mathias Agopian
76f56dd598 am ceec31b7: Merge changes I5a218ca1,I853a76d9 
* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split
 2013-02-15 14:28:22 -08:00
Romain Guy
df93fdb6c0 am aa8307b9: Merge "Remove obsolete header file" 
* commit 'aa8307b991b9fca5403b5d7f43659b92527af4fd':
  Remove obsolete header file
 2013-02-15 14:28:19 -08:00
Mathias Agopian
ceec31b7da Merge changes I5a218ca1,I853a76d9 
* changes:
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split
 2013-02-15 22:08:40 +00:00
Romain Guy
aa8307b991 Merge "Remove obsolete header file" 2013-02-15 21:58:29 +00:00
Baligh Uddin
4cf32d2e9f Import translations. DO NOT MERGE 
Change-Id: I12eb67341bf7801d996bfaef6ede235dbb3daecd
Auto-generated-cl: translation import
 2013-02-15 13:43:45 -08:00
Baligh Uddin
605e962d8e Import translations. DO NOT MERGE 
Change-Id: I78574a679d2a22599bc131019a9e2049fb499634
Auto-generated-cl: translation import
 2013-02-15 13:39:10 -08:00
Baligh Uddin
570bf48d4a Import translations. DO NOT MERGE 
Change-Id: Id6fd43d678aa4013c8d8214ac9b6b66de3982d69
Auto-generated-cl: translation import
 2013-02-15 13:37:31 -08:00
Adam Powell
2bec1e3d8c am fdc61af1: Merge "Fix missing onSingleTapConfirmed calls in GestureDetector" 
* commit 'fdc61af16ffdbaa699431db2f008a424bd79f655':
  Fix missing onSingleTapConfirmed calls in GestureDetector
 2013-02-15 13:11:15 -08:00
Adam Powell
fdc61af16f Merge "Fix missing onSingleTapConfirmed calls in GestureDetector" 2013-02-15 21:08:07 +00:00
Mathias Agopian
5280061794 Refactoring: Rename SurfaceTextureClient to Surface 
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
 2013-02-15 12:47:40 -08:00
Mathias Agopian
29479ebe10 clean-up following Surface split 
Change-Id: I853a76d92d957ee38a36fcdd280d6407ec316987
 2013-02-15 12:47:40 -08:00
Romain Guy
13ba005484 Remove obsolete header file 
We now use the same mechanism to compare keys everywhere in libhwui.

Change-Id: I8b3cb25b13f4f38eb6f12aed0356f796a773617c
 2013-02-15 12:47:26 -08:00
Svetoslav
06bab4e2d3 am c145317d: Merge "User switch not handled properly in the accessibility manager service." 
* commit 'c145317d0b19fbd1e7aff8519696146853367b89':
  User switch not handled properly in the accessibility manager service.
 2013-02-15 12:33:21 -08:00
Svetoslav
c145317d0b Merge "User switch not handled properly in the accessibility manager service." 2013-02-15 20:30:17 +00:00
Svetoslav
5fec0c5ee5 User switch not handled properly in the accessibility manager service. 
On user switch the transient state of the old user was not cleared
which means that when we switch back to this user the operational
state such as which event types were dispatched, what state was sent
to local managers, etc is stale. This leads to semi-updated state
and broken behavior. Now if the user becomes inactive, we are clearing
all transient state which will be recreated when the user becomes
active.

bug:8196652

Change-Id: Ie9e0d712b6d567e5074b328f1bb87afaa5395c06
 2013-02-15 12:29:17 -08:00
Christopher Tate
c5f09df8fd am afc43ed9: Merge "Full backup now saves getExternalFilesDir() content with the app data" 
* commit 'afc43ed9a765766fc35477f42cbc6bfdad0b1067':
  Full backup now saves getExternalFilesDir() content with the app data
 2013-02-15 11:42:30 -08:00
Christopher Tate
afc43ed9a7 Merge "Full backup now saves getExternalFilesDir() content with the app data" 2013-02-15 19:38:08 +00:00
Adam Powell
eca3e6065e Fix missing onSingleTapConfirmed calls in GestureDetector 
Eliminate the short period of time between the tap timeout and long
press causing onSingleTapConfirmed not to be dispatched when apps
expect.

Bug 8124095

Change-Id: I9841ab2a8eb3fee7d57e744e1c8e0e42e108d5f6
 2013-02-15 11:27:02 -08:00
Michael Wright
ffba162241 am 00e59227: Merge "Fix default behavior for gamepad buttons" 
# Via Android (Google) Code Review (1) and Michael Wright (1)
* commit '00e592272ee44cba41832e3cf0a0ffb2de56585d':
  Fix default behavior for gamepad buttons
 2013-02-15 00:09:26 -08:00
Kristian Monsen
41250b67fe resolved conflicts for merge of 101ae3bb to master-chromium 
Only include file changes in conflict.

Change-Id: I1b6eb3343e7163827d8031ffea4b77f294980ccc
 2013-02-14 23:59:27 -08:00
Kristian Monsen
88e4b3ff90 Final merge fix 
Fixing a crash on reboot. After this it builds and cts tests passes
as before. I don't have a device locally so can't see if it
actually works.

Change-Id: I56cd09d5f83f8096ba0fe8aa8e93ca4286f42e3a
 2013-02-14 23:07:35 -08:00
Kristian Monsen
e32e2b343d Fixup from merge, and compile fix due to different skia version 
Change-Id: I644c5148904893a2854207f4d566395d973d4aff
 2013-02-14 21:37:01 -08:00
Jeff Sharkey
a55e29a475 am 7b3745fe: Merge "Update scrubClass() to match CoreTestRunner." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7b3745fe9aa0d78add1045258d2855d5980a650b':
  Update scrubClass() to match CoreTestRunner.
 2013-02-14 19:59:06 -08:00
Victoria Lease
c85637f0e6 am c69bce2e: Merge "fix argument mismatches in Paint JNI" 
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'c69bce2e41c70da35e1b6a2ab5ec44469ab14c80':
  fix argument mismatches in Paint JNI
 2013-02-14 19:59:03 -08:00
Adam Powell
eaa74a42f9 am 9d40d872: Merge "Add support for shadows in TextAppearance styles" 
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '9d40d8720d422fc39068e7b0b0ae6f13621c3de1':
  Add support for shadows in TextAppearance styles
 2013-02-14 19:58:59 -08:00
Jeff Sharkey
0438d0ded5 am 07aef1c7: Merge "Remove throttle settings, no longer needed." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '07aef1c78a92e70552f269b37615c19aea042410':
  Remove throttle settings, no longer needed.
 2013-02-14 19:58:56 -08:00
Jeff Sharkey
452d589c65 am 7ee9f636: Merge "Expose longer statfs values, add derived values." 
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '7ee9f636284584affa54b9735ccf157375b1c065':
  Expose longer statfs values, add derived values.
 2013-02-14 19:58:53 -08:00
Mathias Agopian
163117bdad am bfcae359: Surface doens\'t have an identity anymore 
# Via Mathias Agopian
* commit 'bfcae3595900b79401d635022bd6d30a5b5a6576':
  Surface doens't have an identity anymore
 2013-02-14 19:58:50 -08:00
Mathias Agopian
0233b6ee33 am 30d7ab9a: fix docs build 
# Via Mathias Agopian
* commit '30d7ab9a10fcde397bae7bed5f16d1094fded8b2':
  fix docs build
 2013-02-14 19:58:47 -08:00
Craig Mautner
924bf18c75 am 22ee9aad: Merge "Reset and reuse Iterators and don\'t new() one." 
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '22ee9aad834b055df1bd5d5544e37a63edc963fe':
  Reset and reuse Iterators and don't new() one.
 2013-02-14 19:58:44 -08:00
Kenny Root
647771659c am 0786207b: am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()" 
# Via Android Git Automerger (2) and others
* commit '0786207be59d34a8ba8a7a1e93602002fac97587':
  KeyStore: stop using state()
 2013-02-14 19:58:33 -08:00
Kristian Monsen
1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium 
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
 2013-02-14 19:48:27 -08:00