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

148035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
b80e42f93f Replace more Locale methods. 
This change replaces some methods of java.util.Locale. Some of them were
added in 1.7 and some are not present in the Desktop VM.

Change-Id: Ifdf8451bb2acf55e01dce8b5e15c40c8160107cc
 2014-08-04 23:02:02 +00:00
Winson Chung
bafe3836c5 am 2418f50f: Fixing scrolling regression with layout changes. 
* commit '2418f50f27a52c471e078944e4bbe832daf301ee':
  Fixing scrolling regression with layout changes.
 2014-08-04 23:00:44 +00:00
Deepanshu Gupta
1840e8f2c7 Fix Delegates 
Change-Id: I2b6a6b679b7a5b2532b76b723155bc2763b70768
 2014-08-04 23:00:43 +00:00
Deepanshu Gupta
d2a411840c Fix LayoutLib Create tests. 
Change-Id: Ica3efe417d54da7dc74b21d28215199d37600744
 2014-08-04 22:59:38 +00:00
Deepanshu Gupta
86eb8b4e29 Add testing framework to LayoutLib. 
This change adds an end to end test which loads the framework resources
and a test app and ensures that no exceptions or warnings are thrown.

The change also adds project configuration for intelliJ.

Change-Id: I7b67c0f1a2af2dac95df7f3231cab537b9826d7d
 2014-08-04 22:58:39 +00:00
Winson Chung
b99b18e78e Fixing scrolling regression with layout changes. 
Change-Id: Ic440d147ca13bf13d7f311b6d9876e3c02d4f189
 2014-08-04 22:55:43 +00:00
Jorim Jaggi
2ae259df68 Dismiss all layout updates. 
Bug: 14826666
Change-Id: I19773d0afaf34f92d987a5292de861b5963a7d8a
 2014-08-05 00:07:16 +02:00
Andrew Flynn
9c4126a178 am ad1f1858: am cdf4675d: am 93db88ff: am c08203c2: am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit 'ad1f1858aaf6c673a1aa0a5fb8062f6a3e476f8b':
  Fix some sync adapter docs typos.
 2014-08-04 21:44:58 +00:00
Andrew Flynn
8174f847e6 am cdf4675d: am 93db88ff: am c08203c2: am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit 'cdf4675dfff6bbfbddc6376fd84a2f779f053dfb':
  Fix some sync adapter docs typos.
 2014-08-04 21:37:14 +00:00
Andrew Flynn
b5e363b755 am 93db88ff: am c08203c2: am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit '93db88ff57575409f1bc8c3ac4de6bcfb1c633da':
  Fix some sync adapter docs typos.
 2014-08-04 21:33:44 +00:00
Andrew Flynn
4f1f7ba3a8 am c08203c2: am 4881578e: am ea12f0fd: Fix some sync adapter docs typos. 
* commit 'c08203c22c8407d9a9777eb6f436bfb79edb1f74':
  Fix some sync adapter docs typos.
 2014-08-04 21:26:44 +00:00
Chris Craik
169b2cedf5 am fd8e8aec: am edf92aec: am 7a250371: Set default outline alpha to 1.0f 
* commit 'fd8e8aecccb20cf8a66a226d27e2100853e4b37c':
  Set default outline alpha to 1.0f
 2014-08-04 21:10:41 +00:00
Yorke Lee
c7c9ce2d4a am 76c61762: am 27627ecd: am ddf3fd48: Merge "Update documentation for ContactCounts" into lmp-dev 
* commit '76c61762fe53d67dfa39a652118cc2d11a22f3c4':
  Update documentation for ContactCounts
 2014-08-04 21:06:09 +00:00
Chris Craik
305acfa81d am edf92aec: am 7a250371: Set default outline alpha to 1.0f 
* commit 'edf92aec5ee6bfaf57e6654c673a6e27a21de09c':
  Set default outline alpha to 1.0f
 2014-08-04 21:06:01 +00:00
Jeff Tinker
6de847ad9c am 8d5f9cb2: am 37956deb: am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev 
* commit '8d5f9cb2b4169c3770b5c89361452d60da765940':
  Allow device to be unprovisioned
 2014-08-04 21:01:11 +00:00
Yorke Lee
8fa9673da3 am 27627ecd: am ddf3fd48: Merge "Update documentation for ContactCounts" into lmp-dev 
* commit '27627ecdb934cc85cf16641690f2c3474e7e35fc':
  Update documentation for ContactCounts
 2014-08-04 21:01:02 +00:00
ztenghui
dcc7da0baa am 4e773290: am 736c22ed: am 1049d08f: Fix one typo and add linear progress bar in the test. 
* commit '4e77329095e1d38eb94129a96b5eaf0b0e838086':
  Fix one typo and add linear progress bar in the test.
 2014-08-04 21:01:02 +00:00
Chris Craik
b55fa8318a am 7a250371: Set default outline alpha to 1.0f 
* commit '7a250371c7ae7de36b09ede742d690b0c0f3268d':
  Set default outline alpha to 1.0f
 2014-08-04 21:00:57 +00:00
Jeff Tinker
2abc07428f am 37956deb: am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev 
* commit '37956deb2eeed6ca03fc5a2941145e213372384d':
  Allow device to be unprovisioned
 2014-08-04 20:56:31 +00:00
ztenghui
42b8e4f338 am 736c22ed: am 1049d08f: Fix one typo and add linear progress bar in the test. 
* commit '736c22ed43a0f87d217f550305abed3c0c28a182':
  Fix one typo and add linear progress bar in the test.
 2014-08-04 20:56:27 +00:00
Yorke Lee
a17c04d7de am ddf3fd48: Merge "Update documentation for ContactCounts" into lmp-dev 
* commit 'ddf3fd48924e7a91453fc5b25b9f98c6f2865c6d':
  Update documentation for ContactCounts
 2014-08-04 20:56:18 +00:00
Chris Craik
6efd17588b Set default outline alpha to 1.0f 
bug:16795461
Change-Id: I7ccecee84b47a2bbf91fc11ad3005160f913ba77
 2014-08-04 20:53:41 +00:00
Jeff Tinker
01acb4af01 am f225e464: Merge "Allow device to be unprovisioned" into lmp-dev 
* commit 'f225e464e01055a9b5fc8f6293abf841f340da57':
  Allow device to be unprovisioned
 2014-08-04 20:51:54 +00:00
ztenghui
4c78daa253 am 1049d08f: Fix one typo and add linear progress bar in the test. 
* commit '1049d08f56fc7d2f9044c9390b6cf56e63a74857':
  Fix one typo and add linear progress bar in the test.
 2014-08-04 20:51:50 +00:00
ztenghui
5eb5cde467 Fix one typo and add linear progress bar in the test. 
Change-Id: Ib516fd4a27000d8e69a6640386332140ff0d6fdd
 2014-08-04 20:46:20 +00:00
Chris Craik
07ad188c2d am 8c893b4a: am e317e6ec: am 6f3a6476: Merge "Remove scaling bucket hack" into lmp-dev 
* commit '8c893b4a7ffe13a47ae27d724955a0c17ce17c67':
  Remove scaling bucket hack
 2014-08-04 20:41:17 +00:00
Chris Craik
72ef3dfa46 am e317e6ec: am 6f3a6476: Merge "Remove scaling bucket hack" into lmp-dev 
* commit 'e317e6ecfeaff984165f911301ec11b458f11e96':
  Remove scaling bucket hack
 2014-08-04 20:37:29 +00:00
Chris Craik
4a8cac2425 am 6f3a6476: Merge "Remove scaling bucket hack" into lmp-dev 
* commit '6f3a6476662c13a974cf36888b12c6edd8e3b1eb':
  Remove scaling bucket hack
 2014-08-04 20:32:46 +00:00
John Spurlock
71507de082 am a9642fa1: am b1e68e97: am 8acc32ee: Merge "QS: Add 8dp above and below the tile panel." into lmp-dev 
* commit 'a9642fa1e6d05dfeb0d4bc0ed1049d5e1198fc05':
  QS: Add 8dp above and below the tile panel.
 2014-08-04 19:42:39 +00:00
John Spurlock
08ffa6d487 am b1e68e97: am 8acc32ee: Merge "QS: Add 8dp above and below the tile panel." into lmp-dev 
* commit 'b1e68e97d08bdc4f4bc16e8787a1c1a5b88b8e77':
  QS: Add 8dp above and below the tile panel.
 2014-08-04 19:39:15 +00:00
John Spurlock
29c5f04632 am 8acc32ee: Merge "QS: Add 8dp above and below the tile panel." into lmp-dev 
* commit '8acc32eedd0eaff018863453af328d51496ff61c':
  QS: Add 8dp above and below the tile panel.
 2014-08-04 19:35:23 +00:00
Tom Taylor
2cd2bb9e43 am fb79ed97: am 9b7596e1: am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 
* commit 'fb79ed970485fa5d870adc0bf58b1e47fbfed60b':
  Allow MmsConfig override per request (1/3)
 2014-08-04 19:31:45 +00:00
Tom Taylor
05d601b991 am 9b7596e1: am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 
* commit '9b7596e19034cc7305bb22c8ec3bbd9ffe3a4593':
  Allow MmsConfig override per request (1/3)
 2014-08-04 19:22:11 +00:00
Chet Haase
a3277c93f4 am ed819db0: am 04c5921c: am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev 
* commit 'ed819db06149255d5cc84968028c2e2e8b8b7048':
  Give disappearing children a chance to recreate DisplayLists
 2014-08-04 19:20:36 +00:00
Tom Taylor
2a38be897c am f36cba5f: Merge "Allow MmsConfig override per request (1/3)" into lmp-dev 
* commit 'f36cba5f8d315a2e043848c35d533a48b5881154':
  Allow MmsConfig override per request (1/3)
 2014-08-04 19:14:45 +00:00
Chet Haase
b81305a55a am 04c5921c: am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev 
* commit '04c5921c3e256f149d69d321b8729b2cf07840af':
  Give disappearing children a chance to recreate DisplayLists
 2014-08-04 19:14:24 +00:00
John Spurlock
61c4ac187a am 6d065669: am d8fc8726: am cdc993dd: Doze: Add a user opt-out setting. 
* commit '6d06566917cf3a6ac67e0648fa6710c634f93cda':
  Doze: Add a user opt-out setting.
 2014-08-04 19:14:07 +00:00
Chet Haase
944ca2dfd3 am 7c98f923: Merge "Give disappearing children a chance to recreate DisplayLists" into lmp-dev 
* commit '7c98f92375c8037b513b58f84d627dc592c7005d':
  Give disappearing children a chance to recreate DisplayLists
 2014-08-04 19:10:30 +00:00
John Spurlock
191d09c467 am d8fc8726: am cdc993dd: Doze: Add a user opt-out setting. 
* commit 'd8fc8726188adf26929b998f14515cdffc313964':
  Doze: Add a user opt-out setting.
 2014-08-04 19:10:07 +00:00
John Spurlock
21752f5b4e am cdc993dd: Doze: Add a user opt-out setting. 
* commit 'cdc993dd255f9667e9b14c39e78c38718811d4d7':
  Doze: Add a user opt-out setting.
 2014-08-04 19:06:15 +00:00
John Spurlock
a4215ceb86 Doze: Add a user opt-out setting. 
When devices are configured with a doze component, the user
now has the option of disabling doze mode with a secure setting.

Bug:16703536
Change-Id: Ieab6ee8d2acf54580b86fb16e9d77b52080fb3b1
 2014-08-04 14:57:06 -04:00
Brian Carlstrom
64fbaecb6b am 4f1fb962: am 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af 
* commit '4f1fb962b12ea95d6319614aafa4c2f4097e1831':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
 2014-08-04 18:45:04 +00:00
Brian Carlstrom
f0bdeaf55b am bb68919d: am bccea16e: am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]" 
* commit 'bb68919da23caf0ffcc2c8d697050f10fe54a4cc':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
 2014-08-04 18:45:00 +00:00
Brian Carlstrom
31797e5c7b am 5a9b135f: am 20bac14e: Merge changes I69c064b0,I1972c5af 
* commit '5a9b135f983aa080fccbff29a328d1fc231d7e4a':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
 2014-08-04 18:37:59 +00:00
Brian Carlstrom
3c4d9ac865 am bccea16e: am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]" 
* commit 'bccea16ec1dc0d91750dc2b6932c4d370b365b2a':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
 2014-08-04 18:37:35 +00:00
Geoff Mendal
2d5bd48a5c am be390285: (-s ours) am 5b17e517: (-s ours) am 0742dd28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'be390285260eb15b1deea1e580864d4dcbc25e67':
  Import translations. DO NOT MERGE
 2014-08-04 18:36:15 +00:00
Geoff Mendal
bbfd394627 am 28f8ab8a: (-s ours) am a95df0fe: (-s ours) am b1a8c86d: (-s ours) Import translations. DO NOT MERGE 
* commit '28f8ab8ac52b40dd73f65decb10db2138094febd':
  Import translations. DO NOT MERGE
 2014-08-04 18:36:11 +00:00
Brian Carlstrom
5a9b135f98 am 20bac14e: Merge changes I69c064b0,I1972c5af 
* commit '20bac14e521dd551addd8541380f1d9b6c910bd2':
  Move image classes options from art to AndroidRuntime [frameworks/base]
  Disable compilation based on vold.decrypt. [frameworks/base]
 2014-08-04 18:32:59 +00:00
Brian Carlstrom
bccea16ec1 am 1de3c633: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]" 
* commit '1de3c633dc1c355ee2356249e6309c5adf83c9a6':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/base]
 2014-08-04 18:32:54 +00:00
Geoff Mendal
6af1e7d126 am 5b17e517: (-s ours) am 0742dd28: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '5b17e51709b70feed9ee90e5e1b6010596976581':
  Import translations. DO NOT MERGE
 2014-08-04 18:31:23 +00:00