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

151445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
45b37fa4f0 am 0f6746e3: am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '0f6746e36713cedda18fe0ff3d7b2daa78835e06':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:48:04 +00:00
Deepanshu Gupta
16099eed0f am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '84268142a64d463453556588bd4f7092af31fae9':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:37:13 +00:00
Deepanshu Gupta
84268142a6 am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'ccd53eecb946ad8d08fb332f0159db4816e62604':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:26:21 +00:00
Deepanshu Gupta
ccd53eecb9 am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '6a6e63a0efed47fea0b1f080a3092d7931941851':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:16:32 +00:00
Deepanshu Gupta
6a6e63a0ef am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '80b901611008824ff897f5434a840680b1ae40d5':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:07:18 +00:00
Deepanshu Gupta
80b9016110 am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'b14ab8d402ac3b001601492d9f989e54f761cc2e':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:56:32 +00:00
Deepanshu Gupta
b14ab8d402 am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'e9ea028b74950722163560d5dfb97b4403111cc4':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:48:33 +00:00
Deepanshu Gupta
e9ea028b74 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '6a9c6c6baedb994a619573388056c95475f84abf':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:32:32 +00:00
Brian Carlstrom
1f1737a73b am ffedfd4a: Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 
* commit 'ffedfd4a045a498844247c2f5366e8a8e3ede124':
  Ensure that BackgroundDexOptService can still perform dexopt
 2014-09-04 05:04:14 +00:00
Brian Carlstrom
f663480ae3 Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 2014-09-04 04:58:26 +00:00
Deepanshu Gupta
86807a33eb am fa23013e: am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit 'fa23013e9f46d6c8170d4343daf1db0c5dc8bd6d':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:54:05 +00:00
Deepanshu Gupta
2db22e72da am 53350bf3: am 43cba321: (-s ours) am 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '53350bf3e194543778a82e4a8dc27e8d8e1f823a':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:54:00 +00:00
Deepanshu Gupta
cd31f76067 am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit '4a4683c72a649b6435e872b71936a68dd97fe408':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:45:13 +00:00
Deepanshu Gupta
aa52a6c33e am 43cba321: (-s ours) am 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '43cba3210bd3e28e4bcba366980293143b938093':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:45:09 +00:00
Deepanshu Gupta
4a4683c72a am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit 'a92f199dcce9708b5c2a814c110827216a176fd5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:36:02 +00:00
Deepanshu Gupta
43cba3210b am 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '135b820789d393683df09f10631e7e9b16cfdb31':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:35:58 +00:00
Deepanshu Gupta
a92f199dcc am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit '0ddd915fb1d0add3bcab269abc1f8f46e2135b7a':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:24:46 +00:00
Deepanshu Gupta
135b820789 am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '1c3a884519dc5937bf321519d6adafb41a333bc1':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:24:04 +00:00
Deepanshu Gupta
0ddd915fb1 am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit '509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:14:41 +00:00
Deepanshu Gupta
1c3a884519 am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '47a400131f026fd4afdf09e77fe82e79201c1458':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:14:31 +00:00
Svetoslav Ganov
17cf230b0c am bb9a2035: This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash. 
* commit 'bb9a2035bd45c1b6d336044a9976be6fd1aaccbd':
  This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
 2014-09-04 03:42:17 +00:00
Svetoslav Ganov
588e117cce This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash. 
Revert "NumberPicker not announcing current selection."

This reverts commit 44d026c95bb9e582b7b18e355ec7a3458df52259.

Change-Id: I0bb6db9666fc9eb477737d1114c5c87035ed202b
 2014-09-04 03:28:50 +00:00
Adam Powell
5e82dcc22d am bc01a3e4: Merge "Fix a regression in SearchView focusability" into lmp-dev 
* commit 'bc01a3e4b46b1bf02c98b384ee280c8c1cb1a2f2':
  Fix a regression in SearchView focusability
 2014-09-04 03:01:15 +00:00
Deepanshu Gupta
2f2cc5bb61 am ef798c46: am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ef798c4697e53e1cd18066834cfba4fc1595726c':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 03:01:10 +00:00
Deepanshu Gupta
1f52a2abc9 am 5e8e34d9: am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '5e8e34d9d751d582c29fcf91c2462e6f2225fff5':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 03:01:05 +00:00
Adam Powell
a727bf51ed Merge "Fix a regression in SearchView focusability" into lmp-dev 2014-09-04 02:51:41 +00:00
Deepanshu Gupta
79d91784d1 am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 
* commit '81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 02:49:21 +00:00
Deepanshu Gupta
67f8358764 am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit 'aac20cfcb4752a38bb27fb134869868c487d855f':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 02:49:17 +00:00
Adam Powell
ea4ecd6241 Fix a regression in SearchView focusability 
A bit of code was removed that re-read the View style attributes
during SearchView construction to extract the focusable attribute, but
with a different default value if it was entirely missing. Restore it,
and lump re-reading the focusable attribute in with SearchView's
styleable filter array instead of using the giant View one for a
second time during inflation.

Bug 17292230

Change-Id: Ic5a2dd2d55893b0b290f1f7a3b6de09b37329245
 2014-09-03 19:35:37 -07:00
Deepanshu Gupta
81cd0d8d52 am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 
* commit 'a780eee46244062d699f76875fd05775c2ee92de':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 02:22:53 +00:00
Deepanshu Gupta
aac20cfcb4 am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '9776312a80f0072bf1d1fe8183e168f7d5879c4c':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 02:22:43 +00:00
Deepanshu Gupta
d19a56d2db am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 
* commit 'c9d0cb09531f16c5a30337fa71aa4d7ba37a8768':
  Remove ANDROID_BUILD_TOP from intelliJ path variables.
 2014-09-04 02:08:56 +00:00
Deepanshu Gupta
622dacdd96 am 80899170: Merge "enums in dimension attributes." into lmp-dev 
* commit '8089917012e9133eb4d0ff4985c130c70d693b96':
  enums in dimension attributes.
 2014-09-04 01:57:33 +00:00
Deepanshu Gupta
b336fe02b8 am 7d931c01: Merge "Null out "@null" attributes." into lmp-dev 
* commit '7d931c01e47b4b4bac658d1628e0deb64308fb67':
  Null out "@null" attributes.
 2014-09-04 01:57:28 +00:00
Deepanshu Gupta
a6f32b9dd3 am 8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 
* commit '8fbaefb017b164133ac7e4ea87772fead5396374':
  LayoutLib: Fix warnings in ResourceHelper.
 2014-09-04 01:57:23 +00:00
Deepanshu Gupta
b414caaf1e am 02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev 
* commit '02c6c26dfa188710fc748f3b0cea57122e451cbb':
  LayoutLib: Allow '+' in float attributes.
 2014-09-04 01:57:18 +00:00
Deepanshu Gupta
9034319865 am 229833c3: Merge "Fix invalid conditional check." into lmp-dev 
* commit '229833c30bfae115c0691af11e531473f827c453':
  Fix invalid conditional check.
 2014-09-04 01:57:13 +00:00
Deepanshu Gupta
7b877ae554 am 2d5629df: Merge "Build layoutlib_create tests." into lmp-dev 
* commit '2d5629dff0de6262440682ff73214a7245d40c24':
  Build layoutlib_create tests.
 2014-09-04 01:57:08 +00:00
Deepanshu Gupta
a780eee462 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 2014-09-04 01:53:38 +00:00
Deepanshu Gupta
509e5db149 Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 2014-09-04 01:53:17 +00:00
Deepanshu Gupta
708df7bc45 Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 2014-09-04 01:51:55 +00:00
Deepanshu Gupta
9776312a80 Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 2014-09-04 01:50:28 +00:00
Deepanshu Gupta
47a400131f Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 2014-09-04 01:50:06 +00:00
Deepanshu Gupta
db0b8a1997 Merge "enums in dimension attributes." into lmp-dev 2014-09-04 01:48:24 +00:00
Deepanshu Gupta
351ed32961 Merge "Null out "@null" attributes." into lmp-dev 2014-09-04 01:48:14 +00:00
Deepanshu Gupta
bcbe8fcdb1 Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 2014-09-04 01:46:58 +00:00
Deepanshu Gupta
a7c2419ec9 Merge "LayoutLib: Allow '+' in float attributes." into lmp-dev 2014-09-04 01:46:42 +00:00
Deepanshu Gupta
d75edc41a6 Merge "Fix invalid conditional check." into lmp-dev 2014-09-04 01:46:14 +00:00
Deepanshu Gupta
8a2ff1ecd9 Merge "Build layoutlib_create tests." into lmp-dev 2014-09-04 01:45:36 +00:00
Jae Seo
401768bf49 am 9c723776: Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 
* commit '9c723776441af73f97e5ed736d2d6ec0d0e8c2d4':
  TIF: Add Quebec ratings for Canada and fix the XML example
 2014-09-04 01:32:02 +00:00