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

104950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
ad435ba7ff Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev 2013-04-16 21:41:09 +00:00
Jesse Hall
8065804653 am f454b52e: am 811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev 
* commit 'f454b52ee7d7bdd2fe207860921ca58eeed19017':
  Add android.opengl.GLES30, hidden for now
 2013-04-16 14:38:59 -07:00
Jesse Hall
f454b52ee7 am 811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev 
* commit '811d373444822b1a81cd6fb4f8ef87f6d49559b1':
  Add android.opengl.GLES30, hidden for now
 2013-04-16 14:35:40 -07:00
Jesse Hall
811d373444 Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev 2013-04-16 21:32:36 +00:00
Irfan Sheriff
b8df5451f4 Fix enabling networks after driver stop 
Bug: 8630194
Change-Id: If897fc1fe54bf2f35362b8482e56d98f80a3130c
 2013-04-16 14:16:18 -07:00
Wink Saville
b436a328a5 am bab00057: am c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev 
* commit 'bab000578d7ad6b380c558f28685d2303b64abc8':
  Add mHasQuit to fix an NPE in StateMachine.
 2013-04-16 13:41:10 -07:00
Wink Saville
bab000578d am c6f2d17a: Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev 
* commit 'c6f2d17a0a6f9b172ff91247db12bc39a601f81c':
  Add mHasQuit to fix an NPE in StateMachine.
 2013-04-16 13:37:18 -07:00
Wink Saville
c6f2d17a0a Merge "Add mHasQuit to fix an NPE in StateMachine." into jb-mr2-dev 2013-04-16 20:33:00 +00:00
Wink Saville
03812c7894 Add mHasQuit to fix an NPE in StateMachine. 
After quiting mStateStack and other variables become
null so ignore all messages.

Bug: 8627228
Change-Id: I60150fb8023340768b38c2e72a8cbc982a59e0a8
 2013-04-16 13:21:00 -07:00
Dmitry Shmidt
dfddc9e5cf softap: Set broadcast option explicitly 
Change-Id: I3f045b5427e68223d0b0be995d3d8c00a9ad21bc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-04-16 13:20:35 -07:00
Jaikumar Ganesh
b993c039af am 6a622dcf: am 37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev 
* commit '6a622dcf18fcb025766e26e1ac7b3138f92dc6e6':
  Fix wrong index value.
 2013-04-16 12:53:03 -07:00
Jaikumar Ganesh
6a622dcf18 am 37f58dcc: Merge "Fix wrong index value." into jb-mr2-dev 
* commit '37f58dccecd778f5af1f1f1db492c75ec5fcabd6':
  Fix wrong index value.
 2013-04-16 12:03:28 -07:00
Jaikumar Ganesh
37f58dccec Merge "Fix wrong index value." into jb-mr2-dev 2013-04-16 18:59:32 +00:00
Jaikumar Ganesh
edb5242355 Fix wrong index value. 
Rotation vector was at the wrong index value.

b/8165631

Change-Id: I50662befabf80393965c94a0335359019b98eb85
 2013-04-16 11:59:07 -07:00
Daniel Sandler
1aec006be7 am 21f492b7: am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev 
* commit '21f492b76a019828a3ff9785641c92dd548fed98':
  Rebuild quick settings tile layouts.
 2013-04-16 11:38:01 -07:00
Daniel Sandler
21f492b76a am cfd48d77: Merge "Rebuild quick settings tile layouts." into jb-mr2-dev 
* commit 'cfd48d77a2d11324ce8641a9cc178fb9f12500a3':
  Rebuild quick settings tile layouts.
 2013-04-16 11:35:48 -07:00
Daniel Sandler
cfd48d77a2 Merge "Rebuild quick settings tile layouts." into jb-mr2-dev 2013-04-16 18:33:10 +00:00
Svetoslav
1f65c79dbd am a60c8c25: am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 
* commit 'a60c8c25fdd3c9c7ae6807f7c208697a989a7486':
  BinderDied may be called after we unregistered the death recipient.
 2013-04-16 11:32:29 -07:00
Romain Guy
dc7e79d66e Merge "Fix indentation" 2013-04-16 18:30:56 +00:00
Svetoslav
a60c8c25fd am 8297e68d: Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 
* commit '8297e68d84a6edc8ecb6d17d5ba2043075f921ff':
  BinderDied may be called after we unregistered the death recipient.
 2013-04-16 11:30:18 -07:00
Romain Guy
09d3636485 Fix indentation 
Change-Id: If54b7d7c016acb5e7300323d2eada57142a814c0
 2013-04-16 11:30:05 -07:00
Svetoslav
8297e68d84 Merge "BinderDied may be called after we unregistered the death recipient." into jb-mr2-dev 2013-04-16 18:27:43 +00:00
Chet Haase
b0354021a5 am b718735a: am b2488931: Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev 
* commit 'b718735aae23455126719ba0b23edf2a64875f4e':
  Avoid repositioning unattached overlay views
 2013-04-16 11:05:54 -07:00
Chet Haase
b718735aae am b2488931: Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev 
* commit 'b2488931cbd25c0e9dbc648882e272048c075741':
  Avoid repositioning unattached overlay views
 2013-04-16 11:02:29 -07:00
Chet Haase
b2488931cb Merge "Avoid repositioning unattached overlay views" into jb-mr2-dev 2013-04-16 17:58:37 +00:00
Victoria Lease
cc0f9d8469 use appropriate fallback chain for style 
TextLayoutShaper was defaulting to the Regular-style fallback chain
for all unknown scripts. This became problematic in that the
codepoint->glyphID enumeration stage of shaping was always using the
Regular-style fallback chain for unknown scripts, and there's no
guarantee that glyph indices are compatible between fallback chains.

Defaulting to a style-appropriate fallback chain addresses this
issue, and probably unreported but related issues, as well.

Bug: 8189208
Change-Id: I6ecf531c74d71a8e4a5359d23439ccc950b0cf80
 2013-04-16 09:51:45 -07:00
John Spurlock
32beb2c6b1 Hideybars part I - Overlay status bar via an intent. 
Implement new mode for status bar, allowing it to overlay
windows that use WM.LP.FLAG_FULLSCREEN, and introduce
transparency.

No gesture is implemented yet, for now the auto-hiding
status bar can be shown using a debugging intent.
  android.intent.action.HIDEYBARS

The auto-hiding status bar hides 3 seconds after shown,
or 3 seconds after last user-interaction with the shade.

Change-Id: Ie4bd625b9cbcddea8f818154719c7a6075972f2a
 2013-04-16 11:03:40 -04:00
John Spurlock
9c3b3aec40 Translate MR2 status bar fix to master. 
Fix is different in master due to recent keyguard refactoring.

Bug:8567697
Change-Id: Ie668ef0e3018e3f835166508afd9a72c3c1dda84
 2013-04-16 09:58:24 -04:00
John Spurlock
c724f65793 am 4f63f54f: am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev 
* commit '4f63f54fdea298358fe9c05a5f4cc975769a69af':
  FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
 2013-04-16 06:29:54 -07:00
John Spurlock
4f63f54fde am 5584737f: Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev 
* commit '5584737fff6350ab09fb53e6a73bbff770930727':
  FLAG_DISMISS_KEYGUARD should not hide status bar if secure.
 2013-04-16 06:26:51 -07:00
John Spurlock
5584737fff Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-mr2-dev 2013-04-16 13:23:47 +00:00
Dirk Dougherty
ddca710dc5 am 12d0071a: am 83d90b20: am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit '12d0071a658329088c8696a05cde764f425e6aba':
  Doc change: Add tablet basic checks.
 2013-04-15 22:05:22 -07:00
Dirk Dougherty
12d0071a65 am 83d90b20: am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit '83d90b200babe43d5e91cef1bbcf0b224f48e16d':
  Doc change: Add tablet basic checks.
 2013-04-15 22:03:10 -07:00
Dirk Dougherty
83d90b200b am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit 'ce2c3de716dd77db8f1280f939312c36ebd297ea':
  Doc change: Add tablet basic checks.
 2013-04-15 21:59:53 -07:00
Dirk Dougherty
ce2c3de716 am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit 'aac8d988e1f1863e51d3296f09373c2939137e09':
  Doc change: Add tablet basic checks.
 2013-04-15 21:56:09 -07:00
Stan Chesnutt
83a68e042a am 464f4ea3: am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 
* commit '464f4ea35526863d489255c0493786f5d3e03f6f':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
 2013-04-15 21:55:21 -07:00
Daniel Sandler
1a0f755971 am 0a8ed3f2: am 4b6d23d7: Merge "Further reduce memory usage of notification archive." into jb-mr2-dev 
* commit '0a8ed3f214ad9d4cd173cbffe6e712c395a108f6':
  Further reduce memory usage of notification archive.
 2013-04-15 21:55:15 -07:00
Daniel Sandler
7c3d3f8b62 am 220fa85e: am f094d221: Merge "Finish annotating Notification.extras." into jb-mr2-dev 
* commit '220fa85eac119fa51b1febbc4361afb4531f949b':
  Finish annotating Notification.extras.
 2013-04-15 21:55:12 -07:00
Kristian Monsen
b414527095 am 46dedde9: am 639857f7: Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-mr2-dev 
* commit '46dedde94e24d9b0785dc68f19fdf71eff68e631':
  Fix for bug 8607049: Improve javascript dialogs for classic
 2013-04-15 21:54:57 -07:00
Kenny Root
738660894d am 49f0a5df: resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp 
* commit '49f0a5df739d2da22f24ac14fe430adaffa13f3b':
  AndroidKeyStore: Add encrypted flag
 2013-04-15 21:54:52 -07:00
David Christie
f63d3c64cb am e8ae4eaf: am feedb1b0: Merge "Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently." into jb-mr2-de 
* commit 'e8ae4eafea69ccdffd91865f46ee2d569cdc1203':
  Fix security issues with LocationManager where apps with coarse permissions can get location updates too frequently by repeatedly calling getLastKnownLocation or by registering/unregistering location updates frequently.
 2013-04-15 21:54:47 -07:00
Dianne Hackborn
a40d7e7cdc am 15717a32: am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev 
* commit '15717a32c497895b294396c0000bc571790d3691':
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...
 2013-04-15 21:54:43 -07:00
Dianne Hackborn
11dfb30c2f am f5cfab41: am a59a19ab: Merge "Fix issue #8512015: VideoView\'s window animates when its position changes" into jb-mr2-dev 
* commit 'f5cfab41c3ea1eb0cd99f7a9387af7df2b2e5991':
  Fix issue #8512015: VideoView's window animates when its position changes
 2013-04-15 21:54:39 -07:00
Dirk Dougherty
aac8d988e1 am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit '14ad06cf2fc4b78182f6df4b4ebaa78453b68ff4':
  Doc change: Add tablet basic checks.
 2013-04-15 21:52:26 -07:00
Dirk Dougherty
14ad06cf2f am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit '25afd5d063b7f6bcb0f5d6bf93ac1015a5a89869':
  Doc change: Add tablet basic checks.
 2013-04-15 21:49:14 -07:00
Dirk Dougherty
25afd5d063 am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks. 
* commit 'd1dc8c70786fdeae1c0de39d4ded896663588203':
  Doc change: Add tablet basic checks.
 2013-04-15 21:46:52 -07:00
Dirk Dougherty
d1dc8c7078 am c6af49ef: Doc change: Add tablet basic checks. 
* commit 'c6af49efc467e379e7ac56246e9c7f0e6ebddc00':
  Doc change: Add tablet basic checks.
 2013-04-15 21:43:56 -07:00
Dirk Dougherty
c6af49efc4 Doc change: Add tablet basic checks. 
Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d
 2013-04-15 20:55:25 -07:00
Stan Chesnutt
464f4ea355 am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 
* commit 'b34b3211e01b0ae946f786b220f73d340159503b':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.
 2013-04-15 19:52:52 -07:00
Stan Chesnutt
b34b3211e0 Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev 2013-04-16 02:49:45 +00:00