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

149665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akos Ludanyi
9189c4c2f0 Fix ProviderTestCase2 broken by ag/519661: 
Problem:
1. ProviderTestCase2 passes a null as a ProviderInfo to the ContentProvider
2. mAuthority and mAuthorities will be null during the test
3. ContentProvider.matchesOurAuthorities will throw an NPE.

Fix:
Supply a ProviderInfo with authority.

Example bug:
b/17379295

Change-Id: Ia533313c0994727ef81f337a4e31a57ae7ec3c15
 2014-09-05 10:17:53 +02:00
Deepanshu Gupta
ae62d71d36 am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '7f26655a5bcaa8a6273ed603a465090d0e434d07':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:37:17 +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
7f26655a5b am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a4d978668219572b71538dc98dab461fe99dfcc3':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:26:25 +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
a4d9786682 am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2d70a5a9d1556f269b8ed79b1f6a896ce8241b51':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:16:36 +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
2d70a5a9d1 am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '06a31255133bcc21ed2f1d821b5e120fefddc117':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:07:21 +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
06a3125513 am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:56:35 +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
3f1cc48ad1 am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:48:37 +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
ae6a52eb0b am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:32:41 +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
f663480ae3 Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 2014-09-04 04:58:26 +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
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
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
1eb506aa8c Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 2014-09-04 01:53:49 +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
a90ae8bebb Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 2014-09-04 01:23:35 +00:00
Adam Powell
4ef16eaa8d Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev 2014-09-04 01:18:14 +00:00
Shishir Agrawal
3bdda955a1 Add a config variable to control radio power cycle on SIM refresh reset. 
This was required for legacy devices and causes issues in the newer devices.

Bug: 17154939
Change-Id: Ib231975d3210a8c4f3f10ac3af1b636e3de5fcbf
 2014-09-03 17:59:16 -07:00
John Reck
e2478d45cc Fix some wrong-thread issues around animator management 
Bug: 17372309

 Fixes a case where UI thread and RT thread both used the same method
 which wasn't safe for either of them.

 Adds additional assertions & logging in unusual circumstances to
 try and track down where the issue is occuring from.

Change-Id: I93d31a6fd0c5927259b67bdf96a475944226eee6
 2014-09-03 17:37:59 -07:00
Scott Rowe
3215da25dd am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs 
* commit '14f413be3c7701750b996b90c95471e8cf04ae96':
  docs: b/15790433 updated for xxhdpi and xxxhdpi
 2014-09-04 00:20:15 +00:00
Adam Powell
b2536cf473 Change the CAB to use the up-glyph for closing action modes 
In an effort to reduce glyph proliferation, change the "done"
checkmark from the CAB to the up-navigation arrow, placing the CAB
firmly in the current navigation hierarchy. This matches behavior for
expandable action views such as SearchView.

Allow the use of different CAB "done" layouts by theme; the material
layout should not include the "done" text and should use the standard
borderless selectable item background.

Bug 17372188

Change-Id: Icfb3e0bbc6a718e22ab27f9d520da5fe4eb833e7
 2014-09-03 17:17:45 -07:00
Jungshik Jang
329a406ed9 Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." into lmp-dev 2014-09-04 00:13:42 +00:00