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

10654 Commits

Author SHA1 Message Date
Amit Mahajan
ed4545423b am 38e48c2f: am 3547c13e: am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '38e48c2f477d6908d7d29503749cbe4290b013a7':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-14 17:22:28 +00:00
Amit Mahajan
3547c13e0d am 097c8d60: am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '097c8d60115a9207ba4140ef99766741a2256361':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:08:28 +00:00
Amit Mahajan
097c8d6011 am 1901e175: Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 
* commit '1901e175079e3b7242ace7d4b3ec38af3723f91b':
  Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem.
 2014-10-13 22:03:52 +00:00
Amit Mahajan
1901e17507 Merge "Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to signatureOrSystem." into lmp-dev 2014-10-13 19:32:36 +00:00
Mike Lockwood
4dd247305f am b3bab92e: am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit 'b3bab92e6b4541e0718aade2396e667b06d98358':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 19:11:40 +00:00
Mike Lockwood
0a4e224526 am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '8ca4886e439685fdcb1eff4c3552a62522ebeeb0':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:57:54 +00:00
Mike Lockwood
8ca4886e43 am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev 
* commit '317f9ce85a492a213b8f1dac477b1aefad55f621':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system
 2014-10-13 18:48:11 +00:00
Amit Mahajan
5742335cbd Change protectionLevel for READ_PRECISE_PHONE_STATE from dangerous to 
signatureOrSystem.

Bug: 17952946
Change-Id: I4a75da11cb092ca795d0eacf824890eb12c7446a
 2014-10-13 11:38:03 -07:00
Mike Lockwood
6e383350e4 Change RECEIVE_BLUETOOTH_MAP permission to signature or system 
Bug: 17954105
Change-Id: I8b16cab7193c97e5f54d6e4ef33ebf8cda0da197
 2014-10-13 10:00:08 -07:00
Geoff Mendal
59f3f45b5b Import translations. DO NOT MERGE 
Change-Id: Iefa534c5aef2a7e43adf030b844d91a64bd90976
Auto-generated-cl: translation import
 2014-10-13 07:16:34 -07:00
Geoff Mendal
d700e5a37a Import translations. DO NOT MERGE 
Change-Id: Ic3cbd08f31920de16f0d21c846cde2ded2b2e3ec
Auto-generated-cl: translation import
 2014-10-13 06:57:32 -07:00
Marcin Kosiba
103817ed36 am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '4c8dd87a9e952a3ca157411b1a374c83064c9b2f':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:55:22 +00:00
Marcin Kosiba
58ee8a966a am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '4f3ee426f62662f590c056ce44f005cd716f9870':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:47:01 +00:00
Marcin Kosiba
4f3ee426f6 am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev 
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
  Remove the default WebView text encoding resource entirely.
 2014-10-13 09:42:58 +00:00
Alan Viverette
bb3fad78c9 am 8cb9a9e6: am 284559bf: Merge "Fix inset drawable\'s intrinsic size, replace ic_text_dot asset" into lmp-mr1-dev 
* commit '8cb9a9e6ba602cc4a2da334fcec966e7f06c63a4':
  Fix inset drawable's intrinsic size, replace ic_text_dot asset
 2014-10-11 00:22:41 +00:00
Alan Viverette
cdd5e067f2 Fix inset drawable's intrinsic size, replace ic_text_dot asset 
BUG: 17648301
Change-Id: I8af0f6d1beee7a1cb3a3b9db571ed2c407e24556
 2014-10-10 14:08:32 -07:00
Jorim Jaggi
1137ea7eaf am 782994ef: am 51650235: Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 
* commit '782994efd30a153af44c38a9871d24fecb0eb609':
  Apply color to progress bar for notifications
 2014-10-10 17:01:07 +00:00
Elliott Hughes
801dbe73ab am 67ed9bde: am 011c96b5: Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 
* commit '67ed9bdef98d85dc4da0b5afdd8e702f0bc72793':
  Remove some unused %% strings from frameworks/base.
 2014-10-10 17:00:47 +00:00
Adam Powell
f0eba02485 am 0f61804f: am 7cb761fe: Merge "Document that MarginLayoutParams margins should be positive." into lmp-mr1-dev 
* commit '0f61804f18988dd547d3d56aef40a13aa59d3ce6':
  Document that MarginLayoutParams margins should be positive.
 2014-10-10 17:00:35 +00:00
Marcin Kosiba
fd1ac83f63 Remove the default WebView text encoding resource entirely. 
Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.

BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
 2014-10-10 17:20:58 +01:00
Jorim Jaggi
51650235c1 Merge "Apply color to progress bar for notifications" into lmp-mr1-dev 2014-10-09 22:01:56 +00:00
Elliott Hughes
011c96b556 Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev 2014-10-09 20:31:40 +00:00
Adam Powell
a7a735fb2a Document that MarginLayoutParams margins should be positive. 
Negative margins can cause all sorts of other problematic assumptions,
subtle errors and unexpected behavior. While they technically work
developers should steer clear of them.

Change-Id: Ia1f7d9a33e25444ebdc3c32679ae1179210558e1
 2014-10-09 12:54:52 -07:00
Jorim Jaggi
ef72a198af Apply color to progress bar for notifications 
Bug: 17128179
Change-Id: Ia642ff2a352bbabf2d1e468367d45dc188ee0e73
 2014-10-09 11:37:00 -07:00
Dan Sandler
d23fa0f650 am 97a7fbfb: am 621fa30c: am 9eef8749: am 2200f86f: All (er, L) is finally revealed. 
* commit '97a7fbfbe401b471903ba0d07f3701aed5e3ab4a':
  All (er, L) is finally revealed.
 2014-10-08 18:50:22 +00:00
Dan Sandler
621fa30c54 am 9eef8749: am 2200f86f: All (er, L) is finally revealed. 
* commit '9eef8749232c00afad5ca3c26736c0be785cb8c1':
  All (er, L) is finally revealed.
 2014-10-08 18:25:57 +00:00
Dan Sandler
9eef874923 am 2200f86f: All (er, L) is finally revealed. 
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
 2014-10-08 18:16:01 +00:00
Elliott Hughes
7a150149ba Remove some unused %% strings from frameworks/base. 
Bug: 15476051
Change-Id: I902990d5ffa5f9b2d6288d25a8f4e3537fac78b9
 2014-10-08 09:15:18 -07:00
Geoff Mendal
e95638f5ec Import translations. DO NOT MERGE 
Change-Id: I2d79cf76ea811b54f906bf6d76d9887b804dcd4e
Auto-generated-cl: translation import
 2014-10-08 08:56:53 -07:00
Geoff Mendal
639890256d Import translations. DO NOT MERGE 
Change-Id: Ifd63055fca79d18a2d44d914d0bccfbf8d81ebac
Auto-generated-cl: translation import
 2014-10-08 08:40:03 -07:00
Geoff Mendal
6c3a23ddad Import translations. DO NOT MERGE 
Change-Id: I94aa8de0fe7a191d0312dbbb9f2b583c7afbdade
Auto-generated-cl: translation import
 2014-10-08 08:31:15 -07:00
Dan Sandler
2200f86f80 All (er, L) is finally revealed. 
If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
 2014-10-08 04:01:01 +00:00
Amit Mahajan
ec20fc9273 am 190202f7: am dbbf4932: am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit '190202f7e586e02e098b330ac84eb441a56005d3':
  Sms7BitEncodingTranslator
 2014-10-07 05:23:20 +00:00
Amit Mahajan
dbbf493220 am d9a3f89a: Merge commit \'69555fc2\' into fix-merge-conflict3 
* commit 'd9a3f89a0727590a069c563a8b97fe99b866d67c':
  Sms7BitEncodingTranslator
 2014-10-07 05:12:44 +00:00
Amit Mahajan
d9a3f89a07 Merge commit '69555fc2' into fix-merge-conflict3 
Conflicts:
	core/res/res/values/symbols.xml

Change-Id: I4266f1fcc51abc79235e1738bfbc3ff48e209e0c
 2014-10-06 21:57:42 -07:00
Amit Mahajan
69555fc2c8 Merge "Sms7BitEncodingTranslator" into lmp-dev 2014-10-07 01:20:27 +00:00
Xia Ying
43eb8a97e7 Sms7BitEncodingTranslator 
Bug: 16197894
Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
 2014-10-07 01:02:04 +00:00
Amit Mahajan
97221b97ee am 40f43c7a: am 384ff9ef: am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '40f43c7aea1bf96846c47ee8fb6766763110d2fc':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:44:29 +00:00
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00:00
Amit Mahajan
384ff9ef5d am 15c581fa: am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '15c581fa4c0dcff09d2fd65d6978f286b8b23b94':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:28:53 +00:00
Amit Mahajan
15c581fa4c am 17d7c796: Merge "ATT: Call does not establish to \'*1\'" into lmp-dev 
* commit '17d7c79650664c7a112ab175cb2329d2062f4d1e':
  ATT: Call does not establish to  '*1'
 2014-10-06 19:23:20 +00:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Geoff Mendal
ce2b1e8cfa Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 19:21:53 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Amit Mahajan
17d7c79650 Merge "ATT: Call does not establish to '*1'" into lmp-dev 2014-10-06 19:17:06 +00:00
Geoff Mendal
7123638898 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 19:10:25 +00:00
Geoff Mendal
2c54b25580 Import translations. DO NOT MERGE 
Change-Id: I97d45a200138bb1a232327dacf2f933b69efc6ec
Auto-generated-cl: translation import
 2014-10-06 12:08:45 -07:00
Bing Gao
1c9bc00870 ATT: Call does not establish to '*1' 
Bug: 17809849
Change-Id: I43566c9f3b7a72b06a4b5f2a0a312ac42410269d
 2014-10-06 19:00:44 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
Geoff Mendal
419c63bf0e Import translations. DO NOT MERGE 
Change-Id: Ia892f6f28e8ad353ae460f3e167bb68d2246ac13
Auto-generated-cl: translation import
 2014-10-06 11:46:22 -07:00