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

193548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
8320436ce5 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:33:30 +00:00
Geoff Mendal
cdd71a3087 Revert "Import translations. DO NOT MERGE" 
This reverts commit f3173d8a1797fd812997b9246502a05df0591363.

Change-Id: I7e24d340c24f7ba4b67a72d54e57c3558caa7267
 2015-05-29 15:33:18 +00:00
Glenn Kasten
dedc768f82 Fix typo 
Change-Id: I21ff7773056975b6941a5f1126d43b2e04aa5cd5
 2015-05-29 08:11:24 -07:00
Geoff Mendal
9917768736 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:04:52 +00:00
Geoff Mendal
66f49af2fe Revert "Import translations. DO NOT MERGE" 
This reverts commit 29af96c4486c1baf8601482e54e6886139f49546.

Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d
 2015-05-29 15:04:40 +00:00
John Spurlock
4402f4bb12 Merge "Tuner: add battery pct preference." into mnc-dev 2015-05-29 15:03:16 +00:00
John Spurlock
f40d08f8a3 Tuner: add battery pct preference. 
And fix questionable code organization choices in BatteryMeterView.

Change-Id: I7c13197892b33aa0df9af51fbabb81e0ad0e00e1
 2015-05-29 10:52:29 -04:00
Geoff Mendal
e796112904 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:51:59 +00:00
Geoff Mendal
0bdf1aab31 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:51:29 +00:00
Geoff Mendal
df55ecbf9c Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:50:36 +00:00
Geoff Mendal
78a247da5f Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-05-29 14:49:45 +00:00
Geoff Mendal
27c652fd02 Import translations. DO NOT MERGE 
Change-Id: I22703941cc87c8ad2aacc04671d3c62cb1e81037
Auto-generated-cl: translation import
 2015-05-29 09:38:08 -05:00
Geoff Mendal
f3173d8a17 Import translations. DO NOT MERGE 
Change-Id: I30219f300510a51079cb2e514c00f476590e06d5
Auto-generated-cl: translation import
 2015-05-29 07:31:36 -07:00
Geoff Mendal
e8209fffe9 Import translations. DO NOT MERGE 
Change-Id: I290120b9af321f28cbf754ebc76a154e8b806ddf
Auto-generated-cl: translation import
 2015-05-29 09:28:27 -05:00
Geoff Mendal
29af96c448 Import translations. DO NOT MERGE 
Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import
 2015-05-29 07:27:57 -07:00
Xiyuan Xia
e103029dbc Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 2015-05-29 14:24:22 +00:00
Geoff Mendal
642c4fc527 Import translations. DO NOT MERGE 
Change-Id: I6fbaa6bb785894851b344f414fe5c8f830adbde3
Auto-generated-cl: translation import
 2015-05-29 09:10:35 -05:00
Narayan Kamath
d644c56381 Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 2015-05-29 14:04:42 +00:00
Narayan Kamath
623b58b2cf Avoid inspecting packages twice to deduce ABIs for moves / installs. 
In the case of moves, we can use the existing ABIs from settings because
a move will not result in an ABI change. For new installs, we can just
use the ABI we deduced for compiling (dex2oat) the package.

bug: 21144503
Change-Id: I35e2e8abd47f547b6252271fc6b41d30719c4298
 2015-05-29 14:48:07 +01:00
John Spurlock
6a2999073c Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 2015-05-29 13:22:33 +00:00
Selim Cinek
ff3bf4b12f Increased the falsing treashold for quick settings 
Bug: 21433654
Change-Id: I593297e4577a40762e926353da046a53b9876245
 2015-05-29 13:06:49 +00:00
Dirk Dougherty
34cca12bbd am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video. 
* commit '906a91b4e794015bb2609ded232bb50d4478c3c7':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-05-29 07:00:58 +00:00
Dirk Dougherty
906a91b4e7 am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video. 
* commit '08710f1b69e2188a439b54f1ae59a574f71681d0':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-05-29 06:48:57 +00:00
Dirk Dougherty
08710f1b69 Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video. 
Change-Id: I7824c45a81078c1527a5b8bc20b2a9ac6773a5ad
 2015-05-28 23:33:36 -07:00
David Friedman
95af201aea am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit '2ed3a89c1b6c57b45b08ab9e6bcf29c33d82cdd2':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-05-29 05:45:00 +00:00
David Friedman
2ed3a89c1b am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit '90042a5f8c987582736f4eed714aeba9416003c6':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-05-29 05:31:56 +00:00
David Friedman
90042a5f8c Docs: Corrects technical content of one sentence, and deletes another. 
Change-Id: Iaf894f9d9d68e4e2be9a1d1f8173b83a781241f4
 2015-05-28 22:03:54 -07:00
Guang Zhu
9bb765448d fix NPE in shutdown thread 
null reboot reason is used when it's a simple reboot.

Change-Id: I9d3110ca733a1b0401721fde907924c101997c4f
 2015-05-28 20:50:03 -07:00
Andrew Solovay
832654a857 am 2f85475c: am 7d36a250: docs: Quick spelling fix 
* commit '2f85475c18d68d8719f20e4385dccb3ba0117d1a':
  docs: Quick spelling fix
 2015-05-29 02:28:05 +00:00
Andrew Solovay
2f85475c18 am 7d36a250: docs: Quick spelling fix 
* commit '7d36a25097099b958262e90d22992ce4cac485c9':
  docs: Quick spelling fix
 2015-05-29 02:15:04 +00:00
John Spurlock
995a749f27 Zen: Use account name instead of calendar id in event conditions. 
- Migrate the existing calendar attribute in the event condition
   from a long calendar id to the calendar account name.  More
   portable across a backup/restore.
 - Also skip restoring transient state (like the current condition
   state) from restored automatic rules.

Bug: 17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2
 2015-05-28 22:13:03 -04:00
Sungsoo Lim
6dddc7d1a9 Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 2015-05-29 01:37:00 +00:00
Andrew Solovay
7d36a25097 docs: Quick spelling fix 
Fix is quick and the misspelling was embarassing (spelled channel as
"chanel" three times) so I'm just going to +2 this myself.

Change-Id: Icc4dcd5f47ba2337db29cc81b6afe426e6986e95
 2015-05-28 18:36:29 -07:00
Yorke Lee
d600966c39 Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 2015-05-29 00:55:12 +00:00
Glenn Kasten
ad43220384 Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 2015-05-29 00:12:54 +00:00
Raph Levien
71a2876497 Merge "Use getRunAdvance to position cursor" into mnc-dev 2015-05-29 00:05:09 +00:00
Alan Viverette
a4d66f3933 Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev 2015-05-28 23:55:32 +00:00
Makoto Onuki
0d889cdeb7 Merge "CountryDetector no longer requires location permissions." into mnc-dev 2015-05-28 23:54:09 +00:00
Yohei Yukawa
5176b5451a Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 2015-05-28 23:52:50 +00:00
Alan Viverette
94680e8667 Synchronize Theme.Material and Theme.Material light attributes 
Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.

Bug: 21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09
 2015-05-28 16:52:29 -07:00
Brian Attwell
19d9d0ca2e Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 2015-05-28 23:43:47 +00:00
Alan Viverette
3c436cb99f Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev 2015-05-28 23:43:25 +00:00
Andres Morales
a5705a4ada Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 2015-05-28 23:41:04 +00:00
Raph Levien
cb5499c850 Use getRunAdvance to position cursor 
TextLine used to use getTextRunAdvances on a substring to compute a
cursor position, but this had a number of problems, especially when
the substring is a wider than the full string (as can happen in
certain Tamil ligatures).

This patch changes the implementation to use getRunAdvance, which was
explicitly designed for this use case.

We should also change Layout.getHorizontal to use the dual
getOffsetForAdvance, but that's basically a performance optimization,
the functionality should be basically equivalent.

Bug: 21125816
Change-Id: I669b85eaecfbf6f7aa6c6a9dddbf1a210eb94571
 2015-05-28 16:36:36 -07:00
Brian Attwell
1a15ab91bc Rename "end" to "endExclusive" in addPhoneTtsSpan 
Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
 2015-05-28 16:23:37 -07:00
Yohei Yukawa
85b883cae4 Merge "Clear the inset of previous IME when necessary." into mnc-dev 2015-05-28 23:20:12 +00:00
Yorke Lee
656eeb0402 Make ACTION_CONNECTION_SERVICE_CONFIGURE public 
Bug: 21499146
Change-Id: I3b931231807eec0aed91832013c7c055005fc9ad
 2015-05-28 16:12:46 -07:00
Santos Cordon
7cb0925e7e Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev 2015-05-28 23:06:17 +00:00
Amit Mahajan
ff0c25ce31 Merge "Cleaning up logging in TelephonyManager." into mnc-dev 2015-05-28 23:05:29 +00:00
David Friedman
3675694775 am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs 
* commit 'c397dde17960f2308ecc3ef0b5143c95df8e160c':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.
 2015-05-28 22:54:29 +00:00