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

115121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
05c285bd30 Import translations. DO NOT MERGE 
Change-Id: Ic1f72c3efbb0b03a95f10b45d3e210aa26c9657e
Auto-generated-cl: translation import
 2013-09-30 09:34:53 -07:00
Michael Wright
5b6803c913 Merge "Move EventHub over to using EPOLLWAKEUP when available" 2013-09-27 22:48:32 +00:00
Elliott Hughes
cfd9a2c1db am 917f88f0: am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs." 
* commit '917f88f033aafb89cbb77feda2932cf88698a56a':
  Regenerate all the OpenGL stubs.
 2013-09-27 15:44:14 -07: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
3d28abf392 am 19db8894: am 19f9f445: am 7a56d949: Merge "Fix SELinux.java doc errors" 
* commit '19db889424addfdf2eae9e3dac1c97d93e13cb74':
  Fix SELinux.java doc errors
 2013-09-27 09:40:09 -07: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
Alan Viverette
c8fad87cba Merge "Add ProgressBar methods to set tileable Drawables" 2013-09-26 22:42:03 +00:00
Alan Viverette
e785d02197 Add ProgressBar methods to set tileable Drawables 
BUG: 8349406
Change-Id: I068ac291c8db19f3c8991675f141ccfc0c7b29b2
 2013-09-26 15:21:10 -07:00
Alan Viverette
6f4fd85ad2 Merge "Ensure toggle calls setChecked() since apps may have relied on this" 2013-09-26 21:55:34 +00:00
Alan Viverette
86453ff147 Ensure toggle calls setChecked() since apps may have relied on this 
BUG: 10899797
Change-Id: I604959cdd4074280df2c4d151763536ac59d4b22
 2013-09-26 14:46:08 -07:00
Christopher Tate
a4c4c9fb12 am a63816c1: am 4e9c7d8b: Merge "Sigh." into klp-dev 
* commit 'a63816c1bb4e9dc93df3fe498eca74cde1f45bc3':
  Sigh.
 2013-09-26 14:18:20 -07:00
Svetoslav Ganov
ea641208a0 am ef724232: am c6afd813: Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev 
* commit 'ef7242326ad76e7cef6d21b3e83f2510acf8beeb':
  PackageManager#queryIntentServices breaks its contract.
 2013-09-26 14:18:16 -07:00
Svetoslav Ganov
dd812e0c97 am 342daca7: am 2c854022: Merge "Choosing default paper size for the "Save to PDF" fake printer" into klp-dev 
* commit '342daca7d7407fbe07df571a4c0ba6a51a89e15d':
  Choosing default paper size for the "Save to PDF" fake printer
 2013-09-26 14:18:13 -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
38a1192950 am 946395ec: am d2534f8c: Merge "Don\'t remove restrictions files that are valid" into klp-dev 
* commit '946395ec7f2413640818c5ed73dd11966606da54':
  Don't remove restrictions files that are valid
 2013-09-26 14:07:49 -07: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
George Mount
86759039f3 Merge "Set evaluator after setting values so that it can take effect." 2013-09-26 20:56:28 +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
Jeff Sharkey
9f68c10424 am 66ee877f: am 8c6c0419: Merge "Tighten flags enforcement, API to test Uris." into klp-dev 
* commit '66ee877f5d27b4dd4081702ad216359971e1b8b3':
  Tighten flags enforcement, API to test Uris.
 2013-09-26 13:40:34 -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
922e46ae9a am db2aacfb: am 8f4e289f: Merge "Camera2: Fix focusRange type" into klp-dev 
* commit 'db2aacfb7bff0d31d98bb68a810d55a78505f39a':
  Camera2: Fix focusRange type
 2013-09-26 13:33:20 -07: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
John Spurlock
aeec058e6a am a77be202: am 91949b20: Merge "New battery meter view bolt shape + color." into klp-dev 
* commit 'a77be2025e992df2bfec85afca40a546a5154d93':
  New battery meter view bolt shape + color.
 2013-09-26 13:16:02 -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
91fb7f4e45 am b3bf796f: am aeaecacc: Merge "telephony: Set roam though same named operator" into klp-dev 
* commit 'b3bf796ff27ea41d8d1f5780375508357d24abca':
  telephony: Set roam though same named operator
 2013-09-26 13:04:56 -07: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
Marco Nelissen
4cce5d76df am 6e14f9bc: am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev 
* commit '6e14f9bc9086edf1112ea5e7f5f010251b65f926':
  Fix logic in fallback ringtone handling
 2013-09-26 13:01:20 -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
Scott Main
38622428e0 am 8d097b26: 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 '8d097b2603cd8ea3ee9ffd7930ccb92416cc2ef9':
  update the nav drawer lesson to link to new action bar icon pack, which now includes the nav drawer icon
 2013-09-26 12:56:39 -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