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

86583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Irfan Sheriff
a8aead0a48 am e3dc7055: am 3849490c: Merge "Return empty scan results for background user" into jb-mr1-dev 
* commit 'e3dc7055cddbadc04e51003f17ab4dbdbb6f58df':
  Return empty scan results for background user
 2012-09-17 14:45:07 -07:00
Ying Wang
2ff9ab39d4 am 820600c2: am df5bdd72: Merge "Make librs_jni depend on libRSDriver to remove circular dependency" into jb-mr1-dev 
* commit '820600c2b3a8dc5145ec2984801cc68d61acc137':
  Make librs_jni depend on libRSDriver to remove circular dependency
 2012-09-17 14:45:01 -07:00
Adam Cohen
b9000abbe3 am c46b707e: am 62539859: Merge "Second pass on Keyguard multi-user switcher" into jb-mr1-dev 
* commit 'c46b707e660eabbde15c8e858477534e9e738c76':
  Second pass on Keyguard multi-user switcher
 2012-09-17 14:44:55 -07:00
John Huang
6d30ca0163 am 45c5089a: am 4505a43f: Merge "Add support for per-package policy for sending premium SMS." into jb-mr1-dev 
* commit '45c5089ab572155d1b0694c5f909072cbc29ad74':
  Add support for per-package policy for sending premium SMS.
 2012-09-17 14:44:50 -07:00
Victoria Lease
2fd0dcd38f am 6271654a: am 306df863: Merge "New location service permission strings." into jb-mr1-dev 
* commit '6271654a55c1a7aaec721c14ae6b0873033bad2b':
  New location service permission strings.
 2012-09-17 14:44:39 -07:00
Adam Powell
45ada3ac78 am 45937740: am b1861c3e: Minor fixes/clarifications for previous patch. 
* commit '4593774015ada7fb92f846fced136e487cd1e522':
  Minor fixes/clarifications for previous patch.
 2012-09-17 14:44:34 -07:00
Jim Miller
c2624e8c91 am d95129a7: am b45965f5: Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev 
* commit 'd95129a76eb77d881ee138d7ae654ab01995733a':
  Fix keyguard timeout dialog messages
 2012-09-17 14:44:30 -07:00
Adam Powell
c86dae2337 am 3b6dc021: am 7db4eec5: Merge "Squish!" into jb-mr1-dev 
* commit '3b6dc021de2d19c021058df5af4fb8a05613d113':
  Squish!
 2012-09-17 14:44:26 -07:00
Craig Mautner
7ecd0387d2 am 2386be50: am a91f9e29: Make more items per-Display. 
* commit '2386be50d03df41d183fe0017c7560e078374439':
  Make more items per-Display.
 2012-09-17 14:44:18 -07:00
Dianne Hackborn
397c1d8467 am 0fd909ba: am d65afc65: Merge "More multi-user stuff." into jb-mr1-dev 
* commit '0fd909bad1151cc39061abb52ae5b8be090e05dd':
  More multi-user stuff.
 2012-09-17 14:44:10 -07:00
Dianne Hackborn
c2ce886339 am 6b655130: am 398bad04: Merge "Fix debug log." into jb-mr1-dev 
* commit '6b655130e7258da1aa40860e58852f9f5370bfbd':
  Fix debug log.
 2012-09-17 14:44:05 -07:00
Jeff Sharkey
40210f98ba am 06f01326: am d0c6ccba: Move NetworkPolicy from apps to UID. 
* commit '06f01326dfd9e2ee557fd817481081bc3f36e35e':
  Move NetworkPolicy from apps to UID.
 2012-09-17 14:43:36 -07:00
Jeff Sharkey
de878ea4e9 am a6bb5cd8: am ee100445: Updating public API. 
* commit 'a6bb5cd8d2a8daf7f5fdecb675c35bc1fd4459c5':
  Updating public API.
 2012-09-17 14:43:32 -07:00
Jeff Sharkey
e048529645 am d57f7dc4: am b3571a6c: Merge "Fix build" into jb-mr1-dev 
* commit 'd57f7dc4646617c30c1e2d11da32c4622807de87':
  Fix build
 2012-09-17 14:43:28 -07:00
Elliott Hughes
4ab0a648eb am cbcf02a8: am edf60d3d: Fix up symbols.xml. 
* commit 'cbcf02a84c51f5b4251f90fe1c7576f08f5afb19':
  Fix up symbols.xml.
 2012-09-17 14:43:24 -07:00
Elliott Hughes
89d2ce747d am fdd1b659: am c3ff72f5: Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings. 
* commit 'fdd1b6597bfcc7efc2d0cee4717253e40f718459':
  Use icu4c for CLDR "yesterday", "today", and "tomorrow" strings.
 2012-09-17 14:43:21 -07:00
Elliott Hughes
d4d642c9e7 resolved conflicts for merge of 138ab322 to master 
Change-Id: I88155002a396dbe196de6178e7c2c16cfa30c819
 2012-09-17 14:34:50 -07:00
Baligh Uddin
9513aa7bab Merge "Import translations. DO NOT MERGE" 2012-09-17 14:26:19 -07:00
Elliott Hughes
8e15aba660 resolved conflicts for merge of c3fb4a16 to master 
Change-Id: I59f6bc36fcdac09c08ebe4510c5360464b4e7c01
 2012-09-17 14:12:31 -07:00
Baligh Uddin
78e148a0a7 Import translations. DO NOT MERGE 
Change-Id: Iac097c30e92b1e1550be710b3cc6705e1df7d29a
Auto-generated-cl: translation import
 2012-09-17 13:39:16 -07:00
Elliott Hughes
08870affdc resolved conflicts for merge of 8b1109a9 to master 
Change-Id: I37fff092e4e6534caa97e1af57da75818ea14b30
 2012-09-17 13:37:35 -07:00
Elliott Hughes
3405dbb7a7 am 0e29ed2e: am a8deafb4: Merge "Deprecate those parts of DateUtils the documentation says not to use." into jb-mr1-dev 
* commit '0e29ed2ed5c2b22a99474ad8b8414fade13a1ea9':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:47:10 -07:00
Christopher Tate
5067ea3751 am 5bae602c: am 2892dfbe: Merge "Fix default population of wifi settings" into jb-mr1-dev 
* commit '5bae602cbbb96af3290d430ab25600149d4d073d':
  Fix default population of wifi settings
 2012-09-17 12:47:03 -07:00
Daniel Sandler
dc5a1b8758 am 2dd7cb6f: am 8dd9206a: Fix NPE in rotation lock QS. 
* commit '2dd7cb6f6af8622c2b0b3c4f07466010f45b9460':
  Fix NPE in rotation lock QS.
 2012-09-17 12:46:59 -07:00
Geremy Condra
393760861d am 81953a34: am 74a550fa: Merge "Change verifyServerDomainAndCertificates to pass in a hostname." into jb-mr1-dev 
* commit '81953a3437c3af24dfb53cc7c106147d9a89be1f':
  Change verifyServerDomainAndCertificates to pass in a hostname.
 2012-09-17 12:46:56 -07:00
Kenny Root
24499c9e50 am 049005e3: am 1c9894aa: Merge "Remove AndroidKeyStore from API" into jb-mr1-dev 
* commit '049005e3c55b5f5dfda1c69482c6104d5931a2fc':
  Remove AndroidKeyStore from API
 2012-09-17 12:46:13 -07:00
Irfan Sheriff
e05c46df9c am 0c913cda: am 42496826: Merge "Fix suspend bugs" into jb-mr1-dev 
* commit '0c913cda955464d18f798eb47d7f8b19a46dfd35':
  Fix suspend bugs
 2012-09-17 12:46:08 -07:00
Elliott Hughes
7850a41871 am 42e7af25: am 9ceede6d: am 086676a4: am f5437ee8: am 297ad257: Merge "Deprecate those parts of DateUtils the documentation says not to use." 
* commit '42e7af25c06e2d1dbf8201d1ff1528311cf8c44e':
  Deprecate those parts of DateUtils the documentation says not to use.
 2012-09-17 12:45:47 -07:00
rich cannings
ecfc9d8253 am d063b14d: am 0b62fa23: Merge "Send more information to verifiers" into jb-mr1-dev 
* commit 'd063b14dc8ef3cdf63d658b5375bf84b5cb1dc02':
  Send more information to verifiers
 2012-09-17 12:45:31 -07:00
Svetoslav Ganov
f701d1eb71 am 873d49a6: am 8b681cb8: Some formatting missed in the previous patch 
* commit '873d49a670df369c6ad5d125581fdc182114d05b':
  Some formatting missed in the previous patch
 2012-09-17 12:45:18 -07:00
Svetoslav Ganov
664222b066 am acbea737: am 3efa8bab: Merge "Adding accessibility events for touch and gesture detection states." into jb-mr1-dev 
* commit 'acbea737ec97f0fd15f2818196495b2355094065':
  Adding accessibility events for touch and gesture detection states.
 2012-09-17 12:45:14 -07:00
Irfan Sheriff
55f713c787 am 8e05462e: am b4ad71ae: Merge "Increase GO idle time out to 5 seconds" into jb-mr1-dev 
* commit '8e05462e5499eac7efa61b324e357a598de1c8dc':
  Increase GO idle time out to 5 seconds
 2012-09-17 12:45:10 -07:00
Baligh Uddin
8b2ce341dc am 316ac07a: (-s ours) am c3a691ec: Merge "Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]" into jb-mr1-dev 
* commit '316ac07afaf9a97034dc7b39f4b2068984bc23bd':
  Add day_of_week_medium_* and day_of_week_short_* for Persian [fa]
 2012-09-17 12:45:04 -07:00
Jatin Lodhia
dbef28ab73 am 4dc67287: am 836033d6: Merge "Update account list on account picker activity resume" into jb-mr1-dev 
* commit '4dc67287774495e192193e888fae6603ed85c4be':
  Update account list on account picker activity resume
 2012-09-17 11:29:54 -07:00
Amith Yamasani
0db31ec77d am 3e4ef8e2: am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev 
* commit '3e4ef8e22010f2ede5d822ce3aaa07254079e123':
  Fix face unlock for multiple users
 2012-09-17 11:29:28 -07:00
Kristian Monsen
7f52de24d6 am 7b1be537: am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev 
* commit '7b1be537546481c6687efd03c3c709b266502abf':
  Hiding some of the deprecated android.webkit API's
 2012-09-17 11:29:20 -07:00
Ben Gruver
bb12a413db am 552edb89: am 51fbaff1: Merge "DEFAULT_VERIFY_ENABLE turns verification off" into jb-mr1-dev 
* commit '552edb895a17c8cd1d6b653cbe206aa612a6f43c':
  DEFAULT_VERIFY_ENABLE turns verification off
 2012-09-17 11:29:17 -07:00
Winson Chung
fb573e3084 am 832cf1f2: am 4f49d945: Adding data type overlay to network tile. 
* commit '832cf1f2c0a021703d2c73877c56cfabd7d4b633':
  Adding data type overlay to network tile.
 2012-09-17 11:29:13 -07:00
Jeff Sharkey
67bbcd036a am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev 
* commit '1e364acac6f4768672deb73485e93c32929e25fd':
  Actually move to Global settings.
 2012-09-17 11:10:16 -07:00
Christopher Tate
28983b10ab am e9431fa8: am ce18d1c8: Merge "Get correct user\'s package info during clip processing" into jb-mr1-dev 
* commit 'e9431fa8815ebd9887482a6b2848188d2786279b':
  Get correct user's package info during clip processing
 2012-09-17 11:10:11 -07:00
Jeff Sharkey
ddf93f9503 am 892bf6c6: am a043c2c0: Merge "Move to Global.NETSTATS and Global.NTP constants." into jb-mr1-dev 
* commit '892bf6c607127ae8405fd589ae70023e457844f5':
  Move to Global.NETSTATS and Global.NTP constants.
 2012-09-17 11:10:05 -07:00
Jim Miller
391513a0a8 am e98aef73: am f229e4d3: Add support for settings for lock widgets 
* commit 'e98aef734657cc129143a4a25ee78ade48d34037':
  Add support for settings for lock widgets
 2012-09-17 11:09:55 -07:00
Winson Chung
17a947d561 am 90cfc3d1: am 49321ec4: Merge "Suppress ExpandHelper on quick settings." into jb-mr1-dev 
* commit '90cfc3d1333edc629ea52d2ba0e6ea2484bf23a6':
  Suppress ExpandHelper on quick settings.
 2012-09-17 11:09:50 -07:00
Winson Chung
136dac4356 am e9738d14: am d4726d06: Adding rotation lock tile to quick settings (on tablets). 
* commit 'e9738d144b7221d6f6bf4a633fd9ae9026b87177':
  Adding rotation lock tile to quick settings (on tablets).
 2012-09-17 11:09:45 -07:00
Michael Jurka
a5ad62adfa am 0cae2597: am ad92ce85: Merge "Fix bug with getting widget categories" into jb-mr1-dev 
* commit '0cae2597b21a266862bd0fdcbf12a6133d393c2c':
  Fix bug with getting widget categories
 2012-09-17 11:09:40 -07:00
Michael Jurka
5a8deb16b9 am 5f76482f: am 95a2ff7c: Merge "Adding a couple extras keys for keyguard widget selection" into jb-mr1-dev 
* commit '5f76482f46139809dda13e01ec81ca87ca0803d7':
  Adding a couple extras keys for keyguard widget selection
 2012-09-17 11:09:34 -07:00
Raph Levien
791ae985f6 am ebb896b0: am c1eff085: am e5905684: am eceb3171: am f4afc401: Merge "framework: fix bug for uninitialized variable" 
* commit 'ebb896b0de3e2182a345fc0ae6773cc0e91a21d6':
  framework: fix bug for uninitialized variable
 2012-09-17 11:09:27 -07:00
Svetoslav Ganov
55ab5105d4 am 71e3cb14: am e136a728: Merge "Text layout in switch may be null when accessibility events are fired." into jb-mr1-dev 
* commit '71e3cb143b6eb6052bb6820bf551a1d74e19ee8d':
  Text layout in switch may be null when accessibility events are fired.
 2012-09-17 11:09:16 -07:00
Christopher Tate
ed1c549a7d am 45b2dce9: am 0dbc4108: Merge "Fix Settings writes to a different user" into jb-mr1-dev 
* commit '45b2dce9822caefe69f3f680f9e60f076f9e2eaf':
  Fix Settings writes to a different user
 2012-09-17 11:09:11 -07:00
Baligh Uddin
9d21dc759a Merge "Import translations. DO NOT MERGE" 2012-09-17 11:00:34 -07:00