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

113751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
3d4e30ba97 am 398d7f61: Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev 
* commit '398d7f61866baab65e69b9107c36ba32bf824353':
  Update navbar camera icon and widget background assets in keyguard.
 2013-09-30 16:42:26 -07:00
Romain Guy
c8532ce4ae am 33ed738d: Expose View.executeHardwareAction() Bug #10911502 
* commit '33ed738d49dce3af5851d0566739e9ed593057a5':
  Expose View.executeHardwareAction() Bug #10911502
 2013-09-30 16:42:19 -07:00
Craig Mautner
5c60d6b657 am c449613e: Merge "Revert behavior to perform onResume." into klp-dev 
* commit 'c449613ec6ffed7b4605a6708a3341ab2dd5320f':
  Revert behavior to perform onResume.
 2013-09-30 16:42:11 -07:00
Victoria Lease
b5f72171fb am a4eb894a: Merge "clarify Paint flag docs" into klp-dev 
* commit 'a4eb894a55b07eeddb05d47558e6b2838d56af08':
  clarify Paint flag docs
 2013-09-30 16:42:08 -07:00
Romain Guy
bb1d4d3896 am d6c1870d: am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit 'd6c1870d434562a10e015915dd9da9f8a956661c':
  Fragement, or Fragment: that is the question
 2013-09-30 16:23:05 -07:00
Romain Guy
d6c1870d43 am 5fceada3: Merge "Fragement, or Fragment: that is the question" 
* commit '5fceada31f0dc8f8e003e9c1d0a0ed0363711343':
  Fragement, or Fragment: that is the question
 2013-09-30 16:19:22 -07:00
Romain Guy
5fceada31f Merge "Fragement, or Fragment: that is the question" 2013-09-30 22:48:44 +00:00
Cyril Mottier
2de5082f43 Fragement, or Fragment: that is the question 
Change-Id: Iac3a14b9d2d7b4bd1e452db987b3c5c95dbefd3b
 2013-09-30 22:43:59 +02:00
Elliott Hughes
917f88f033 am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs." 
* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
  Regenerate all the OpenGL stubs.
 2013-09-27 15:41:25 -07:00
Elliott Hughes
82e5d8758a am ebd397ad: Merge "Regenerate all the OpenGL stubs." 
* commit 'ebd397ad9182c37487ba95aaa71ae6dcf0c9d762':
  Regenerate all the OpenGL stubs.
 2013-09-27 15:37:56 -07:00
Elliott Hughes
ebd397ad91 Merge "Regenerate all the OpenGL stubs." 2013-09-27 22:33:25 +00:00
Nick Kralevich
19db889424 am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors" 
* commit '19f9f445bfe368f801f893aad6dbd372562746ac':
  Fix SELinux.java doc errors
 2013-09-27 09:37:56 -07:00
Nick Kralevich
19f9f445bf am 7a56d949: Merge "Fix SELinux.java doc errors" 
* commit '7a56d949ef524d00e4091827104ac2450e4ec9db':
  Fix SELinux.java doc errors
 2013-09-27 09:35:01 -07:00
Nick Kralevich
7a56d949ef Merge "Fix SELinux.java doc errors" 2013-09-27 16:32:57 +00:00
Jim Miller
398d7f6186 Merge "Update navbar camera icon and widget background assets in keyguard." into klp-dev 2013-09-26 22:27:15 +00:00
Romain Guy
33ed738d49 Expose View.executeHardwareAction() 
Bug #10911502

Views creating hardware resources need a way to safely interact
with the hardware. This new method invokes HardwareRenderer.safelyRun()
which executes a Runnable after making sure the hardawre rendering
context is in a valid state.

With the OpenGL backend, executeHardwareAction() tries to call
eglMakeCurrent() if needed. This method is not guaranteed to
work.

Change-Id: I38ec65132eeba85605cffb1a6de12b7a0184e213
 2013-09-26 22:01:01 +00:00
Craig Mautner
c449613ec6 Merge "Revert behavior to perform onResume." into klp-dev 2013-09-26 21:43:24 +00:00
Victoria Lease
a4eb894a55 Merge "clarify Paint flag docs" into klp-dev 2013-09-26 21:40:55 +00:00
Craig Mautner
5314a40b96 Revert behavior to perform onResume. 
Back out changes from CLs ag/363992 and ag/363859. These introduced
the bugs found in bug 10917435 which is now fixed. Note that backing
out these changes reintroduces bug 10732489.

Change-Id: Ic5105dd4cfc8bf79c6f06188283d1ee3680c370c
 2013-09-26 14:24:02 -07:00
Christopher Tate
a63816c1bb am 4e9c7d8b: Merge "Sigh." into klp-dev 
* commit '4e9c7d8ba3caa8b558e2a1de796c100a562445ae':
  Sigh.
 2013-09-26 14:14:54 -07:00
Svetoslav Ganov
ef7242326a am c6afd813: Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev 
* commit 'c6afd813ac2ddaa576fc7866479e933627622248':
  PackageManager#queryIntentServices breaks its contract.
 2013-09-26 14:14:51 -07:00
Svetoslav Ganov
342daca7d7 am 2c854022: Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev 
* commit '2c854022bf7fb6d626b0e86dc0c16372774f2432':
  Choosing default paper size for the "Save to PDF" fake printer
 2013-09-26 14:14:49 -07:00
Christopher Tate
4e9c7d8ba3 Merge "Sigh." into klp-dev 2013-09-26 21:10:39 +00:00
Svetoslav Ganov
c6afd813ac Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev 2013-09-26 21:10:19 +00:00
Svetoslav Ganov
2c854022bf Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev 2013-09-26 21:09:25 +00:00
Amith Yamasani
946395ec7f am d2534f8c: Merge "Don\'t remove restrictions files that are valid" into klp-dev 
* commit 'd2534f8c05ccdf692f1e265ae719b67290d15050':
  Don't remove restrictions files that are valid
 2013-09-26 14:04:21 -07:00
Amith Yamasani
d2534f8c05 Merge "Don't remove restrictions files that are valid" into klp-dev 2013-09-26 21:02:10 +00:00
Svetoslav Ganov
0ce3e8743c Choosing default paper size for the "Save to PDF" fake printer 
Change-Id: I1e2eb73fd1eb3b1e9812155b69b94cba261243c2
 2013-09-26 13:54:49 -07:00
Victoria Lease
8dc7d5ea26 clarify Paint flag docs 
Bug: 10460797
Change-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7
 2013-09-26 13:40:47 -07:00
Jeff Sharkey
66ee877f5d am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev 
* commit '8c6c04197e58be6f3e46ba6a38f5d16e4fb091fa':
  Tighten flags enforcement, API to test Uris.
 2013-09-26 13:37:21 -07:00
Jeff Sharkey
8c6c04197e Merge "Tighten flags enforcement, API to test Uris." into klp-dev 2013-09-26 20:33:29 +00:00
Zhijun He
db2aacfb7b am 8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev 
* commit '8f4e289f8c1f4743a459b232b9e5ac9d58095139':
  Camera2: Fix focusRange type
 2013-09-26 13:30:23 -07:00
Zhijun He
8f4e289f8c Merge "Camera2: Fix focusRange type" into klp-dev 2013-09-26 20:28:19 +00:00
Christopher Tate
ae269d5727 Sigh. 
Bug 10746233

Change-Id: I18c84f2bd53a511fc86be42b5d72062650e5b289
 2013-09-26 13:23:43 -07:00
Amith Yamasani
fc95e70abd Don't remove restrictions files that are valid 
This fixes a bug in parsing the package name from a file name. The suffix
was not taken into account, resulting in all restrictions files being
removed on switching to a user.

Bug: 10947554
Change-Id: I62725bbbdc0e15609872de3896130d4acbc35386
 2013-09-26 13:20:17 -07:00
Jeff Sharkey
ee2f7df9ee Tighten flags enforcement, API to test Uris. 
Check and throw if callers request invalid grant flags.  Add API to
test if a Uri is backend by a DocumentsProvider.

Bug: 10919391, 10935608
Change-Id: Ifa6afefb95983558c8c64dc15ddf650e9fe07080
 2013-09-26 13:14:45 -07:00
John Spurlock
a77be2025e am 91949b20: Merge "New battery meter view bolt shape + color." into klp-dev 
* commit '91949b20c9e430eaba8cf2cf21abe403eb298a94':
  New battery meter view bolt shape + color.
 2013-09-26 13:13:00 -07:00
John Spurlock
91949b20c9 Merge "New battery meter view bolt shape + color." into klp-dev 2013-09-26 20:10:20 +00:00
Vineeta Srivastava
b3bf796ff2 am aeaecacc: Merge "telephony: Set roam though same named operator" into klp-dev 
* commit 'aeaecacccac2ea9b3db310921707696c56afada4':
  telephony: Set roam though same named operator
 2013-09-26 13:01:53 -07:00
Vineeta Srivastava
aeaecaccca Merge "telephony: Set roam though same named operator" into klp-dev 2013-09-26 19:59:20 +00:00
Marco Nelissen
6e14f9bc90 am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev 
* commit '2c7029902961772a1531b6502e4fb45a3e6fb76f':
  Fix logic in fallback ringtone handling
 2013-09-26 12:58:04 -07:00
Marco Nelissen
2c70299029 Merge "Fix logic in fallback ringtone handling" into klp-dev 2013-09-26 19:56:13 +00:00
Scott Main
8d097b2603 am 9f54a583: am 6d49f698: am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '9f54a5834a5dacbf742ae17a63d7e5e290b6ccb3':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:54:30 -07:00
Sungmin Choi
3cf4dbaba7 telephony: Set roam though same named operator 
Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
 2013-09-26 12:53:48 -07:00
Scott Main
9f54a5834a am 6d49f698: am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '6d49f6980bff8c4ec15db169128b439c0b732ac5':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:51:09 -07:00
Scott Main
6d49f6980b am ce57e1a6: am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit 'ce57e1a6f373c4f1c39b048adc1f2bbe6232be0e':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:48:04 -07:00
Scott Main
ce57e1a6f3 am 4c9ed63c: update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon 
* commit '4c9ed63cc66c5558e3b0330b17df92e99290eaf7':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:45:22 -07:00
Marco Nelissen
19a4671b10 Fix logic in fallback ringtone handling 
The existing code would only play a fallback ringtone if the requested
ringtone was one of the three ringtone uris that are defined by settings,
and it wasn't set to "silent".
Now it also plays the fallback for custom ringtone uris.

b/10891718

Change-Id: I79c2298c6497165e6845b98532cce0855347e50b
 2013-09-26 12:44:55 -07:00
Scott Main
b78f5bf182 am fc8a982e: am 95fdf3d9: am a37c524f: am 54f8facf: update action bar icon pack with xxhdpi assets bug: 9761668 
* commit 'fc8a982e55b3d6308a35d8674a192972ecd6f632':
  update action bar icon pack with xxhdpi assets bug: 9761668
 2013-09-26 12:44:26 -07:00
John Spurlock
2a128013dd am e54eb7f9: Merge "Add RTL versions of wimax status bar icons." into klp-dev 
* commit 'e54eb7f9441d279e585b37ca16ce220ed2dcd27c':
  Add RTL versions of wimax status bar icons.
 2013-09-26 12:44:23 -07:00