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

194584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
507758f21b am e5c38788: am 92614179: am dedc768f: Fix typo 
* commit 'e5c3878864993a974d48b11790106adb2a09031c':
  Fix typo
 2015-05-29 19:21:44 +00:00
James Cook
3c668bac5a am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit '63b6320af4302c0d190bbfaba739049b59c2418b':
  assist: Fix reported colors/styles for TextView/Switch
 2015-05-29 19:21:37 +00:00
Tony Mantler
29ef481165 am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '85b039f3488d15a926993b9df2a550a01a1938a4':
  Move ZoneGetter into SettingsLib
 2015-05-29 19:20:57 +00:00
Geoff Mendal
c5508f8560 am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '55b4b2d5a82ef7999a32b8163340a15085b2df38':
  Revert "Import translations. DO NOT MERGE"
 2015-05-29 19:20:42 +00:00
Geoff Mendal
8474bf48aa am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '8320436ce559ba6b80e32bf24d5917fe7ee6c241':
  Revert "Import translations. DO NOT MERGE"
 2015-05-29 19:20:34 +00:00
Geoff Mendal
6c15c153fa am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '9917768736f7d8581ee094267d2a4e5ca2b31cbf':
  Revert "Import translations. DO NOT MERGE"
 2015-05-29 19:20:23 +00:00
John Spurlock
8cf1276c8e am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev 
* commit '4402f4bb12cc70eef3bae20631a4a9fe210c7c80':
  Tuner: add battery pct preference.
 2015-05-29 19:20:17 +00:00
Geoff Mendal
060b2ce9ea am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e796112904a737e61f2ecce3f0fd42d2cba25436':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:57 +00:00
Geoff Mendal
76625fec22 am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '0bdf1aab31d110b9e9de819e34e922f13442bf53':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:52 +00:00
Geoff Mendal
57103ebfa6 am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'df55ecbf9ccb18793338aa7eb04f0faec45889cd':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:47 +00:00
Geoff Mendal
408606f31e am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '78a247da5f21415657a9ab6f20d4d8449a13f734':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:41 +00:00
Xiyuan Xia
223826b3cd am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 
* commit 'e103029dbc457596661ae4066aabcb2a35f07dfd':
  Avoid keyguard UI layout dimensions underflow
 2015-05-29 19:19:27 +00:00
Geoff Mendal
7ec9264f40 am 642c4fc5: (-s ours) Import translations. DO NOT MERGE 
* commit '642c4fc527da40cf4697d3630bdebdfc1044ab82':
  Import translations. DO NOT MERGE
 2015-05-29 19:19:20 +00:00
Narayan Kamath
2de63d7cc1 am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit 'd644c5638180d5d4218f34e1afb9e7782fc52e49':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-05-29 19:18:51 +00:00
John Spurlock
015a95ff35 am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
  Zen: Use account name instead of calendar id in event conditions.
 2015-05-29 19:18:45 +00:00
Selim Cinek
4dbe7c0d16 am ff3bf4b1: Increased the falsing treashold for quick settings 
* commit 'ff3bf4b12f87d9aa552f517989f2b0dda4e43cc5':
  Increased the falsing treashold for quick settings
 2015-05-29 19:18:36 +00:00
Dirk Dougherty
4b9d724cd6 am 34cca12b: 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 '34cca12bbda96ea8aad86b0455eb61e4674a4616':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-05-29 19:18:31 +00:00
David Friedman
bc0e7f2875 am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit '95af201aead0ce7dc5326220dd3ee8619a237ae6':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-05-29 19:18:26 +00:00
Guang Zhu
0ca15144e3 am 9bb76544: fix NPE in shutdown thread 
* commit '9bb765448df43d41e0a3edb7de1d1641c9251c35':
  fix NPE in shutdown thread
 2015-05-29 19:18:19 +00:00
Andrew Solovay
74f4e4f1b8 am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix 
* commit '832654a8574b4371b5dc69216dd0b8377368fb5c':
  docs: Quick spelling fix
 2015-05-29 19:18:09 +00:00
Sungsoo Lim
f819ac38a9 am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 
* commit '6dddc7d1a9ed7f94e37dd6127664e02e25ceb6c8':
  Send a message with data in MediaController.MessageHandler.post()
 2015-05-29 19:18:01 +00:00
Glenn Kasten
e5c3878864 am 92614179: am dedc768f: Fix typo 
* commit '926141795c3115d674be2ed0a735e3b994e31c03':
  Fix typo
 2015-05-29 17:32:51 +00:00
James Cook
63b6320af4 Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 2015-05-29 17:30:23 +00:00
Glenn Kasten
926141795c am dedc768f: Fix typo 
* commit 'dedc768f829908242bda75b56d4a77ff247d5609':
  Fix typo
 2015-05-29 17:18:35 +00:00
Tony Mantler
85b039f348 Merge "Move ZoneGetter into SettingsLib" into mnc-dev 2015-05-29 16:44:39 +00:00
Geoff Mendal
55b4b2d5a8 Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 2015-05-29 15:57:51 +00:00
Geoff Mendal
bf2e5b5fa5 Revert "Import translations. DO NOT MERGE" 
This reverts commit 27c652fd0293e707110165eb1f8918f489b50fca.

Change-Id: Idb1365c91c67c0eb8f472bf6f9ace1b6429e3b0e
 2015-05-29 15:57:37 +00:00
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